Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/maps/projectiles/metrion1.map2
-rw-r--r--base/particles/explosion.ini12
-rw-r--r--base/particles/laser_trail.ini11
-rw-r--r--base/particles/metrion1.ini33
-rw-r--r--base/textures/fx/trail001.pngbin17874 -> 14572 bytes
-rw-r--r--base/textures/fx/trail002.pngbin16636 -> 13673 bytes
-rw-r--r--base/textures/fx/trail003.pngbin24059 -> 21919 bytes
-rw-r--r--base/textures/fx/trail004.pngbin17487 -> 14346 bytes
8 files changed, 28 insertions, 30 deletions
diff --git a/base/maps/projectiles/metrion1.map b/base/maps/projectiles/metrion1.map
index 2d47ea1..a4be1be 100644
--- a/base/maps/projectiles/metrion1.map
+++ b/base/maps/projectiles/metrion1.map
@@ -16,5 +16,5 @@
"origin" "0.000000 0.000000 0.000000"
"light" "16"
"flare" "4"
-"spawnflags" "2"
+"_color" "1 0.482338 1"
}
diff --git a/base/particles/explosion.ini b/base/particles/explosion.ini
index 8af6233..71487c5 100644
--- a/base/particles/explosion.ini
+++ b/base/particles/explosion.ini
@@ -7,8 +7,8 @@
[sprites]
texture=fx/explosion01_16
+ timeout=2500
lifespan=4000
- timeout=5000
interval=50
radius=512 2048
alpha=0 0.5 0
@@ -20,7 +20,7 @@
[sprites]
texture=fx/flare02
- timeout=5000
+ timeout=3000
lifespan=4500
interval=15
radius=16 24
@@ -34,11 +34,11 @@
[streaks]
texture=fx/streak001
- timeout=5000
+ timeout=3000
interval=50
lifespan=5000
- speed=64 68
- tailspeed=48 56
+ speed=72 74
+ tailspeed=58 60
cone=360
radius=12 16
alpha=0.0 0.75 0
@@ -49,7 +49,7 @@
[streaks]
texture=fx/streak002
- timeout=5000
+ timeout=3000
interval=30
lifespan=3500
speed=80 84
diff --git a/base/particles/laser_trail.ini b/base/particles/laser_trail.ini
index 4dbf2b7..f9e305a 100644
--- a/base/particles/laser_trail.ini
+++ b/base/particles/laser_trail.ini
@@ -7,8 +7,9 @@
[trail]
texture=fx/engine_trail
- lifespan=500
- interval=200
- radius=4 0
- offset = 0.9
- alpha=0.5
+ lifespan=1000
+ interval=50
+ radius=8 0
+ offset=0.75
+ alpha=0.5 0
+ color=255 255 127
diff --git a/base/particles/metrion1.ini b/base/particles/metrion1.ini
index 56e6745..8609957 100644
--- a/base/particles/metrion1.ini
+++ b/base/particles/metrion1.ini
@@ -6,22 +6,19 @@
[particles]
[sprites]
- texture=fx/flare02
- spawnradius=12
- lifespan=500
- interval=25
- radius=8 4
- alpha=0.7 0
- entity=true
-
- [sprites]
- texture=fx/flare02
- spawnradius=16
- cone=15
- speed=15
+ texture=fx/engine_smoke
lifespan=750
- interval=25
- radius=12 2
- alpha=0.7 0
- entity=false
- entitysecond=true
+ interval=15
+ radius=4 32
+ alpha=0.75 0
+ color=255 123 255
+
+ [trail]
+ texture=fx/trail001
+ lifespan=1500
+ interval=75
+ radius=64 8
+ offset=0.75
+ alpha=0.5 0
+ color=255 123 255
+
diff --git a/base/textures/fx/trail001.png b/base/textures/fx/trail001.png
index f160a20..65ee3c7 100644
--- a/base/textures/fx/trail001.png
+++ b/base/textures/fx/trail001.png
Binary files differ
diff --git a/base/textures/fx/trail002.png b/base/textures/fx/trail002.png
index 32a0739..7e60fc5 100644
--- a/base/textures/fx/trail002.png
+++ b/base/textures/fx/trail002.png
Binary files differ
diff --git a/base/textures/fx/trail003.png b/base/textures/fx/trail003.png
index 5100a17..1a163f3 100644
--- a/base/textures/fx/trail003.png
+++ b/base/textures/fx/trail003.png
Binary files differ
diff --git a/base/textures/fx/trail004.png b/base/textures/fx/trail004.png
index db305aa..0253745 100644
--- a/base/textures/fx/trail004.png
+++ b/base/textures/fx/trail004.png
Binary files differ