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/tsukhan/imp.map                    | 90 +++++++++----------------
 base/maps/tsukhan/inquisitor.map             | 99 +++++++++++-----------------
 base/maps/tsukhan/sections/drake_engine1.map |  2 +-
 base/maps/tsukhan/sections/drake_engine2.map |  2 +-
 4 files changed, 72 insertions(+), 121 deletions(-)

(limited to 'base/maps/tsukhan')

diff --git a/base/maps/tsukhan/imp.map b/base/maps/tsukhan/imp.map
index 8b4a236..325aa56 100644
--- a/base/maps/tsukhan/imp.map
+++ b/base/maps/tsukhan/imp.map
@@ -3392,64 +3392,36 @@ tsukhan/tsukhan_grey50
 // entity 4
 {
 "classname" "fx_particles"
-"origin" "-192.000000 -61.000000 -29.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 5
-{
-"classname" "fx_particles"
-"origin" "-192.000000 -61.000000 -3.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.4"
-}
-// entity 6
-{
-"classname" "fx_particles"
 "origin" "-192.000000 61.000000 -3.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 7
-{
-"classname" "fx_particles"
-"origin" "-192.000000 61.000000 -29.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
+"script" "engine_exhaust_tsukhan"
 "scale" "0.4"
 }
-// entity 8
-{
-"classname" "fx_particles"
-"origin" "-192.000000 61.000000 -3.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.4"
-}
-// entity 9
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-192.000000 61.000000 -29.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.4"
 }
-// entity 10
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-192.000000 -61.000000 -29.000000"
 "angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
+"script" "engine_exhaust_tsukhan"
 "scale" "0.4"
 }
-// entity 11
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "-192.000000 -61.000000 -3.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.4"
 }
-// entity 12
+// entity 8
 {
 "classname" "light"
 "origin" "322.000000 0.000000 6.000000"
@@ -3457,7 +3429,7 @@ tsukhan/tsukhan_grey50
 "_color" "0.5 0 0.5"
 "flare" "4"
 }
-// entity 13
+// entity 9
 {
 "classname" "light"
 "origin" "100.000000 -174.000000 -8.000000"
@@ -3466,7 +3438,7 @@ tsukhan/tsukhan_grey50
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 14
+// entity 10
 {
 "classname" "light"
 "origin" "100.000000 174.000000 -8.000000"
@@ -3476,35 +3448,35 @@ tsukhan/tsukhan_grey50
 "spawnflags" "1"
 "offset" "0.5"
 }
-// entity 15
+// entity 11
 {
 "classname" "light"
 "origin" "-216.000000 -61.000000 -29.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 16
+// entity 12
 {
 "classname" "light"
 "origin" "-216.000000 -61.000000 -3.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 17
+// entity 13
 {
 "classname" "light"
 "origin" "-216.000000 61.000000 -3.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 18
+// entity 14
 {
 "classname" "light"
 "origin" "-216.000000 61.000000 -29.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 19
+// entity 15
 {
 "classname" "fx_flare"
 "origin" "-197.000000 -61.000000 -29.000000"
@@ -3513,7 +3485,7 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "-179.999985"
 }
-// entity 20
+// entity 16
 {
 "classname" "fx_flare"
 "origin" "-197.000000 -61.000000 -3.000000"
@@ -3522,7 +3494,7 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "-179.999985"
 }
-// entity 21
+// entity 17
 {
 "classname" "fx_flare"
 "origin" "-197.000000 61.000000 -29.000000"
@@ -3531,7 +3503,7 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "-179.999985"
 }
-// entity 22
+// entity 18
 {
 "classname" "fx_flare"
 "origin" "-197.000000 61.000000 -3.000000"
@@ -3540,75 +3512,75 @@ tsukhan/tsukhan_grey50
 "radius" "12"
 "angle" "180"
 }
-// entity 23
+// entity 19
 {
 "classname" "fx_particles"
 "origin" "-170.375000 0.000000 -88.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 24
+// entity 20
 {
 "classname" "fx_particles"
 "origin" "-24.000000 -176.000000 -8.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 25
+// entity 21
 {
 "classname" "fx_particles"
 "origin" "-8.000000 -100.000000 -48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 26
+// entity 22
 {
 "classname" "fx_particles"
 "origin" "-170.375000 -7.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 27
+// entity 23
 {
 "classname" "fx_particles"
 "origin" "-170.375000 7.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 28
+// entity 24
 {
 "classname" "fx_particles"
 "origin" "-24.000000 176.000000 -8.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 29
+// entity 25
 {
 "classname" "fx_particles"
 "origin" "-8.000000 100.000000 -48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 30
+// entity 26
 {
 "classname" "fx_particles"
 "origin" "-8.000000 -100.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 31
+// entity 27
 {
 "classname" "fx_particles"
 "origin" "-8.000000 100.000000 48.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 32
+// entity 28
 {
 "classname" "location_cannon"
 "origin" "296.000000 -26.000000 6.000000"
 }
-// entity 33
+// entity 29
 {
 "classname" "location_cannon"
 "origin" "296.000000 26.000000 6.000000"
diff --git a/base/maps/tsukhan/inquisitor.map b/base/maps/tsukhan/inquisitor.map
index af8a8c7..fdcd413 100644
--- a/base/maps/tsukhan/inquisitor.map
+++ b/base/maps/tsukhan/inquisitor.map
@@ -3224,99 +3224,62 @@ tsukhan/tsukhan_grey50
 // entity 8
 {
 "classname" "fx_particles"
-"origin" "-332.000000 -216.000000 -36.000000"
+"origin" "-324.000000 -216.000000 4.000000"
 "angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
 }
 // entity 9
 {
 "classname" "fx_particles"
-"origin" "-332.000000 -216.000000 4.000000"
+"origin" "-316.000000 -216.000000 -36.000000"
 "angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
 }
 // entity 10
 {
 "classname" "fx_particles"
-"origin" "-332.000000 216.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
-}
-// entity 11
-{
-"classname" "fx_particles"
-"origin" "-332.000000 216.000000 -36.000000"
-"angle" "-179.999985"
-"script" "engine_smoke_tsukhan"
-"scale" "0.6"
-}
-// entity 12
-{
-"classname" "fx_particles"
-"origin" "-324.000000 -216.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 13
-{
-"classname" "fx_particles"
-"origin" "-324.000000 216.000000 4.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 14
-{
-"classname" "fx_particles"
-"origin" "-316.000000 216.000000 -36.000000"
-"angle" "-179.999985"
-"script" "engine_trail_tsukhan"
-}
-// entity 15
-{
-"classname" "fx_particles"
 "origin" "-312.000000 352.000000 -16.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 16
+// entity 11
 {
 "classname" "fx_particles"
 "origin" "-312.000000 -352.000000 -16.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 17
+// entity 12
 {
 "classname" "fx_particles"
 "origin" "-344.000000 -216.000000 -128.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 18
+// entity 13
 {
 "classname" "fx_particles"
 "origin" "-344.000000 216.000000 -128.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 19
+// entity 14
 {
 "classname" "fx_particles"
 "origin" "-344.000000 -216.000000 96.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 20
+// entity 15
 {
 "classname" "fx_particles"
 "origin" "-344.000000 216.000000 96.000000"
 "script" "dust_trail"
 "angle" "-179.999985"
 }
-// entity 21
+// entity 16
 {
 "classname" "light"
 "origin" "-306.000000 348.000000 -16.000000"
@@ -3326,7 +3289,7 @@ tsukhan/tsukhan_grey50
 "time" "0.2"
 "offset" "0"
 }
-// entity 22
+// entity 17
 {
 "classname" "light"
 "origin" "-306.000000 -348.000000 -16.000000"
@@ -3336,59 +3299,75 @@ tsukhan/tsukhan_grey50
 "time" "0.2"
 "offset" "0.5"
 }
-// entity 23
+// entity 18
 {
 "classname" "light"
 "origin" "-227.000000 -140.000000 -2.000000"
 "light" "16"
 "_color" "0.5 0 0.5"
 }
-// entity 24
+// entity 19
 {
 "classname" "light"
 "origin" "-227.000000 140.000000 -2.000000"
 "light" "16"
 "_color" "0.5 0 0.5"
 }
-// entity 25
+// entity 20
 {
 "classname" "location_cannon"
 "origin" "72.000000 108.000000 0.000000"
 }
-// entity 26
+// entity 21
 {
 "classname" "location_cannon"
 "origin" "104.000000 -76.000000 0.000000"
 }
-// entity 27
+// entity 22
 {
 "classname" "location_cannon"
 "origin" "88.000000 -92.000000 0.000000"
 }
-// entity 28
+// entity 23
 {
 "classname" "location_cannon"
 "origin" "72.000000 -108.000000 0.000000"
 }
-// entity 29
+// entity 24
 {
 "classname" "location_cannon"
 "origin" "104.000000 76.000000 0.000000"
 }
-// entity 30
+// entity 25
 {
 "classname" "location_cannon"
 "origin" "88.000000 92.000000 0.000000"
 }
-// entity 31
+// entity 26
 {
 "classname" "location_turret"
 "origin" "-104.000000 0.000000 -44.000000"
 "angles" "90.000000 0.000000 -0.000000"
 }
-// entity 32
+// entity 27
 {
 "classname" "location_turret"
 "origin" "-104.000000 0.000000 44.000000"
 "angles" "-90.000000 0.000000 0.000005"
 }
+// entity 28
+{
+"classname" "fx_particles"
+"origin" "-324.000000 216.000000 4.000000"
+"angle" "-179.999985"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
+}
+// entity 29
+{
+"classname" "fx_particles"
+"origin" "-316.000000 216.000000 -36.000000"
+"angle" "-179.999985"
+"script" "engine_exhaust_tsukhan"
+"scale" "0.5"
+}
diff --git a/base/maps/tsukhan/sections/drake_engine1.map b/base/maps/tsukhan/sections/drake_engine1.map
index 344ccf1..c3b9769 100644
--- a/base/maps/tsukhan/sections/drake_engine1.map
+++ b/base/maps/tsukhan/sections/drake_engine1.map
@@ -493,5 +493,5 @@ tsukhan/tsukhan_entity_dark
 "classname" "fx_particles"
 "origin" "-24.000000 0.000000 -1.000000"
 "angle" "-179.999985"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
 }
diff --git a/base/maps/tsukhan/sections/drake_engine2.map b/base/maps/tsukhan/sections/drake_engine2.map
index d4d268d..76ec080 100644
--- a/base/maps/tsukhan/sections/drake_engine2.map
+++ b/base/maps/tsukhan/sections/drake_engine2.map
@@ -172,5 +172,5 @@
 "classname" "fx_particles"
 "origin" "-14.000000 0.000000 0.000000"
 "angle" "-180.000000"
-"script" "engine_trail_tsukhan"
+"script" "engine_exhaust_tsukhan"
 }
-- 
cgit v1.2.3