Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/maps/independent/sections/spider_engine_medium.map10
-rw-r--r--base/maps/independent/sections/spider_engine_small.map10
-rw-r--r--base/maps/mercenary/pod.map101
-rw-r--r--base/maps/mercenary/talon.map20
-rw-r--r--base/maps/pirate/sections/engine_large.map15
-rw-r--r--base/maps/pirate/sections/engine_medium.map17
-rw-r--r--base/maps/pirate/sections/engine_small.map10
-rw-r--r--base/maps/pirate/sections/engine_tiny.map10
-rw-r--r--base/particles/engine_exhaust.ini14
-rw-r--r--base/particles/engine_exhaust_dagon.ini2
-rw-r--r--base/particles/engine_exhaust_tsukhan.ini2
11 files changed, 109 insertions, 102 deletions
diff --git a/base/maps/independent/sections/spider_engine_medium.map b/base/maps/independent/sections/spider_engine_medium.map
index 2631ba8..34783f0 100644
--- a/base/maps/independent/sections/spider_engine_medium.map
+++ b/base/maps/independent/sections/spider_engine_medium.map
@@ -354,14 +354,8 @@ colors/grey50
// entity 2
{
"classname" "fx_particles"
-"origin" "-11.000000 0.000000 0.000000"
+"origin" "-6.000000 0.000000 0.000000"
"script" "engine_exhaust"
"scale" "0.75"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "-15.000000 0.000000 0.000000"
-"light" "16"
-"spawnflags" "4"
+"angle" "-179.999985"
}
diff --git a/base/maps/independent/sections/spider_engine_small.map b/base/maps/independent/sections/spider_engine_small.map
index 1b651d3..3d4e146 100644
--- a/base/maps/independent/sections/spider_engine_small.map
+++ b/base/maps/independent/sections/spider_engine_small.map
@@ -354,14 +354,8 @@ colors/grey50
// entity 2
{
"classname" "fx_particles"
-"origin" "-14.000000 0.000000 0.000000"
+"origin" "-9.000000 0.000000 0.000000"
"script" "engine_exhaust"
"scale" "0.5"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "-18.000000 0.000000 0.000000"
-"light" "12"
-"spawnflags" "4"
+"angle" "-180.000000"
}
diff --git a/base/maps/mercenary/pod.map b/base/maps/mercenary/pod.map
index 4123ac3..1f39ed8 100644
--- a/base/maps/mercenary/pod.map
+++ b/base/maps/mercenary/pod.map
@@ -669,15 +669,15 @@ patchDef2
colors/grey25
( 9 3 0 0 0 )
(
-( ( -318 36 0 0 0 ) ( -319 40 0 0 -0.625 ) ( -320 44 0 0 -1.25 ) )
-( ( -318 36 28 0.4375 0 ) ( -319 40 32 0.4375 -0.625 ) ( -320 44 36 0.4375 -1.25 ) )
-( ( -318 0 28 1 0 ) ( -319 0 32 1 -0.625 ) ( -320 0 36 1 -1.25 ) )
-( ( -318 -36 28 1.5625 0 ) ( -319 -40 32 1.5625 -0.625 ) ( -320 -44 36 1.5625 -1.25 ) )
-( ( -318 -36 0 2 0 ) ( -319 -40 0 2 -0.625 ) ( -320 -44 0 2 -1.25 ) )
-( ( -318 -36 -27.9999980927 2.4375 0 ) ( -319 -40 -31.9999980927 2.4375 -0.625 ) ( -320 -44 -36 2.4375 -1.25 ) )
-( ( -318 0 -27.9999980927 3 0 ) ( -319 0 -31.9999980927 3 -0.625 ) ( -320 0 -36 3 -1.25 ) )
-( ( -318 36 -27.9999980927 3.5625 0 ) ( -319 40 -31.9999980927 3.5625 -0.625 ) ( -320 44 -36 3.5625 -1.25 ) )
-( ( -318 36 0 4 0 ) ( -319 40 0 4 -0.625 ) ( -320 44 0 4 -1.25 ) )
+( ( -312 36 0 0 0 ) ( -320 44 0 0 -0.625 ) ( -320 44 0 0 -1.25 ) )
+( ( -312 36 28 0.4375 0 ) ( -320 44 36 0.4375 -0.625 ) ( -320 44 36 0.4375 -1.25 ) )
+( ( -312 0 28 1 0 ) ( -320 0 36 1 -0.625 ) ( -320 0 36 1 -1.25 ) )
+( ( -312 -36 28 1.5625 0 ) ( -320 -44 36 1.5625 -0.625 ) ( -320 -44 36 1.5625 -1.25 ) )
+( ( -312 -36 0 2 0 ) ( -320 -44 0 2 -0.625 ) ( -320 -44 0 2 -1.25 ) )
+( ( -312 -36 -28 2.4375 0 ) ( -320 -44 -36 2.4375 -0.625 ) ( -320 -44 -36 2.4375 -1.25 ) )
+( ( -312 0 -28 3 0 ) ( -320 0 -36 3 -0.625 ) ( -320 0 -36 3 -1.25 ) )
+( ( -312 36 -28 3.5625 0 ) ( -320 44 -36 3.5625 -0.625 ) ( -320 44 -36 3.5625 -1.25 ) )
+( ( -312 36 0 4 0 ) ( -320 44 0 4 -0.625 ) ( -320 44 0 4 -1.25 ) )
)
}
}
@@ -765,15 +765,15 @@ patchDef2
colors/grey25
( 9 3 0 0 0 )
(
-( ( -240 36 0 0 0 ) ( -280 36 0 0 -0.625 ) ( -318 36 0 0 -1.25 ) )
-( ( -240 36 28 0.4375 0 ) ( -280 36 28 0.4375 -0.625 ) ( -318 36 28 0.4375 -1.25 ) )
-( ( -240 0 28 1 0 ) ( -280 0 28 1 -0.625 ) ( -318 0 28 1 -1.25 ) )
-( ( -240 -36 28 1.5625 0 ) ( -280 -36 28 1.5625 -0.625 ) ( -318 -36 28 1.5625 -1.25 ) )
-( ( -240 -36 0 2 0 ) ( -280 -36 0 2 -0.625 ) ( -318 -36 0 2 -1.25 ) )
-( ( -240 -36 -27.9999980927 2.4375 0 ) ( -280 -36 -27.9999980927 2.4375 -0.625 ) ( -318 -36 -27.9999980927 2.4375 -1.25 ) )
-( ( -240 0 -27.9999980927 3 0 ) ( -280 0 -27.9999980927 3 -0.625 ) ( -318 0 -27.9999980927 3 -1.25 ) )
-( ( -240 36 -27.9999980927 3.5625 0 ) ( -280 36 -27.9999980927 3.5625 -0.625 ) ( -318 36 -27.9999980927 3.5625 -1.25 ) )
-( ( -240 36 0 4 0 ) ( -280 36 0 4 -0.625 ) ( -318 36 0 4 -1.25 ) )
+( ( -300 20 0.0000002384 0 -1.25 ) ( -308 32 0 0 -0.625 ) ( -308 32 0.0000002384 0 0 ) )
+( ( -300 20 20 0.4375 -1.25 ) ( -308 32 24 0.4375 -0.625 ) ( -308 32 24 0.4375 0 ) )
+( ( -300 0 20 1 -1.25 ) ( -308 0 24 1 -0.625 ) ( -308 0 24 1 0 ) )
+( ( -300 -20 20 1.5625 -1.25 ) ( -308 -32 24 1.5625 -0.625 ) ( -308 -32 24 1.5625 0 ) )
+( ( -300 -20 0.0000002384 2 -1.25 ) ( -308 -32 0 2 -0.625 ) ( -308 -32 0.0000002384 2 0 ) )
+( ( -300 -20 -20 2.4375 -1.25 ) ( -308 -32 -24 2.4375 -0.625 ) ( -308 -32 -24 2.4375 0 ) )
+( ( -300 0 -20 3 -1.25 ) ( -308 0 -24 3 -0.625 ) ( -308 0 -24 3 0 ) )
+( ( -300 20 -20 3.5625 -1.25 ) ( -308 32 -24 3.5625 -0.625 ) ( -308 32 -24 3.5625 0 ) )
+( ( -300 20 0.0000002384 4 -1.25 ) ( -308 32 0 4 -0.625 ) ( -308 32 0.0000002384 4 0 ) )
)
}
}
@@ -1257,6 +1257,63 @@ colors/grey25
( -64 -80 -8 ) ( -64 -52 8 ) ( 64 -80 -8 ) common/clip 0 0 0 0.5 0.5 0 0 0
( -16 -52 8 ) ( -16 -80 -8 ) ( -48 -56 -8 ) common/clip 0 0 0 0.5 0.5 0 0 0
}
+// brush 103
+{
+patchDef2
+{
+colors/grey25
+( 9 3 0 0 0 )
+(
+( ( -240 36 0 0 0 ) ( -280 36 0 0 -0.625 ) ( -312 36 0 0 -1.25 ) )
+( ( -240 36 28 0.4375 0 ) ( -280 36 28 0.4375 -0.625 ) ( -312 36 28 0.4375 -1.25 ) )
+( ( -240 0 28 1 0 ) ( -280 0 28 1 -0.625 ) ( -312 0 28 1 -1.25 ) )
+( ( -240 -36 28 1.5625 0 ) ( -280 -36 28 1.5625 -0.625 ) ( -312 -36 28 1.5625 -1.25 ) )
+( ( -240 -36 0 2 0 ) ( -280 -36 0 2 -0.625 ) ( -312 -36 0 2 -1.25 ) )
+( ( -240 -36 -27.9999980927 2.4375 0 ) ( -280 -36 -27.9999980927 2.4375 -0.625 ) ( -312 -36 -28 2.4375 -1.25 ) )
+( ( -240 0 -27.9999980927 3 0 ) ( -280 0 -27.9999980927 3 -0.625 ) ( -312 0 -28 3 -1.25 ) )
+( ( -240 36 -27.9999980927 3.5625 0 ) ( -280 36 -27.9999980927 3.5625 -0.625 ) ( -312 36 -28 3.5625 -1.25 ) )
+( ( -240 36 0 4 0 ) ( -280 36 0 4 -0.625 ) ( -312 36 0 4 -1.25 ) )
+)
+}
+}
+// brush 104
+{
+patchDef2
+{
+colors/grey25
+( 9 3 0 0 0 )
+(
+( ( -240 16 0.0000001192 0 0 ) ( -240 16 0 0 -0.625 ) ( -300 20 0.0000001192 0 -1.25 ) )
+( ( -240 16 16 0.4375 0 ) ( -240 16 16 0.4375 -0.625 ) ( -300 20 20 0.4375 -1.25 ) )
+( ( -240 0 16 1 0 ) ( -240 0 16 1 -0.625 ) ( -300 0 20 1 -1.25 ) )
+( ( -240 -16 16 1.5625 0 ) ( -240 -16 16 1.5625 -0.625 ) ( -300 -20 20 1.5625 -1.25 ) )
+( ( -240 -16 0.0000001192 2 0 ) ( -240 -16 0 2 -0.625 ) ( -300 -20 0.0000001192 2 -1.25 ) )
+( ( -240 -16 -16 2.4375 0 ) ( -240 -16 -16 2.4375 -0.625 ) ( -300 -20 -20 2.4375 -1.25 ) )
+( ( -240 0 -16 3 0 ) ( -240 0 -16 3 -0.625 ) ( -300 0 -20 3 -1.25 ) )
+( ( -240 16 -16 3.5625 0 ) ( -240 16 -16 3.5625 -0.625 ) ( -300 20 -20 3.5625 -1.25 ) )
+( ( -240 16 0.0000001192 4 0 ) ( -240 16 0 4 -0.625 ) ( -300 20 0.0000001192 4 -1.25 ) )
+)
+}
+}
+// brush 105
+{
+patchDef2
+{
+colors/grey25
+( 9 3 0 0 0 )
+(
+( ( -308 32 0.0000002384 0 -1.25 ) ( -240 32 0 0 -0.625 ) ( -240 32 0.0000002384 0 0 ) )
+( ( -308 32 24 0.4375 -1.25 ) ( -240 32 24 0.4375 -0.625 ) ( -240 32 24 0.4375 0 ) )
+( ( -308 0 24 1 -1.25 ) ( -240 0 24 1 -0.625 ) ( -240 0 24 1 0 ) )
+( ( -308 -32 24 1.5625 -1.25 ) ( -240 -32 24 1.5625 -0.625 ) ( -240 -32 24 1.5625 0 ) )
+( ( -308 -32 0.0000002384 2 -1.25 ) ( -240 -32 0 2 -0.625 ) ( -240 -32 0.0000002384 2 0 ) )
+( ( -308 -32 -24 2.4375 -1.25 ) ( -240 -32 -24 2.4375 -0.625 ) ( -240 -32 -24 2.4375 0 ) )
+( ( -308 0 -24 3 -1.25 ) ( -240 0 -24 3 -0.625 ) ( -240 0 -24 3 0 ) )
+( ( -308 32 -24 3.5625 -1.25 ) ( -240 32 -24 3.5625 -0.625 ) ( -240 32 -24 3.5625 0 ) )
+( ( -308 32 0.0000002384 4 -1.25 ) ( -240 32 0 4 -0.625 ) ( -240 32 0.0000002384 4 0 ) )
+)
+}
+}
}
// entity 1
{
@@ -1331,8 +1388,8 @@ colors/grey25
// entity 10
{
"classname" "fx_flare"
-"origin" "-248 0 0"
-"angle" "180"
+"origin" "-296.000000 0.000000 0.000000"
+"angle" "-179.999985"
"radius" "40"
"spawnflags" "4"
"flare" "1"
@@ -1340,10 +1397,10 @@ colors/grey25
// entity 11
{
"classname" "fx_particles"
-"origin" "-240.000000 0.000000 0.000000"
+"origin" "-320.000000 0.000000 0.000000"
"angle" "-179.999985"
"script" "engine_exhaust"
-"scale" "1.6"
+"scale" "0.75"
}
// entity 12
{
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index e4b837e..ae92090 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -1923,28 +1923,28 @@ colors/grey75_shiny
// entity 18
{
"classname" "fx_particles"
-"origin" "-92.000000 0.000000 0.000000"
-"angle" "180.000000"
-"script" "engine_exhaust"
-"scale" "0.6"
-}
-// entity 19
-{
-"classname" "fx_particles"
"origin" "-104.000000 41.000000 0.000000"
"angle" "-179.999985"
"script" "engine_exhaust"
"scale" "0.4"
}
-// entity 20
+// entity 19
{
"classname" "misc_model"
"origin" "116.000000 -24.000000 0.000000"
"model" "maps/mercenary/sections/talon_cannon"
}
-// entity 21
+// entity 20
{
"classname" "misc_model"
"origin" "116.000000 24.000000 0.000000"
"model" "maps/mercenary/sections/talon_cannon"
}
+// entity 21
+{
+"classname" "fx_particles"
+"origin" "-92.000000 0.000000 0.000000"
+"angle" "180.000000"
+"script" "engine_exhaust"
+"scale" "0.6"
+}
diff --git a/base/maps/pirate/sections/engine_large.map b/base/maps/pirate/sections/engine_large.map
index 3ebf620..d12497b 100644
--- a/base/maps/pirate/sections/engine_large.map
+++ b/base/maps/pirate/sections/engine_large.map
@@ -90,21 +90,8 @@ colors/grey25_shiny
}
// entity 1
{
-"classname" "light"
-"origin" "-8.000000 0.000000 0.000000"
-"light" "24"
-"spawnflags" "4"
-}
-// entity 2
-{
"classname" "fx_particles"
"origin" "-8.000000 0.000000 0.000000"
"script" "engine_exhaust"
-}
-// entity 3
-{
-"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
-"script" "engine_smoke"
-"scale" "0.4"
+"angle" "-180.000000"
}
diff --git a/base/maps/pirate/sections/engine_medium.map b/base/maps/pirate/sections/engine_medium.map
index f1c7d12..10cda79 100644
--- a/base/maps/pirate/sections/engine_medium.map
+++ b/base/maps/pirate/sections/engine_medium.map
@@ -92,22 +92,9 @@ colors/grey25_shiny
}
// entity 1
{
-"classname" "light"
-"origin" "-8.000000 0.000000 0.000000"
-"light" "16"
-"spawnflags" "4"
-}
-// entity 2
-{
"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
+"origin" "-4.000000 0.000000 0.000000"
"script" "engine_exhaust"
"scale" "0.8"
-}
-// entity 3
-{
-"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
-"script" "engine_smoke"
-"scale" "0.2"
+"angle" "-179.999985"
}
diff --git a/base/maps/pirate/sections/engine_small.map b/base/maps/pirate/sections/engine_small.map
index d0ac06d..5145016 100644
--- a/base/maps/pirate/sections/engine_small.map
+++ b/base/maps/pirate/sections/engine_small.map
@@ -90,15 +90,9 @@ colors/grey25_shiny
}
// entity 1
{
-"classname" "light"
-"origin" "-8.000000 0.000000 0.000000"
-"light" "12"
-"spawnflags" "4"
-}
-// entity 2
-{
"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
+"origin" "-4.000000 0.000000 0.000000"
"script" "engine_exhaust"
"scale" "0.4"
+"angle" "-179.999985"
}
diff --git a/base/maps/pirate/sections/engine_tiny.map b/base/maps/pirate/sections/engine_tiny.map
index 244aee3..0568f8f 100644
--- a/base/maps/pirate/sections/engine_tiny.map
+++ b/base/maps/pirate/sections/engine_tiny.map
@@ -90,15 +90,9 @@ colors/grey25_shiny
}
// entity 1
{
-"classname" "light"
-"origin" "-8.000000 0.000000 0.000000"
-"light" "12"
-"spawnflags" "4"
-}
-// entity 2
-{
"classname" "fx_particles"
-"origin" "-8.000000 0.000000 0.000000"
+"origin" "-4.000000 0.000000 0.000000"
"script" "engine_exhaust"
"scale" "0.4"
+"angle" "-179.999985"
}
diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini
index a7d2eb3..81072ce 100644
--- a/base/particles/engine_exhaust.ini
+++ b/base/particles/engine_exhaust.ini
@@ -28,17 +28,17 @@
[sprites]
texture=fx/engine_exhaust
- lifespan=5000
- interval=25
+ lifespan=250
+ interval=1
radius=2 32 1
;64 256 16
spawnradius=1.5
alpha=1 0.5 0
offset=0
- speed=16
- cone=0
+ speed=128
+ cone=4
color=1.0f 1.0f 0.9f
- ; only eject particles when thruster is active
+
thrust=true
impulse=true
attached=true
@@ -59,7 +59,7 @@
speed=18
cone=16
color=1.0f 1.0f 0.9f
- ; only eject particles when thruster is active
+ ; only eject particles when impulse is active
thrust=false
impulse=true
attached=true
@@ -86,6 +86,6 @@
speed=32
; ejection cone size, in degrees
cone=0
- ; only eject particles when thruster is active
+
thrust=true
impulse=true
diff --git a/base/particles/engine_exhaust_dagon.ini b/base/particles/engine_exhaust_dagon.ini
index b3a187e..2bddc55 100644
--- a/base/particles/engine_exhaust_dagon.ini
+++ b/base/particles/engine_exhaust_dagon.ini
@@ -36,7 +36,7 @@
alpha=1 0.5 0
offset=0
speed=16
- cone=0
+ cone=4
color=0.0f 1.0f 0.0f
; only eject particles when thruster is active
thrust=true
diff --git a/base/particles/engine_exhaust_tsukhan.ini b/base/particles/engine_exhaust_tsukhan.ini
index 28f6ded..5c65260 100644
--- a/base/particles/engine_exhaust_tsukhan.ini
+++ b/base/particles/engine_exhaust_tsukhan.ini
@@ -15,7 +15,7 @@
alpha=1 0.5 0
offset=0
speed=32
- cone=0
+ cone=4
color=0.0f 0.0f 0.0f
thrust=true
impulse=true