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/lindblade/avatar.map   |   8 +--
 base/maps/lindblade/penchant.map | 122 ++++++++++++---------------------------
 base/maps/lindblade/winsor.map   |  10 ++--
 3 files changed, 48 insertions(+), 92 deletions(-)

(limited to 'base/maps/lindblade')

diff --git a/base/maps/lindblade/avatar.map b/base/maps/lindblade/avatar.map
index 011f02e..2f41905 100644
--- a/base/maps/lindblade/avatar.map
+++ b/base/maps/lindblade/avatar.map
@@ -2928,8 +2928,8 @@ colors/grey50
 "classname" "fx_particles"
 "origin" "-220.000000 212.000000 -28.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust_lindblade"
+"spawnflags" "4"
 }
 // entity 6
 {
@@ -2986,8 +2986,8 @@ colors/grey50
 "classname" "fx_particles"
 "origin" "-220.000000 -212.000000 -28.000000"
 "angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust_lindblade"
+"spawnflags" "4"
 }
 // entity 14
 {
diff --git a/base/maps/lindblade/penchant.map b/base/maps/lindblade/penchant.map
index 9ff801f..60bee3e 100644
--- a/base/maps/lindblade/penchant.map
+++ b/base/maps/lindblade/penchant.map
@@ -5813,38 +5813,6 @@ colors/chrome
 }
 // entity 14
 {
-"classname" "fx_particles"
-"origin" "-888.000000 368.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 15
-{
-"classname" "fx_particles"
-"origin" "-888.000000 432.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 16
-{
-"classname" "fx_particles"
-"origin" "-888.000000 400.000000 80.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 17
-{
-"classname" "fx_particles"
-"origin" "-888.000000 400.000000 16.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 18
-{
 "classname" "fx_flare"
 "origin" "-888.000000 400.000000 48.000000"
 "angle" "180"
@@ -5853,59 +5821,36 @@ colors/chrome
 "cull" "none"
 "flare" "1"
 }
-// entity 19
+// entity 15
 {
 "classname" "light"
 "origin" "-992.000000 400.000000 48.000000"
 "spawnflags" "4"
 }
-// entity 20
+// entity 16
 {
 "classname" "light"
 "origin" "-904.000000 400.000000 48.000000"
 "spawnflags" "4"
 "radius" "64"
 }
-// entity 21
+// entity 17
 {
 "classname" "light"
 "origin" "-944.000000 400.000000 48.000000"
 "spawnflags" "4"
 "radius" "72"
 }
-// entity 22
-{
-"classname" "fx_particles"
-"origin" "-888.000000 -432.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 23
-{
-"classname" "fx_particles"
-"origin" "-888.000000 -368.000000 48.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 24
-{
-"classname" "fx_particles"
-"origin" "-888.000000 -400.000000 80.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"script" "engine_trail"
-}
-// entity 25
+// entity 18
 {
 "classname" "fx_particles"
-"origin" "-888.000000 -400.000000 16.000000"
-"angle" "180.000000"
+"origin" "-888.000000 400.000000 48.000000"
+"angle" "-179.999985"
 "spawnflags" "4"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "4"
 }
-// entity 26
+// entity 19
 {
 "classname" "fx_flare"
 "origin" "-888.000000 -400.000000 48.000000"
@@ -5915,27 +5860,27 @@ colors/chrome
 "cull" "none"
 "flare" "1"
 }
-// entity 27
+// entity 20
 {
 "classname" "light"
 "origin" "-992.000000 -400.000000 48.000000"
 "spawnflags" "4"
 }
-// entity 28
+// entity 21
 {
 "classname" "light"
 "origin" "-904.000000 -400.000000 48.000000"
 "spawnflags" "4"
 "radius" "64"
 }
-// entity 29
+// entity 22
 {
 "classname" "light"
 "origin" "-944.000000 -400.000000 48.000000"
 "spawnflags" "4"
 "radius" "72"
 }
-// entity 30
+// entity 23
 {
 "classname" "func_group"
 // brush 0
@@ -5986,7 +5931,7 @@ colors/chrome
 ( -128 224 192 ) ( -128 256 128 ) ( -320 352 192 ) common/caulk 0 0 0 1 1 134217728 0 0
 }
 }
-// entity 31
+// entity 24
 {
 "classname" "func_group"
 // brush 0
@@ -6037,19 +5982,19 @@ colors/chrome
 ( -320 -352 192 ) ( -128 -256 128 ) ( -128 -224 192 ) common/caulk 0 0 0 1 1 134217728 0 0
 }
 }
-// entity 32
+// entity 25
 {
 "classname" "fx_flare"
 "origin" "-151.000000 -400.000000 48.000000"
 "radius" "90"
 }
-// entity 33
+// entity 26
 {
 "classname" "fx_flare"
 "origin" "-151.000000 400.000000 48.000000"
 "radius" "90"
 }
-// entity 34
+// entity 27
 {
 "classname" "light"
 "origin" "-512.000000 0.000000 344.000000"
@@ -6059,7 +6004,7 @@ colors/chrome
 "frequency" "0.5"
 "time" "0.5"
 }
-// entity 35
+// entity 28
 {
 "classname" "light"
 "origin" "-1160.000000 0.000000 152.000000"
@@ -6070,7 +6015,7 @@ colors/chrome
 "time" "0.5"
 "offset" "1"
 }
-// entity 36
+// entity 29
 {
 "classname" "light"
 "origin" "-736.000000 -496.000000 64.000000"
@@ -6080,7 +6025,7 @@ colors/chrome
 "frequency" "1"
 "_color" "0 1 0.0334173"
 }
-// entity 37
+// entity 30
 {
 "classname" "light"
 "origin" "-288.000000 -496.000000 63.999992"
@@ -6091,7 +6036,7 @@ colors/chrome
 "_color" "0 1 0.0334173"
 "offset" "0.3"
 }
-// entity 38
+// entity 31
 {
 "classname" "light"
 "origin" "-736.000000 488.000000 64.000000"
@@ -6102,7 +6047,7 @@ colors/chrome
 "_color" "1 0 0.0906691"
 "offset" "1"
 }
-// entity 39
+// entity 32
 {
 "classname" "light"
 "origin" "-288.000000 488.000000 63.999992"
@@ -6113,7 +6058,7 @@ colors/chrome
 "_color" "1 0 0.0906691"
 "offset" "1.3"
 }
-// entity 40
+// entity 33
 {
 "classname" "light"
 "origin" "-1160.000000 0.000000 -24.000000"
@@ -6123,7 +6068,7 @@ colors/chrome
 "frequency" "0.5"
 "time" "0.5"
 }
-// entity 41
+// entity 34
 {
 "classname" "light"
 "origin" "368.000000 0.000000 208.000000"
@@ -6133,7 +6078,7 @@ colors/chrome
 "time" ".5"
 "frequency" "1"
 }
-// entity 42
+// entity 35
 {
 "classname" "light"
 "origin" "416.000000 0.000000 -16.000000"
@@ -6143,7 +6088,7 @@ colors/chrome
 "offset" ".5"
 "time" ".1"
 }
-// entity 43
+// entity 36
 {
 "classname" "light"
 "origin" "-512.000000 0.000000 -120.000000"
@@ -6154,7 +6099,7 @@ colors/chrome
 "time" "0.25"
 "offset" "0.5"
 }
-// entity 44
+// entity 37
 {
 "classname" "light"
 "origin" "128.000000 0.000000 -120.000000"
@@ -6164,7 +6109,7 @@ colors/chrome
 "frequency" "1"
 "time" "0.25"
 }
-// entity 45
+// entity 38
 {
 "classname" "light"
 "origin" "-192.000000 0.000000 -120.000000"
@@ -6175,7 +6120,7 @@ colors/chrome
 "time" "0.25"
 "offset" "0.25"
 }
-// entity 46
+// entity 39
 {
 "classname" "light"
 "origin" "-832.000000 0.000000 -120.000000"
@@ -6186,3 +6131,12 @@ colors/chrome
 "time" "0.25"
 "offset" "0.75"
 }
+// entity 40
+{
+"classname" "fx_particles"
+"origin" "-888.000000 -400.000000 48.000000"
+"angle" "-179.999985"
+"spawnflags" "4"
+"script" "engine_exhaust"
+"scale" "4"
+}
diff --git a/base/maps/lindblade/winsor.map b/base/maps/lindblade/winsor.map
index a65fc65..91b9e52 100644
--- a/base/maps/lindblade/winsor.map
+++ b/base/maps/lindblade/winsor.map
@@ -3107,8 +3107,9 @@ colors/grey25_shiny
 "classname" "fx_particles"
 "origin" "-284.000000 -184.000000 -16.000000"
 "angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 3
 {
@@ -3315,8 +3316,9 @@ colors/grey25_shiny
 "classname" "fx_particles"
 "origin" "-284.000000 184.000000 -16.000000"
 "angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
+"script" "engine_exhaust"
+"scale" "2"
+"spawnflags" "4"
 }
 // entity 32
 {
-- 
cgit v1.2.3