From 7be9f29b5c2f8bbca5c19df4d5b87fe5846333ac Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Mon, 12 Jan 2009 20:16:24 +0000
Subject: Updated raider, orion. Fixed more console warnings.

---
 base/maps/independent/orion.map | 72 +++++++++++++++++++++++++++++------------
 base/maps/pirate/raider.map     | 54 +++++++++++++++++++++++++++++--
 2 files changed, 103 insertions(+), 23 deletions(-)

(limited to 'base')

diff --git a/base/maps/independent/orion.map b/base/maps/independent/orion.map
index 509ecc5..8cc8f50 100644
--- a/base/maps/independent/orion.map
+++ b/base/maps/independent/orion.map
@@ -292,7 +292,7 @@
 ( -152 56 -10 ) ( -104 56 -10 ) ( -104 60 -12 ) common/caulk 0 0 0 1 1 134217728 0 0
 ( -104 60 -12 ) ( -104 56 -10 ) ( -104 60 12 ) colors/grey25 0 0 0 1 1 134217728 0 0
 ( -104 56 10 ) ( -152 56 10 ) ( -104 60 12 ) common/caulk 0 0 0 1 1 134217728 0 0
-( -152 60 12 ) ( -152 56 -10 ) ( -152 60 -12 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -152 60 12 ) ( -152 56 -10 ) ( -152 60 -12 ) common/engine 0 0 0 1 1 134217728 0 0
 ( -104 77 -6 ) ( -152 77 -6 ) ( -104 68 -12 ) common/caulk 0 0 0 1 1 134217728 0 0
 ( -152 77 -6 ) ( -104 77 -6 ) ( -152 77 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
 ( -152 77 6 ) ( -104 77 6 ) ( -152 68 12 ) common/caulk 0 0 0 1 1 134217728 0 0
@@ -376,7 +376,7 @@
 ( -104 -60 -12 ) ( -104 -56 -10 ) ( -152 -56 -10 ) common/caulk 0 0 0 1 1 134217728 0 0
 ( -104 -60 12 ) ( -104 -56 -10 ) ( -104 -60 -12 ) colors/grey25 0 0 0 1 1 134217728 0 0
 ( -104 -60 12 ) ( -152 -56 10 ) ( -104 -56 10 ) common/caulk 0 0 0 1 1 134217728 0 0
-( -152 -60 -12 ) ( -152 -56 -10 ) ( -152 -60 12 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -152 -60 -12 ) ( -152 -56 -10 ) ( -152 -60 12 ) common/engine 0 0 0 1 1 134217728 0 0
 ( -104 -68 -12 ) ( -152 -77 -6 ) ( -104 -77 -6 ) common/caulk 0 0 0 1 1 134217728 0 0
 ( -152 -77 6 ) ( -104 -77 -6 ) ( -152 -77 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
 ( -152 -68 12 ) ( -104 -77 6 ) ( -152 -77 6 ) common/caulk 0 0 0 1 1 134217728 0 0
@@ -690,20 +690,6 @@
 }
 // entity 1
 {
-"classname" "target_engine"
-"origin" "-162 -64 0"
-"angle" "180"
-"radius" "50"
-}
-// entity 2
-{
-"classname" "target_engine"
-"origin" "-162 64 0"
-"angle" "180"
-"radius" "50"
-}
-// entity 3
-{
 "classname" "light"
 "origin" "-16 0 52"
 "light" "10"
@@ -711,21 +697,21 @@
 "offset" "0.5"
 "time" ".2"
 }
-// entity 4
+// entity 2
 {
 "classname" "light"
 "origin" "0 108 0"
 "light" "10"
 "_color" "1 0 0"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "0 -108 0"
 "light" "10"
 "_color" "0 1 0"
 }
-// entity 6
+// entity 4
 {
 "classname" "light"
 "origin" "56 0 52"
@@ -733,10 +719,56 @@
 "spawnflags" "1"
 "time" ".2"
 }
+// entity 5
+{
+"classname" "fx_flare"
+"origin" "-160 -64 0"
+"angle" "0"
+"spawnflags" "4"
+"flare" "4"
+}
+// entity 6
+{
+"classname" "fx_flare"
+"origin" "-160 64 0"
+"angle" "0"
+"spawnflags" "4"
+"flare" "4"
+}
 // entity 7
 {
-"classname" "target_flare"
+"classname" "fx_flare"
+"origin" "-162 64 0"
+"angle" "180"
+"spawnflags" "4"
+"flare" "4"
+}
+// entity 8
+{
+"classname" "fx_flare"
+"origin" "-162 -64 0"
+"angle" "180"
+"spawnflags" "4"
+"flare" "4"
+}
+// entity 9
+{
+"classname" "fx_flare"
 "origin" "140 0 0"
 "radius" "30"
 "flare" "2"
 }
+// entity 10
+{
+"classname" "fx_particles"
+"origin" "-156 -66 0"
+"angle" "180"
+"script" "engine_trail"
+}
+// entity 11
+{
+"classname" "fx_particles"
+"origin" "-156 66 0"
+"angle" "180"
+"script" "engine_trail"
+}
diff --git a/base/maps/pirate/raider.map b/base/maps/pirate/raider.map
index 9133c72..5d8115d 100644
--- a/base/maps/pirate/raider.map
+++ b/base/maps/pirate/raider.map
@@ -1753,7 +1753,6 @@
 "classname" "fx_particles"
 "origin" "-162 36 -20"
 "angle" "180"
-"radius" "28"
 "script" "engine_trail"
 }
 // entity 2
@@ -1777,7 +1776,6 @@
 "classname" "fx_particles"
 "origin" "-162 -36 -20"
 "angle" "180"
-"radius" "28"
 "script" "engine_trail"
 }
 // entity 5
@@ -1793,7 +1791,6 @@
 "classname" "fx_particles"
 "origin" "-162 0 -20"
 "angle" "180"
-"radius" "28"
 "script" "engine_trail"
 }
 // entity 7
@@ -1806,3 +1803,54 @@
 "classname" "location_cannon"
 "origin" "88 -74 0"
 }
+// entity 9
+{
+"classname" "fx_flare"
+"origin" "-174 -36 -20"
+"spawnflags" "4"
+"flare" "4"
+"radius" "48"
+"angle" "180"
+}
+// entity 10
+{
+"classname" "fx_flare"
+"origin" "-172 -36 -20"
+"spawnflags" "4"
+"flare" "4"
+"radius" "48"
+}
+// entity 11
+{
+"classname" "fx_flare"
+"origin" "-172 36 -20"
+"spawnflags" "4"
+"flare" "4"
+"radius" "48"
+}
+// entity 12
+{
+"classname" "fx_flare"
+"origin" "-174 36 -20"
+"spawnflags" "4"
+"flare" "4"
+"radius" "48"
+"angle" "180"
+}
+// entity 13
+{
+"classname" "fx_flare"
+"origin" "-176 0 -20"
+"spawnflags" "4"
+"flare" "4"
+"radius" "48"
+}
+// entity 14
+{
+"classname" "fx_flare"
+"origin" "-178 0 -20"
+"spawnflags" "4"
+"flare" "4"
+"radius" "48"
+"angle" "180"
+}
-- 
cgit v1.2.3