From 039e983daaac958a2ca68eb09cfacc21265c86eb Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Fri, 13 Jan 2012 07:10:35 +0000
Subject: Merged engine_trail and engine_exhaust.

---
 base/maps/mercenary/enforcer.map                   | 52 ++++---------------
 base/maps/mercenary/pod.map                        | 18 +++----
 .../mercenary/sections/archer_engine_large.map     |  9 ----
 base/maps/mercenary/talon.map                      | 60 +++++++---------------
 4 files changed, 34 insertions(+), 105 deletions(-)

(limited to 'base/maps/mercenary')

diff --git a/base/maps/mercenary/enforcer.map b/base/maps/mercenary/enforcer.map
index eb9cfcc..475e1dd 100644
--- a/base/maps/mercenary/enforcer.map
+++ b/base/maps/mercenary/enforcer.map
@@ -4164,38 +4164,6 @@
 }
 // entity 8
 {
-"classname" "fx_particles"
-"origin" "-166.000000 24.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 9
-{
-"classname" "fx_particles"
-"origin" "-166.000000 40.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 10
-{
-"classname" "fx_particles"
-"origin" "-166.000000 -24.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 11
-{
-"classname" "fx_particles"
-"origin" "-166.000000 -40.000000 0.000000"
-"script" "engine_trail"
-"angle" "-179.999985"
-"spawnflags" "2"
-}
-// entity 12
-{
 "classname" "light"
 "origin" "290.000000 24.000000 0.000000"
 "light" "10"
@@ -4205,7 +4173,7 @@
 "_color" "1.0 1.0 1.0"
 "offset" "0.5"
 }
-// entity 13
+// entity 9
 {
 "classname" "light"
 "origin" "45.000000 190.000000 0.000000"
@@ -4215,7 +4183,7 @@
 "frequency" "1"
 "_color" "0 1.0 0"
 }
-// entity 14
+// entity 10
 {
 "classname" "light"
 "origin" "45.000000 190.000000 0.000000"
@@ -4223,7 +4191,7 @@
 "_color" "0 1.0 0"
 "flare" "4"
 }
-// entity 15
+// entity 11
 {
 "classname" "light"
 "origin" "290.000000 -24.000000 0.000000"
@@ -4234,7 +4202,7 @@
 "_color" "1.0 1.0 1.0"
 "offset" "0.5"
 }
-// entity 16
+// entity 12
 {
 "classname" "fx_flare"
 "origin" "-172.000000 32.000000 0.000000"
@@ -4243,7 +4211,7 @@
 "angle" "180"
 "radius" "32"
 }
-// entity 17
+// entity 13
 {
 "classname" "fx_flare"
 "origin" "-172.000000 -32.000000 0.000000"
@@ -4252,14 +4220,14 @@
 "angle" "180"
 "radius" "32"
 }
-// entity 18
+// entity 14
 {
 "classname" "fx_particles"
 "origin" "-88.750000 -201.250000 0.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 19
+// entity 15
 {
 "classname" "light"
 "origin" "45.000000 -190.000000 0.000000"
@@ -4270,7 +4238,7 @@
 "_color" "1.0 0 0"
 "offset" "0.5"
 }
-// entity 20
+// entity 16
 {
 "classname" "light"
 "origin" "45.000000 -190.000000 0.000000"
@@ -4278,14 +4246,14 @@
 "_color" "1.0 0 0"
 "flare" "4"
 }
-// entity 21
+// entity 17
 {
 "classname" "fx_particles"
 "origin" "-88.750000 201.250000 0.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 22
+// entity 18
 {
 "classname" "fx_particles"
 "origin" "-128.000000 46.000000 -45.500000"
diff --git a/base/maps/mercenary/pod.map b/base/maps/mercenary/pod.map
index 4f1925d..f7d446a 100644
--- a/base/maps/mercenary/pod.map
+++ b/base/maps/mercenary/pod.map
@@ -750,7 +750,7 @@ common/engine
 {
 patchDef2
 {
-colors/black_bright
+common/engine
 ( 3 5 0 0 0 )
 (
 ( ( -240 -48 0 -0.75 -0 ) ( -240 -48 -40 -0.75 0.625 ) ( -240 0.0000019073 -40 0.0000000298 0.625 ) ( -240 48 -40 0.75 0.625 ) ( -240 48 0 0.75 -0 ) )
@@ -1344,16 +1344,18 @@ colors/grey25
 "classname" "fx_flare"
 "origin" "-248 0 0"
 "angle" "180"
-"radius" "80"
+"radius" "40"
 "spawnflags" "4"
 "flare" "1"
 }
 // entity 12
 {
 "classname" "fx_particles"
-"origin" "-288 0 0"
-"angle" "180"
+"origin" "-240.000000 0.000000 0.000000"
+"angle" "-179.999985"
 "script" "engine_exhaust"
+"scale" "1.6"
+"spawnflags" "4"
 }
 // entity 13
 {
@@ -1362,11 +1364,3 @@ colors/grey25
 "angle" "180"
 "script" "dust_trail"
 }
-// entity 14
-{
-"classname" "fx_particles"
-"origin" "-240.000000 0.000000 0.000000"
-"script" "engine_trail"
-"spawnflags" "2"
-"angle" "180"
-}
diff --git a/base/maps/mercenary/sections/archer_engine_large.map b/base/maps/mercenary/sections/archer_engine_large.map
index 7e5d74c..63d677b 100644
--- a/base/maps/mercenary/sections/archer_engine_large.map
+++ b/base/maps/mercenary/sections/archer_engine_large.map
@@ -183,12 +183,3 @@ colors/grey50_shiny
 "light" "16"
 "spawnflags" "4"
 }
-// entity 5
-{
-"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_exhaust"
-"spawnflags" "4"
-"scale" "0.5"
-}
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index 6ccbbb5..19c3ef1 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -2437,21 +2437,13 @@ colors/grey50
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-102.000000 -41.000000 0.000000"
-"spawnflags" "2"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 2
-{
-"classname" "fx_particles"
 "origin" "-104.000000 -41.000000 0.000000"
 "spawnflags" "4"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 "scale" "0.4"
 }
-// entity 3
+// entity 2
 {
 "classname" "light"
 "origin" "272.000000 0.000000 1.000000"
@@ -2462,7 +2454,7 @@ colors/grey50
 "_color" "1.0 1.0 1.0"
 "spawnflags" "1"
 }
-// entity 4
+// entity 3
 {
 "classname" "light"
 "origin" "-76.000000 -188.000000 0.000000"
@@ -2470,7 +2462,7 @@ colors/grey50
 "_color" "0 1.0 0"
 "flare" "4"
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-76.000000 188.000000 0.000000"
@@ -2478,45 +2470,45 @@ colors/grey50
 "_color" "1.0 0 0"
 "flare" "4"
 }
-// entity 6
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-80.000000 192.000000 0.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 7
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-80.000000 -192.000000 0.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 8
+// entity 7
 {
 "classname" "location_cannon"
 "origin" "120.000000 24.000000 0.000000"
 }
-// entity 9
+// entity 8
 {
 "classname" "location_cannon"
 "origin" "120.000000 -24.000000 0.000000"
 }
-// entity 10
+// entity 9
 {
 "classname" "light"
 "origin" "-120.000000 0.000000 0.000000"
 "flare" "4"
 "spawnflags" "4"
 }
-// entity 11
+// entity 10
 {
 "classname" "fx_particles"
 "origin" "-80.000000 0.000000 88.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 12
+// entity 11
 {
 "classname" "light"
 "origin" "-78.000000 -47.000000 -47.000000"
@@ -2524,7 +2516,7 @@ colors/grey50
 "_color" "0 1 0"
 "flare" "4"
 }
-// entity 13
+// entity 12
 {
 "classname" "light"
 "origin" "-78.000000 47.000000 -47.000000"
@@ -2532,7 +2524,7 @@ colors/grey50
 "_color" "1 0 0"
 "flare" "4"
 }
-// entity 14
+// entity 13
 {
 "classname" "light"
 "origin" "-76.000000 -188.000000 0.000000"
@@ -2543,7 +2535,7 @@ colors/grey50
 "_color" "0 1.0 0"
 "spawnflags" "1"
 }
-// entity 15
+// entity 14
 {
 "classname" "light"
 "origin" "-76.000000 188.000000 0.000000"
@@ -2554,28 +2546,28 @@ colors/grey50
 "_color" "1.0 0 0"
 "spawnflags" "1"
 }
-// entity 16
+// entity 15
 {
 "classname" "fx_particles"
 "origin" "-80.000000 -48.000000 -48.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 17
+// entity 16
 {
 "classname" "fx_particles"
 "origin" "-80.000000 48.000000 -48.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 18
+// entity 17
 {
 "classname" "light"
 "origin" "-79.000000 0.000000 87.000000"
 "light" "10"
 "flare" "4"
 }
-// entity 19
+// entity 18
 {
 "classname" "fx_particles"
 "origin" "-92.000000 0.000000 0.000000"
@@ -2584,23 +2576,7 @@ colors/grey50
 "script" "engine_exhaust"
 "scale" "0.6"
 }
-// entity 20
-{
-"classname" "fx_particles"
-"origin" "-88.000000 0.000000 0.000000"
-"spawnflags" "2"
-"angle" "180.000000"
-"script" "engine_trail"
-}
-// entity 21
-{
-"classname" "fx_particles"
-"origin" "-102.000000 41.000000 0.000000"
-"spawnflags" "2"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 22
+// entity 19
 {
 "classname" "fx_particles"
 "origin" "-104.000000 41.000000 0.000000"
-- 
cgit v1.2.3