From ffbd978435893cf3846ff0ae6c348ba2d4756d55 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Mon, 12 Jan 2009 20:02:21 +0000
Subject: Corrected more console warnings. Updated scout, interceptor, halcyon,
 and avatar.

---
 base/maps/lindblade/avatar.map    |  69 ++++++++++++++++---------
 base/maps/lindblade/halcyon.map   | 103 +++++++++++++++++++++++++++++++-------
 base/maps/tsukhan/interceptor.map |  92 +++++++++++++++++++---------------
 base/maps/tsukhan/scout.map       |  76 +++++++++++++++++-----------
 4 files changed, 230 insertions(+), 110 deletions(-)

(limited to 'base')

diff --git a/base/maps/lindblade/avatar.map b/base/maps/lindblade/avatar.map
index 9d68e69..395553b 100644
--- a/base/maps/lindblade/avatar.map
+++ b/base/maps/lindblade/avatar.map
@@ -2,6 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
+"enginecolor" "0.500008 0.8 1"
 // brush 0
 {
 ( 224 72 16 ) ( 224 -72 -56 ) ( 224 72 -56 ) common/entity 0 0 0 1 1
@@ -455,7 +456,7 @@
 ( -224 -232 0 ) ( -208 -216 0 ) ( -208 -232 -16 ) colors/grey25 0 0 0 1 1
 ( -208 -192 0 ) ( -224 -176 -16 ) ( -208 -176 -16 ) colors/grey25 0 0 0 1 1
 ( -208 -232 -40 ) ( -208 -176 -16 ) ( -208 -176 -40 ) common/caulk 0 0 0 1 1
-( -224 -248 -16 ) ( -224 -176 -40 ) ( -224 -176 -16 ) colors/grey25 0 0 0 1 1
+( -224 -248 -16 ) ( -224 -176 -40 ) ( -224 -176 -16 ) common/engine 0 0 0 1 1
 }
 // brush 44
 {
@@ -862,7 +863,7 @@
 ( -224 232 0 ) ( -224 248 -16 ) ( -208 232 -16 ) colors/grey25 0 0 0 1 1
 ( 0 192 0 ) ( -128 176 -16 ) ( -128 192 0 ) colors/grey25 0 0 0 1 1
 ( -208 224 -72 ) ( -208 192 -72 ) ( -208 224 56 ) common/caulk 0 0 0 1 1
-( -224 232 -56 ) ( -224 232 0 ) ( -224 192 -40 ) colors/grey25 0 0 0 1 1
+( -224 232 -56 ) ( -224 232 0 ) ( -224 192 -40 ) common/engine 0 0 0 1 1
 }
 // brush 87
 {
@@ -1085,58 +1086,80 @@
 }
 // entity 1
 {
-"classname" "target_engine"
-"origin" "-232 -212 -28"
-"radius" "60"
-"_color" "0.5 0.8 1"
-}
-// entity 2
-{
-"classname" "target_engine"
-"origin" "-232 212 -28"
-"radius" "60"
-"_color" "0.500008 0.8 1"
-}
-// entity 3
-{
 "classname" "light"
 "origin" "0 -240 -24"
 "light" "9"
 "_color" "0.393027 1 0"
-"freequency" "1"
 "time" "0.5"
 "offset" "0.5"
 "spawnflags" "1"
+"frequency" "0.5"
 }
-// entity 4
+// entity 2
 {
 "classname" "light"
 "origin" "0 240 -24"
 "light" "9"
 "_color" "1 0 0.0567788"
-"freequency" "1"
 "time" "0.5"
 "spawnflags" "1"
+"frequency" "0.5"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "0 0 -72"
 "light" "9"
 "_color" "1 1 1"
-"freequency" "0.5"
 "time" "0.5"
 "offset" "0.25"
 "spawnflags" "1"
+"frequency" "0.5"
 }
-// entity 6
+// entity 4
 {
 "classname" "light"
 "origin" "0 0 72"
 "light" "9"
 "_color" "1 1 1"
-"freequency" "0.5"
 "time" "0.5"
 "offset" "0.25"
 "spawnflags" "1"
+"frequency" "0.5"
+}
+// entity 5
+{
+"classname" "fx_flare"
+"origin" "-240 -212 -28"
+"angle" "0"
+"flare" "4"
+"spawnflags" "4"
+"radius" "128"
+}
+// entity 6
+{
+"classname" "fx_flare"
+"origin" "-240 212 -28"
+"angle" "0"
+"flare" "4"
+"spawnflags" "4"
+"radius" "128"
+}
+// entity 7
+{
+"classname" "fx_flare"
+"origin" "-242 -212 -28"
+"angle" "180"
+"flare" "4"
+"spawnflags" "4"
+"radius" "128"
+}
+// entity 8
+{
+"classname" "fx_flare"
+"origin" "-242 212 -28"
+"angle" "180"
+"flare" "4"
+"spawnflags" "4"
+"radius" "128"
 }
diff --git a/base/maps/lindblade/halcyon.map b/base/maps/lindblade/halcyon.map
index 2f0a471..73f1d7a 100644
--- a/base/maps/lindblade/halcyon.map
+++ b/base/maps/lindblade/halcyon.map
@@ -2,6 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
+"enginecolor" "0.500008 0.8 1"
 // brush 0
 {
 ( 832 -256 448 ) ( 896 256 448 ) ( 896 -256 448 ) colors/grey50 0 0 0 1 1
@@ -570,7 +571,7 @@
 ( -640 -640 272 ) ( -704 -608 304 ) ( -704 -592 288 ) common/caulk 0 0 0 1 1 0 0 0
 ( -640 -640 112 ) ( -704 -592 96 ) ( -704 -608 80 ) common/caulk 0 0 0 1 1 0 0 0
 ( -640 -784 128 ) ( -704 -800 80 ) ( -704 -816 96 ) common/caulk 0 0 0 1 1 0 0 0
-( -704 -816 288 ) ( -704 -592 96 ) ( -704 -592 288 ) colors/grey25 0 0 0 1 1 0 0 0
+( -704 -816 288 ) ( -704 -592 96 ) ( -704 -592 288 ) common/engine 0 0 0 1 1 0 0 0
 ( -640 -784 128 ) ( -640 -624 256 ) ( -640 -624 128 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 57
@@ -2426,7 +2427,7 @@
 ( -640 640 272 ) ( -704 592 288 ) ( -704 608 304 ) common/caulk 0 0 0 1 1 0 0 0
 ( -640 640 112 ) ( -704 608 80 ) ( -704 592 96 ) common/caulk 0 0 0 1 1 0 0 0
 ( -640 784 128 ) ( -704 816 96 ) ( -704 800 80 ) common/caulk 0 0 0 1 1 0 0 0
-( -704 816 96 ) ( -704 592 288 ) ( -704 592 96 ) colors/grey25 0 0 0 1 1 0 0 0
+( -704 816 96 ) ( -704 592 288 ) ( -704 592 96 ) common/engine 0 0 0 1 1 0 0 0
 ( -640 784 256 ) ( -640 624 128 ) ( -640 624 256 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 252
@@ -3861,32 +3862,98 @@
 ( -64 224 480 ) ( -64 256 448 ) ( 64 224 480 ) common/caulk 0 0 0 1 1
 ( 64 -96 480 ) ( -64 -32 480 ) ( -64 -96 480 ) common/caulk 0 0 0 1 1
 }
+// brush 402
+{
+( -640 -48 336 ) ( -640 -124 336 ) ( -768 -48 336 ) common/caulk 0 0 0 1 1
+( -640 -48 336 ) ( -768 -48 336 ) ( -640 -48 112 ) common/caulk 0 0 0 1 1
+( -640 -48 336 ) ( -640 -48 112 ) ( -640 -124 336 ) common/caulk 0 0 0 1 1
+( -768 -124 112 ) ( -640 -124 112 ) ( -768 -48 112 ) common/caulk 0 0 0 1 1
+( -768 -272 108 ) ( -768 -272 332 ) ( -640 -272 108 ) common/caulk 0 0 0 1 1
+( -648 -112 -64 ) ( -648 -88 -64 ) ( -648 -112 64 ) common/engine 0 0 0 1 1
+( -64 -272 288 ) ( -64 -264 296 ) ( 64 -272 288 ) common/caulk 0 0 0 1 1
+( -64 -224 112 ) ( -64 -232 120 ) ( 64 -224 112 ) common/caulk 0 0 0 1 1
+( -64 -48 160 ) ( -64 -56 152 ) ( 64 -48 160 ) common/caulk 0 0 0 1 1
+( -64 -56 296 ) ( -64 -48 288 ) ( 64 -56 296 ) common/caulk 0 0 0 1 1
+}
+// brush 403
+{
+( -640 272 336 ) ( -640 196 336 ) ( -768 272 336 ) common/caulk 0 0 0 1 1
+( -640 272 336 ) ( -768 272 336 ) ( -640 272 112 ) common/caulk 0 0 0 1 1
+( -640 272 336 ) ( -640 272 112 ) ( -640 196 336 ) common/caulk 0 0 0 1 1
+( -768 196 112 ) ( -640 196 112 ) ( -768 272 112 ) common/caulk 0 0 0 1 1
+( -768 48 108 ) ( -768 48 332 ) ( -640 48 108 ) common/caulk 0 0 0 1 1
+( -648 208 -64 ) ( -648 232 -64 ) ( -648 208 64 ) common/engine 0 0 0 1 1
+( -64 48 288 ) ( -64 56 296 ) ( 64 48 288 ) common/caulk 0 0 0 1 1
+( -64 96 112 ) ( -64 88 120 ) ( 64 96 112 ) common/caulk 0 0 0 1 1
+( -64 272 160 ) ( -64 264 152 ) ( 64 272 160 ) common/caulk 0 0 0 1 1
+( -64 264 296 ) ( -64 272 288 ) ( 64 264 296 ) common/caulk 0 0 0 1 1
+}
 }
 // entity 1
 {
-"classname" "target_engine"
-"origin" "-736 -704 192"
-"radius" "265"
-"_color" "0.500008 0.8 1"
+"classname" "fx_flare"
+"origin" "-770 -160 224"
+"spawnflags" "4"
+"radius" "480"
+"angle" "180"
+"flare" "4"
 }
 // entity 2
 {
-"classname" "target_engine"
-"origin" "-672 -160 224"
-"radius" "265"
-"_color" "0.500008 0.8 1"
+"classname" "fx_flare"
+"origin" "-768 -160 224"
+"spawnflags" "4"
+"radius" "480"
+"flare" "4"
 }
 // entity 3
 {
-"classname" "target_engine"
-"origin" "-672 160 224"
-"radius" "265"
-"_color" "0.500008 0.8 1"
+"classname" "fx_flare"
+"origin" "-834 -704 192"
+"spawnflags" "4"
+"radius" "512"
+"angle" "180"
+"flare" "4"
 }
 // entity 4
 {
-"classname" "target_engine"
-"origin" "-736 704 192"
-"radius" "265"
-"_color" "0.500008 0.8 1"
+"classname" "fx_flare"
+"origin" "-832 -704 192"
+"spawnflags" "4"
+"radius" "512"
+"flare" "4"
+}
+// entity 5
+{
+"classname" "fx_flare"
+"origin" "-834 704 192"
+"spawnflags" "4"
+"radius" "512"
+"angle" "180"
+"flare" "4"
+}
+// entity 6
+{
+"classname" "fx_flare"
+"origin" "-832 704 192"
+"spawnflags" "4"
+"radius" "512"
+"flare" "4"
+}
+// entity 7
+{
+"classname" "fx_flare"
+"origin" "-770 160 224"
+"spawnflags" "4"
+"radius" "480"
+"angle" "180"
+"flare" "4"
+}
+// entity 8
+{
+"classname" "fx_flare"
+"origin" "-768 160 224"
+"spawnflags" "4"
+"radius" "480"
+"flare" "4"
 }
diff --git a/base/maps/tsukhan/interceptor.map b/base/maps/tsukhan/interceptor.map
index dfb8d80..03c5537 100644
--- a/base/maps/tsukhan/interceptor.map
+++ b/base/maps/tsukhan/interceptor.map
@@ -3021,94 +3021,106 @@
 // entity 4
 {
 "classname" "fx_particles"
-"origin" "-240 -152 -20"
+"origin" "-268 -152 -20"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
+"script" "engine_smoke_tsukhan"
 }
 // entity 5
 {
 "classname" "fx_particles"
-"origin" "-240 -152 20"
+"origin" "-276 -152 20"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
+"script" "engine_smoke_tsukhan"
 }
 // entity 6
 {
 "classname" "fx_particles"
-"origin" "-240 152 20"
+"origin" "-276 152 20"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
+"script" "engine_smoke_tsukhan"
 }
 // entity 7
 {
 "classname" "fx_particles"
-"origin" "-240 152 -20"
+"origin" "-268 152 -20"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
+"script" "engine_smoke_tsukhan"
 }
 // entity 8
 {
-"classname" "fx_particles"
-"origin" "-264 -152 -20"
-"angle" "180"
-"script" "engine_trail_tsukhan"
+"classname" "location_cannon"
+"origin" "152 -80 0"
 }
 // entity 9
 {
-"classname" "fx_particles"
-"origin" "-272 -152 20"
-"angle" "180"
-"script" "engine_trail_tsukhan"
+"classname" "location_cannon"
+"origin" "152 80 0"
 }
 // entity 10
 {
-"classname" "fx_particles"
-"origin" "-272 152 20"
-"angle" "180"
-"script" "engine_trail_tsukhan"
+"classname" "fx_flare"
+"origin" "-226 -74 0"
+"spawnflags" "4"
+"angle" "0"
+"flare" "3"
 }
 // entity 11
 {
-"classname" "fx_particles"
-"origin" "-264 152 -20"
+"classname" "fx_flare"
+"origin" "-234 -152 -20"
+"spawnflags" "4"
 "angle" "180"
-"script" "engine_trail_tsukhan"
+"flare" "3"
+"radius" "48"
 }
 // entity 12
 {
-"classname" "fx_particles"
-"origin" "-268 -152 -20"
-"angle" "180"
-"script" "engine_smoke_tsukhan"
+"classname" "fx_flare"
+"origin" "-226 74 0"
+"spawnflags" "4"
+"angle" "0"
+"flare" "3"
 }
 // entity 13
 {
-"classname" "fx_particles"
-"origin" "-276 -152 20"
+"classname" "fx_flare"
+"origin" "-234 -152 20"
+"spawnflags" "4"
 "angle" "180"
-"script" "engine_smoke_tsukhan"
+"flare" "3"
+"radius" "48"
 }
 // entity 14
 {
-"classname" "fx_particles"
-"origin" "-276 152 20"
+"classname" "fx_flare"
+"origin" "-234 152 20"
+"spawnflags" "4"
 "angle" "180"
-"script" "engine_smoke_tsukhan"
+"flare" "3"
+"radius" "48"
 }
 // entity 15
 {
-"classname" "fx_particles"
-"origin" "-268 152 -20"
+"classname" "fx_flare"
+"origin" "-234 152 -20"
+"spawnflags" "4"
 "angle" "180"
-"script" "engine_smoke_tsukhan"
+"flare" "3"
+"radius" "48"
 }
 // entity 16
 {
-"classname" "location_cannon"
-"origin" "152 -80 0"
+"classname" "fx_flare"
+"origin" "-228 74 0"
+"spawnflags" "4"
+"angle" "180"
+"flare" "3"
 }
 // entity 17
 {
-"classname" "location_cannon"
-"origin" "152 80 0"
+"classname" "fx_flare"
+"origin" "-228 -74 0"
+"spawnflags" "4"
+"angle" "180"
+"flare" "3"
 }
diff --git a/base/maps/tsukhan/scout.map b/base/maps/tsukhan/scout.map
index 1e83dee..fd0ed9e 100644
--- a/base/maps/tsukhan/scout.map
+++ b/base/maps/tsukhan/scout.map
@@ -4053,58 +4053,76 @@
 // entity 4
 {
 "classname" "fx_particles"
-"origin" "-172 -44 -48"
-"radius" "48"
+"origin" "-164 -44 -48"
 "angle" "180"
-"script" "engine_trail_tsukhan"
+"script" "engine_smoke_tsukhan"
 }
 // entity 5
 {
-"classname" "fx_particles"
-"origin" "-172 44 -48"
-"radius" "48"
-"angle" "180"
-"script" "engine_trail_tsukhan"
+"classname" "location_cannon"
+"origin" "248 -24 -56"
 }
 // entity 6
 {
-"classname" "fx_particles"
-"origin" "-164 -44 -48"
-"radius" "48"
-"angle" "180"
-"script" "engine_exhaust_tsukhan"
+"classname" "location_cannon"
+"origin" "248 24 -56"
 }
 // entity 7
 {
-"classname" "fx_particles"
-"origin" "-164 44 -48"
-"radius" "48"
+"classname" "fx_flare"
+"origin" "-168 -44 -48"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
+"flare" "3"
+"spawnflags" "4"
+"radius" "96"
 }
 // entity 8
 {
 "classname" "fx_particles"
-"origin" "-168 -44 -48"
-"radius" "48"
+"origin" "-164 44 -48"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
+"script" "engine_smoke_tsukhan"
 }
 // entity 9
 {
-"classname" "fx_particles"
-"origin" "-168 44 -48"
-"radius" "48"
-"angle" "180"
-"script" "engine_exhaust_tsukhan"
+"classname" "fx_flare"
+"origin" "-136 -168 -48"
+"flare" "3"
+"spawnflags" "4"
+"radius" "128"
 }
 // entity 10
 {
-"classname" "location_cannon"
-"origin" "248 -24 -56"
+"classname" "fx_flare"
+"origin" "-168 44 -48"
+"angle" "180"
+"flare" "3"
+"spawnflags" "4"
+"radius" "96"
 }
 // entity 11
 {
-"classname" "location_cannon"
-"origin" "248 24 -56"
+"classname" "fx_flare"
+"origin" "-136 168 -48"
+"flare" "3"
+"spawnflags" "4"
+"radius" "128"
+}
+// entity 12
+{
+"classname" "fx_flare"
+"origin" "-137 -168 -48"
+"angle" "180"
+"flare" "3"
+"spawnflags" "4"
+"radius" "128"
+}
+// entity 13
+{
+"classname" "fx_flare"
+"origin" "-137 168 -48"
+"angle" "180"
+"flare" "3"
+"spawnflags" "4"
+"radius" "128"
 }
-- 
cgit v1.2.3