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/scalar.map | 68 ++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 43 deletions(-)

(limited to 'base/maps/merchant/scalar.map')

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"
-- 
cgit v1.2.3