Fixed issue in entities.def.

Updated archer, talon.
Fixed interceptor detail brushes.

4 files changed, 49 insertions, 53 deletions

diff --git a/base/maps/mercenary/archer.map b/base/maps/mercenary/archer.map
index 95cbb29..5ef39ef 100644
--- a/base/maps/mercenary/archer.map
+++ b/base/maps/mercenary/archer.map
@@ -2128,31 +2128,20 @@
 }
 // entity 8
 {
-"classname" "fx_flare"
-"origin" "-81.000000 0.000000 8.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"flare" "5"
-"cull" "none"
-"roll" "90"
-"radius" "150"
-}
-// entity 9
-{
 "classname" "fx_particles"
 "origin" "-66.000000 -60.000000 8.000000"
 "angle" "180.000000"
 "script" "engine_trail"
 "spawnflags" "2"
 }
-// entity 10
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-72.000000 -112.000000 8.000000"
 "angle" "180.000000"
 "script" "engine_trail"
 }
-// entity 11
+// entity 10
 {
 "classname" "light"
 "origin" "160.000000 0.000000 -10.000000"
@@ -2163,7 +2152,7 @@
 "time" "0.1"
 "offset" "0.5"
 }
-// entity 12
+// entity 11
 {
 "classname" "light"
 "origin" "-26.500000 112.000000 8.000000"
@@ -2173,7 +2162,7 @@
 "frequency" "1"
 "time" "0.2"
 }
-// entity 13
+// entity 12
 {
 "classname" "light"
 "origin" "-26.500000 -112.000000 8.000000"
@@ -2184,7 +2173,7 @@
 "time" "0.2"
 "offset" "0.5"
 }
-// entity 14
+// entity 13
 {
 "classname" "fx_particles"
 "origin" "-66.000000 0.000000 8.000000"
@@ -2192,3 +2181,11 @@
 "script" "engine_trail"
 "spawnflags" "2"
 }
+// entity 14
+{
+"classname" "light"
+"origin" "-81.000000 0.000000 8.000000"
+"light" "150"
+"flare" "5"
+"spawnflags" "4"
+}
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index 56b7826..ae54c7b 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -1145,22 +1145,13 @@ colors/grey75
 }
 // entity 1
 {
-"classname" "fx_flare"
-"origin" "-136.000000 0.000000 0.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"flare" "4"
-"cull" "none"
-}
-// entity 2
-{
 "classname" "fx_particles"
 "origin" "-104.000000 0.000000 0.000000"
 "spawnflags" "2"
 "angle" "180.000000"
 "script" "engine_trail"
 }
-// entity 3
+// entity 2
 {
 "classname" "fx_particles"
 "origin" "-108.000000 0.000000 0.000000"
@@ -1168,7 +1159,7 @@ colors/grey75
 "angle" "180"
 "script" "engine_exhaust"
 }
-// entity 4
+// entity 3
 {
 "classname" "light"
 "origin" "256.000000 0.000000 1.000000"
@@ -1179,7 +1170,7 @@ colors/grey75
 "_color" "1.0 1.0 1.0"
 "spawnflags" "1"
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-92.000000 -188.000000 0.000000"
@@ -1190,7 +1181,7 @@ colors/grey75
 "_color" "0 1.0 0"
 "spawnflags" "1"
 }
-// entity 6
+// entity 5
 {
 "classname" "light"
 "origin" "-92.000000 188.000000 0.000000"
@@ -1201,27 +1192,35 @@ colors/grey75
 "_color" "1.0 0 0"
 "spawnflags" "1"
 }
-// entity 7
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-96.000000 192.000000 0.000000"
 "angle" "180.000000"
 "script" "engine_trail"
 }
-// entity 8
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "-96.000000 -192.000000 0.000000"
 "angle" "180"
 "script" "engine_trail"
 }
-// entity 9
+// entity 8
 {
 "classname" "location_cannon"
 "origin" "100.000000 24.000000 0.000000"
 }
-// entity 10
+// entity 9
 {
 "classname" "location_cannon"
 "origin" "100.000000 -24.000000 0.000000"
 }
+// entity 10
+{
+"classname" "light"
+"origin" "-136.000000 0.000000 0.000000"
+"spawnflags" "4"
+"flare" "4"
+"cull" "none"
+}
diff --git a/base/maps/tsukhan/interceptor.map b/base/maps/tsukhan/interceptor.map
index fa0763b..2c0ade0 100644
--- a/base/maps/tsukhan/interceptor.map
+++ b/base/maps/tsukhan/interceptor.map
@@ -2259,7 +2259,7 @@
 ( -88 -90 50 ) ( -88 -28 50 ) ( -80 -28 50 ) common/entity 0 0 0 1 1 0 0 0
 ( -88 -92 48 ) ( -88 -90 50 ) ( -80 -90 50 ) common/entity 0 0 0 1 1 0 0 0
 ( -80 90 50 ) ( -88 90 50 ) ( -88 92 48 ) common/entity 0 0 0 1 1 0 0 0
-( -194 -96 -18 ) ( -194 96 -18 ) ( -194 -96 18 ) common/caulk 0 0 0 1 1 0 0 0
+( -194 -96 -18 ) ( -194 96 -18 ) ( -194 -96 18 ) common/entity 0 0 0 1 1 0 0 0
 ( -194 90 -64 ) ( -192 92 -64 ) ( -194 90 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -192 -92 -64 ) ( -194 -90 -64 ) ( -192 -92 64 ) common/caulk 0 0 0 1 1 0 0 0
 ( -32 -28 -34 ) ( -80 -28 -50 ) ( -80 -90 -50 ) common/entity 0 0 0 1 1 0 0 0
@@ -2314,21 +2314,21 @@
 }
 // brush 245
 {
-( 64 64 32 ) ( 48 80 32 ) ( 64 80 32 ) common/entity_second 0 0 0 1 1 134217728 0 0
-( 8 128 32 ) ( -8 128 32 ) ( -8 128 16 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 64 64 16 ) ( 64 64 32 ) ( 80 64 16 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 80 64 32 ) ( 64 80 32 ) ( 48 80 16 ) common/entity_second 0 0 0 1 1 134217728 0 0
-( -32 128 -32 ) ( -32 64 32 ) ( -32 64 -32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 56 64 16 ) ( 40 64 16 ) ( 56 -64 16 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 64 64 32 ) ( 48 80 32 ) ( 64 80 32 ) common/entity_second 0 0 0 1 1 0 0 0
+( 8 128 32 ) ( -8 128 32 ) ( -8 128 16 ) common/caulk 0 0 0 1 1 0 0 0
+( 64 64 16 ) ( 64 64 32 ) ( 80 64 16 ) common/caulk 0 0 0 1 1 0 0 0
+( 80 64 32 ) ( 64 80 32 ) ( 48 80 16 ) common/entity_second 0 0 0 1 1 0 0 0
+( -32 128 -32 ) ( -32 64 32 ) ( -32 64 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 56 64 16 ) ( 40 64 16 ) ( 56 -64 16 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 246
 {
-( 8 128 -32 ) ( -8 128 -16 ) ( -8 128 -32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 64 64 -32 ) ( 64 80 -32 ) ( 48 80 -32 ) common/entity_second 0 0 0 1 1 134217728 0 0
-( 64 64 -32 ) ( 64 64 -16 ) ( 88 64 -32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 80 64 -32 ) ( 48 80 -16 ) ( 64 80 -32 ) common/entity_second 0 0 0 1 1 134217728 0 0
-( -32 128 -32 ) ( -32 64 32 ) ( -32 64 -32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 24 64 -16 ) ( 32 64 -16 ) ( 24 -64 -16 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 8 128 -32 ) ( -8 128 -16 ) ( -8 128 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 64 64 -32 ) ( 64 80 -32 ) ( 48 80 -32 ) common/entity_second 0 0 0 1 1 0 0 0
+( 64 64 -32 ) ( 64 64 -16 ) ( 88 64 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 80 64 -32 ) ( 48 80 -16 ) ( 64 80 -32 ) common/entity_second 0 0 0 1 1 0 0 0
+( -32 128 -32 ) ( -32 64 32 ) ( -32 64 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 24 64 -16 ) ( 32 64 -16 ) ( 24 -64 -16 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 247
 {
@@ -2385,12 +2385,12 @@
 }
 // brush 252
 {
-( -8 -128 -32 ) ( -8 -128 -16 ) ( 8 -128 -32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 48 -80 -32 ) ( 64 -80 -32 ) ( 64 -64 -32 ) common/entity_second 0 0 0 1 1 134217728 0 0
-( 88 -64 -32 ) ( 64 -64 -16 ) ( 64 -64 -32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 64 -80 -32 ) ( 48 -80 -16 ) ( 80 -64 -32 ) common/entity_second 0 0 0 1 1 134217728 0 0
-( -32 -128 32 ) ( -32 -64 -32 ) ( -32 -64 32 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 32 64 -16 ) ( 40 64 -16 ) ( 32 -64 -16 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -8 -128 -32 ) ( -8 -128 -16 ) ( 8 -128 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 48 -80 -32 ) ( 64 -80 -32 ) ( 64 -64 -32 ) common/entity_second 0 0 0 1 1 0 0 0
+( 88 -64 -32 ) ( 64 -64 -16 ) ( 64 -64 -32 ) common/caulk 0 0 0 1 1 0 0 0
+( 64 -80 -32 ) ( 48 -80 -16 ) ( 80 -64 -32 ) common/entity_second 0 0 0 1 1 0 0 0
+( -32 -128 32 ) ( -32 -64 -32 ) ( -32 -64 32 ) common/caulk 0 0 0 1 1 0 0 0
+( 32 64 -16 ) ( 40 64 -16 ) ( 32 -64 -16 ) common/caulk 0 0 0 1 1 0 0 0
 }
 // brush 253
 {
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index 02d0d88..e5109c7 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -16,7 +16,7 @@ enginesound	engine sound loop (maps to sounds/engines/loop??.wav), default 0
 
 // ---- LIGHT ------------------------------------------------------
 
-/*QUAKED light (1 1 1) (-8 -8 -8) (8 8 8) strobe entity
+/*QUAKED light (1 1 1) (-8 -8 -8) (8 8 8) strobe entity engine
 An exterior light
 
 strobe		make a strobe light (spawflag 1)