Updated avenger, bumblebee, bomber, and carrier.

Fixed more console warnings.

4 files changed, 158 insertions, 53 deletions

diff --git a/base/maps/independent/avenger.map b/base/maps/independent/avenger.map
index c01b59d..7a280b1 100644
--- a/base/maps/independent/avenger.map
+++ b/base/maps/independent/avenger.map
@@ -1212,5 +1212,19 @@
 "origin" "-46 0 0"
 "angle" "180"
 "script" "engine_exhaust"
-"radius" "48"
+}
+// entity 6
+{
+"classname" "fx_flare"
+"origin" "-66 0 0"
+"spawnflags" "4"
+"angle" "180"
+"flare" "2"
+}
+// entity 7
+{
+"classname" "fx_flare"
+"origin" "-64 0 0"
+"spawnflags" "4"
+"flare" "2"
 }
diff --git a/base/maps/independent/bumblebee.map b/base/maps/independent/bumblebee.map
index d0f5253..a10305b 100644
--- a/base/maps/independent/bumblebee.map
+++ b/base/maps/independent/bumblebee.map
@@ -146,7 +146,7 @@
 ( -112 -136 -40 ) ( -160 -128 -48 ) ( -160 -136 -40 ) colors/grey50 0 0 0 1 1
 ( -112 -80 -8 ) ( -160 -88 0 ) ( -160 -80 -8 ) colors/grey50 0 0 0 1 1
 ( -112 -80 -40 ) ( -160 -80 -40 ) ( -160 -88 -48 ) colors/grey50 0 0 0 1 1
-( -160 -80 -40 ) ( -160 -128 0 ) ( -160 -128 -48 ) colors/grey25 0 0 0 1 1
+( -160 -80 -40 ) ( -160 -128 0 ) ( -160 -128 -48 ) common/engine 0 0 0 1 1
 ( -152 -88 -64 ) ( -152 -104 -64 ) ( -152 -88 64 ) common/caulk 0 0 0 1 1
 }
 // brush 13
@@ -746,7 +746,7 @@
 ( -160 136 -40 ) ( -160 128 -48 ) ( -112 136 -40 ) colors/grey50 0 0 0 1 1
 ( -160 80 -8 ) ( -160 88 0 ) ( -112 80 -8 ) colors/grey50 0 0 0 1 1
 ( -160 88 -48 ) ( -160 80 -40 ) ( -112 80 -40 ) colors/grey50 0 0 0 1 1
-( -160 128 -48 ) ( -160 128 0 ) ( -160 80 -40 ) colors/grey25 0 0 0 1 1
+( -160 128 -48 ) ( -160 128 0 ) ( -160 80 -40 ) common/engine 0 0 0 1 1
 ( -152 -88 -64 ) ( -152 -104 -64 ) ( -152 -88 64 ) common/caulk 0 0 0 1 1
 }
 // brush 76
@@ -1302,26 +1302,6 @@
 }
 // entity 1
 {
-"classname" "target_engine"
-"origin" "-200 -108 -24"
-"radius" "40"
-"_color" "0.500008 0.8 1"
-}
-// entity 2
-{
-"classname" "target_flare"
-"origin" "300.5 0 -36"
-"radius" "20"
-}
-// entity 3
-{
-"classname" "target_engine"
-"origin" "-200 108 -24"
-"radius" "40"
-"_color" "0.500008 0.8 1"
-}
-// entity 4
-{
 "classname" "light"
 "origin" "-40 -200 -16"
 "light" "9"
@@ -1331,7 +1311,7 @@
 "spawnflags" "1"
 "offset" "0.5"
 }
-// entity 5
+// entity 2
 {
 "classname" "light"
 "origin" "-40 200 -16"
@@ -1341,7 +1321,7 @@
 "time" "0.5"
 "spawnflags" "1"
 }
-// entity 6
+// entity 3
 {
 "classname" "light"
 "origin" "-72 0 56"
@@ -1352,7 +1332,7 @@
 "spawnflags" "1"
 "offset" "1"
 }
-// entity 7
+// entity 4
 {
 "classname" "light"
 "origin" "88 0 56"
@@ -1363,7 +1343,7 @@
 "spawnflags" "1"
 "offset" "0"
 }
-// entity 8
+// entity 5
 {
 "classname" "light"
 "origin" "88 0 -80"
@@ -1374,7 +1354,7 @@
 "spawnflags" "1"
 "offset" "1"
 }
-// entity 9
+// entity 6
 {
 "classname" "light"
 "origin" "-72 0 -80"
@@ -1385,3 +1365,54 @@
 "spawnflags" "1"
 "offset" "0"
 }
+// entity 7
+{
+"classname" "fx_particles"
+"origin" "-200 -108 -24"
+"angle" "180"
+"script" "engine_trail"
+}
+// entity 8
+{
+"classname" "fx_particles"
+"origin" "-200 108 -24"
+"angle" "180"
+"script" "engine_trail"
+}
+// entity 9
+{
+"classname" "fx_flare"
+"origin" "-218 -108 -24"
+"flare" "4"
+"spawnflags" "4"
+"angle" "180"
+}
+// entity 10
+{
+"classname" "fx_flare"
+"origin" "-218 108 -24"
+"flare" "4"
+"spawnflags" "4"
+"angle" "180"
+}
+// entity 11
+{
+"classname" "fx_flare"
+"origin" "-216 -108 -24"
+"flare" "4"
+"spawnflags" "4"
+}
+// entity 12
+{
+"classname" "fx_flare"
+"origin" "-216 108 -24"
+"flare" "4"
+"spawnflags" "4"
+}
+// entity 13
+{
+"classname" "fx_flare"
+"origin" "300.5 0 -36"
+"radius" "20"
+"flare" "2"
+}
diff --git a/base/maps/tsukhan/bomber.map b/base/maps/tsukhan/bomber.map
index 71e9a15..5a8b344 100644
--- a/base/maps/tsukhan/bomber.map
+++ b/base/maps/tsukhan/bomber.map
@@ -1284,33 +1284,35 @@
 }
 // entity 5
 {
-"classname" "fx_particles"
-"origin" "-128 -108 -20"
-"radius" "64"
+"classname" "fx_flare"
+"origin" "-130 -116 -4"
+"flare" "3"
+"spawnflags" "4"
+"radius" "192"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
 }
 // entity 6
 {
-"classname" "fx_particles"
-"origin" "-128 -124 12"
-"radius" "64"
-"angle" "180"
-"script" "engine_exhaust_tsukhan"
+"classname" "fx_flare"
+"origin" "-128 -116 -4"
+"flare" "3"
+"spawnflags" "4"
+"radius" "192"
 }
 // entity 7
 {
-"classname" "fx_particles"
-"origin" "-128 108 -20"
-"radius" "64"
+"classname" "fx_flare"
+"origin" "-130 116 -4"
+"flare" "3"
+"spawnflags" "4"
+"radius" "192"
 "angle" "180"
-"script" "engine_exhaust_tsukhan"
 }
 // entity 8
 {
-"classname" "fx_particles"
-"origin" "-128 124 12"
-"radius" "64"
-"angle" "180"
-"script" "engine_exhaust_tsukhan"
+"classname" "fx_flare"
+"origin" "-128 116 -4"
+"flare" "3"
+"spawnflags" "4"
+"radius" "192"
 }
diff --git a/base/maps/tsukhan/carrier.map b/base/maps/tsukhan/carrier.map
index 8178805..7a5a4c2 100644
--- a/base/maps/tsukhan/carrier.map
+++ b/base/maps/tsukhan/carrier.map
@@ -2663,17 +2663,75 @@
 }
 // entity 3
 {
-"classname" "fx_particles"
-"origin" "-624 -112 -32"
+"classname" "fx_flare"
+"origin" "-616 -112 -32"
 "angle" "180"
-"radius" "192"
-"script" "engine_exhaust_tsukhan"
+"spawnflags" "4"
+"flare" "3"
+"radius" "160"
 }
 // entity 4
 {
-"classname" "fx_particles"
-"origin" "-624 112 -32"
+"classname" "fx_flare"
+"origin" "-616 112 -32"
+"angle" "180"
+"spawnflags" "4"
+"flare" "3"
+"radius" "160"
+}
+// entity 5
+{
+"classname" "fx_flare"
+"origin" "-632 -112 -32"
+"angle" "180"
+"spawnflags" "4"
+"flare" "3"
+"radius" "192"
+}
+// entity 6
+{
+"classname" "fx_flare"
+"origin" "-632 112 -32"
 "angle" "180"
+"spawnflags" "4"
+"flare" "3"
 "radius" "192"
-"script" "engine_exhaust_tsukhan"
+}
+// entity 7
+{
+"classname" "fx_flare"
+"origin" "-648 -112 -32"
+"angle" "180"
+"spawnflags" "4"
+"flare" "3"
+"radius" "256"
+}
+// entity 8
+{
+"classname" "fx_flare"
+"origin" "-648 112 -32"
+"angle" "180"
+"spawnflags" "4"
+"flare" "3"
+"radius" "256"
+}
+// entity 9
+{
+"classname" "fx_flare"
+"origin" "-737 -112 -32"
+"angle" "180"
+"spawnflags" "4"
+"flare" "3"
+"radius" "512"
+"cull" "none"
+}
+// entity 10
+{
+"classname" "fx_flare"
+"origin" "-737 112 -32"
+"angle" "180"
+"spawnflags" "4"
+"flare" "3"
+"radius" "512"
+"cull" "none"
 }