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/merchant/matrix.map | 118 +++++++++++++++++-------------------------
 base/maps/merchant/scalar.map |  68 +++++++++---------------
 base/maps/merchant/vector.map |  12 +++--
 3 files changed, 80 insertions(+), 118 deletions(-)

(limited to 'base/maps/merchant')

diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index efd671a..6c3735b 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -1748,7 +1748,7 @@
 ( -480 -160 -152 ) ( -480 -160 -200 ) ( -480 -208 -152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 -200 ) ( -480 -208 -200 ) ( -552 -160 -200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 -200 ) ( -552 -208 -152 ) ( -480 -208 -200 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 163
 {
@@ -1757,7 +1757,7 @@
 ( -480 -160 200 ) ( -480 -160 152 ) ( -480 -208 200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 152 ) ( -480 -208 152 ) ( -552 -160 152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 152 ) ( -552 -208 200 ) ( -480 -208 152 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 164
 {
@@ -1766,7 +1766,7 @@
 ( -480 208 200 ) ( -480 208 152 ) ( -480 160 200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 152 ) ( -480 160 152 ) ( -552 208 152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 152 ) ( -552 160 200 ) ( -480 160 152 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 165
 {
@@ -1775,7 +1775,7 @@
 ( -480 208 -152 ) ( -480 208 -200 ) ( -480 160 -152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 -200 ) ( -480 160 -200 ) ( -552 208 -200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 -200 ) ( -552 160 -152 ) ( -480 160 -200 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) colors/black_bright 0 0 0 1 1 0 0 0
+( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) common/engine 0 0 0 1 1 0 0 0
 }
 // brush 166
 {
@@ -3292,11 +3292,11 @@
 // brush 329
 {
 ( -448 128 80 ) ( -448 -128 80 ) ( -256 -128 80 ) common/caulk 0 0 0 1 1 0 0 0
-( -432 64 80 ) ( -320 64 120 ) ( -432 -64 80 ) thorn/panel_01 0 0 0 1 1 0 0 0
-( 368 120 80 ) ( 368 -120 80 ) ( 256 64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0
+( -432 64 80 ) ( -320 64 120 ) ( -432 -64 80 ) glass/plain 0 0 0 1 1 0 0 0
+( 368 120 80 ) ( 368 -120 80 ) ( 256 64 120 ) glass/plain 0 0 0 1 1 0 0 0
 ( -192 -64 120 ) ( -192 64 120 ) ( -128 -64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0
-( -452 120 80 ) ( 368 120 80 ) ( -452 64 120 ) thorn/panel_01 0 0 0 1 1 0 0 0
-( -452 -64 120 ) ( 368 -120 80 ) ( -452 -120 80 ) thorn/panel_01 0 0 0 1 1 0 0 0
+( -452 120 80 ) ( 368 120 80 ) ( -452 64 120 ) glass/plain 0 0 0 1 1 0 0 0
+( -452 -64 120 ) ( 368 -120 80 ) ( -452 -120 80 ) glass/plain 0 0 0 1 1 0 0 0
 }
 // brush 330
 {
@@ -4482,22 +4482,13 @@ common/entity_second
 // entity 20
 {
 "classname" "fx_flare"
-"origin" "-496.000000 -184.000000 -176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 21
-{
-"classname" "fx_flare"
 "origin" "-568.000000 80.000000 0.000000"
 "angle" "-179.999985"
 "spawnflags" "4"
 "radius" "56"
 "flare" "1"
 }
-// entity 22
+// entity 21
 {
 "classname" "fx_flare"
 "origin" "-568.000000 -80.000000 0.000000"
@@ -4506,35 +4497,41 @@ common/entity_second
 "radius" "56"
 "flare" "1"
 }
-// entity 23
+// entity 22
 {
 "classname" "fx_particles"
 "origin" "-544.000000 -184.000000 -176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
-// entity 24
+// entity 23
 {
 "classname" "fx_particles"
-"origin" "-704.000000 80.000000 0.000000"
+"origin" "-672.000000 80.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "2"
 }
-// entity 25
+// entity 24
 {
 "classname" "fx_particles"
-"origin" "-704.000000 -80.000000 0.000000"
+"origin" "-672.000000 -80.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "2"
 }
-// entity 26
+// entity 25
 {
 "classname" "light"
 "origin" "-560.000000 -184.000000 -176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 27
+// entity 26
 {
 "classname" "func_group"
 // brush 0
@@ -4771,7 +4768,7 @@ common/entity_second
 ( 64 160 -124 ) ( 128 -160 -124 ) ( 128 160 -124 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 28
+// entity 27
 {
 "classname" "func_group"
 // brush 0
@@ -5026,7 +5023,7 @@ common/entity_second
 ( -268 -66 148 ) ( -276 62 148 ) ( -268 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 29
+// entity 28
 {
 "classname" "func_group"
 // brush 0
@@ -5281,7 +5278,7 @@ common/entity_second
 ( -76 -66 148 ) ( -84 62 148 ) ( -76 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 30
+// entity 29
 {
 "classname" "func_group"
 // brush 0
@@ -5536,7 +5533,7 @@ common/entity_second
 ( 116 -66 148 ) ( 108 62 148 ) ( 116 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 31
+// entity 30
 {
 "classname" "func_group"
 // brush 0
@@ -5773,7 +5770,7 @@ common/entity_second
 ( -128 160 -124 ) ( -64 -160 -124 ) ( -64 160 -124 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 32
+// entity 31
 {
 "classname" "func_group"
 // brush 0
@@ -6010,100 +6007,79 @@ common/entity_second
 ( -320 160 -124 ) ( -256 -160 -124 ) ( -256 160 -124 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 33
+// entity 32
 {
 "classname" "light"
 "origin" "-544.000000 -184.000000 -176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 34
+// entity 33
 {
 "classname" "light"
 "origin" "-544.000000 -184.000000 176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 35
+// entity 34
 {
 "classname" "light"
 "origin" "-560.000000 -184.000000 176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 36
-{
-"classname" "fx_flare"
-"origin" "-496.000000 -184.000000 176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 37
+// entity 35
 {
 "classname" "fx_particles"
 "origin" "-544.000000 -184.000000 176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
-// entity 38
+// entity 36
 {
 "classname" "light"
 "origin" "-544.000000 184.000000 176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 39
+// entity 37
 {
 "classname" "light"
 "origin" "-560.000000 184.000000 176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 40
-{
-"classname" "fx_flare"
-"origin" "-496.000000 184.000000 176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 41
+// entity 38
 {
 "classname" "fx_particles"
 "origin" "-544.000000 184.000000 176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
-// entity 42
+// entity 39
 {
 "classname" "light"
 "origin" "-544.000000 184.000000 -176.000000"
 "light" "32"
 "spawnflags" "4"
 }
-// entity 43
+// entity 40
 {
 "classname" "light"
 "origin" "-560.000000 184.000000 -176.000000"
 "spawnflags" "4"
 "light" "28"
 }
-// entity 44
-{
-"classname" "fx_flare"
-"origin" "-496.000000 184.000000 -176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "32"
-}
-// entity 45
+// entity 41
 {
 "classname" "fx_particles"
 "origin" "-544.000000 184.000000 -176.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"scale" "0.5"
+"spawnflags" "4"
 }
diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index 476c30e..e9c9f64 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -1962,49 +1962,31 @@ colors/grey75
 // entity 4
 {
 "classname" "fx_particles"
-"origin" "-224.000000 -72.000000 -24.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-}
-// entity 5
-{
-"classname" "fx_particles"
-"origin" "-224.000000 72.000000 -24.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-}
-// entity 6
-{
-"classname" "fx_particles"
-"origin" "-272.000000 0.000000 16.000000"
-"angle" "180.000000"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 7
-{
-"classname" "fx_particles"
 "origin" "-216.000000 -72.000000 -24.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
 "scale" "0.5"
+"spawnflags" "4"
 }
-// entity 8
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-272.000000 0.000000 16.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
+"scale" "1.5"
+"spawnflags" "4"
 }
-// entity 9
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-216.000000 72.000000 -24.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
 "scale" "0.5"
+"spawnflags" "4"
 }
-// entity 10
+// entity 7
 {
 "classname" "light"
 "origin" "104.000000 0.000000 -24.000000"
@@ -2013,7 +1995,7 @@ colors/grey75
 "spawnflags" "1"
 "offset" "0.3"
 }
-// entity 11
+// entity 8
 {
 "classname" "light"
 "origin" "0.000000 -66.000000 16.000000"
@@ -2022,7 +2004,7 @@ colors/grey75
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 12
+// entity 9
 {
 "classname" "light"
 "origin" "0.000000 66.000000 16.000000"
@@ -2032,7 +2014,7 @@ colors/grey75
 "offset" "0.5"
 "time" "0.2"
 }
-// entity 13
+// entity 10
 {
 "classname" "light"
 "origin" "-176.000000 0.000000 -32.000000"
@@ -2040,7 +2022,7 @@ colors/grey75
 "time" "0.1"
 "spawnflags" "1"
 }
-// entity 14
+// entity 11
 {
 "classname" "light"
 "origin" "0.000000 0.000000 56.000000"
@@ -2049,7 +2031,7 @@ colors/grey75
 "spawnflags" "1"
 "offset" "0.5"
 }
-// entity 15
+// entity 12
 {
 "classname" "light"
 "origin" "-128.000000 0.000000 56.000000"
@@ -2058,7 +2040,7 @@ colors/grey75
 "spawnflags" "1"
 "offset" "0.8"
 }
-// entity 16
+// entity 13
 {
 "classname" "light"
 "origin" "-128.000000 -66.000000 16.000000"
@@ -2067,7 +2049,7 @@ colors/grey75
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 17
+// entity 14
 {
 "classname" "light"
 "origin" "-128.000000 66.000000 16.000000"
@@ -2077,77 +2059,77 @@ colors/grey75
 "offset" "0.5"
 "time" "0.2"
 }
-// entity 18
+// entity 15
 {
 "classname" "light"
 "origin" "-300.000000 -8.000000 16.000000"
 "light" "20"
 "spawnflags" "4"
 }
-// entity 19
+// entity 16
 {
 "classname" "light"
 "origin" "-292.000000 0.000000 16.000000"
 "light" "28"
 "spawnflags" "4"
 }
-// entity 20
+// entity 17
 {
 "classname" "light"
 "origin" "-272.000000 -16.000000 16.000000"
 "light" "36"
 "spawnflags" "4"
 }
-// entity 21
+// entity 18
 {
 "classname" "light"
 "origin" "-272.000000 16.000000 16.000000"
 "light" "36"
 "spawnflags" "4"
 }
-// entity 22
+// entity 19
 {
 "classname" "light"
 "origin" "-288.000000 -12.000000 16.000000"
 "light" "28"
 "spawnflags" "4"
 }
-// entity 23
+// entity 20
 {
 "classname" "light"
 "origin" "-288.000000 12.000000 16.000000"
 "light" "28"
 "spawnflags" "4"
 }
-// entity 24
+// entity 21
 {
 "classname" "light"
 "origin" "-300.000000 8.000000 16.000000"
 "light" "20"
 "spawnflags" "4"
 }
-// entity 25
+// entity 22
 {
 "classname" "light"
 "origin" "-308.000000 0.000000 16.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 26
+// entity 23
 {
 "classname" "light"
 "origin" "-224.000000 -72.000000 -24.000000"
 "light" "16"
 "spawnflags" "4"
 }
-// entity 27
+// entity 24
 {
 "classname" "light"
 "origin" "-224.000000 72.000000 -24.000000"
 "light" "16"
 "spawnflags" "4"
 }
-// entity 28
+// entity 25
 {
 "classname" "light"
 "origin" "-64.000000 72.000000 -24.000000"
diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map
index 2c807ec..c94f3f2 100644
--- a/base/maps/merchant/vector.map
+++ b/base/maps/merchant/vector.map
@@ -1891,7 +1891,7 @@
 }
 // brush 193
 {
-( -144 67.5 -24 ) ( -144 76.5 -24 ) ( -144 67.5 8 ) colors/black_bright 0 0 0 0.5 0.5 0 0 0
+( -144 67.5 -24 ) ( -144 76.5 -24 ) ( -144 67.5 8 ) common/engine 0 0 0 0.5 0.5 0 0 0
 ( -64 72 4 ) ( -64 74 4 ) ( 64 72 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 84 4 ) ( -64 84 2 ) ( 64 84 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 84 -20 ) ( -64 82 -20 ) ( 64 84 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -3512,7 +3512,7 @@ colors/grey50
 }
 // brush 344
 {
-( -144 -76.5 -24 ) ( -144 -67.5 -24 ) ( -144 -76.5 8 ) colors/black_bright 0 0 0 0.5 0.5 0 0 0
+( -144 -76.5 -24 ) ( -144 -67.5 -24 ) ( -144 -76.5 8 ) common/engine 0 0 0 0.5 0.5 0 0 0
 ( -64 -72 4 ) ( -64 -70 4 ) ( 64 -72 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -60 4 ) ( -64 -60 2 ) ( 64 -60 4 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -60 -20 ) ( -64 -62 -20 ) ( 64 -60 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -4028,14 +4028,18 @@ colors/grey75
 "classname" "fx_particles"
 "origin" "-172 72 -8"
 "angle" "180"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "0.8"
 }
 // entity 12
 {
 "classname" "fx_particles"
 "origin" "-172 -72 -8"
 "angle" "180"
-"script" "engine_trail"
+"script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "0.8"
 }
 // entity 13
 {
-- 
cgit v1.2.3