light and flares

4 files changed, 135 insertions, 79 deletions

diff --git a/base/maps/ships/matrix.map b/base/maps/ships/matrix.map
index 2ac7e14..5257239 100644
--- a/base/maps/ships/matrix.map
+++ b/base/maps/ships/matrix.map
@@ -3958,20 +3958,12 @@
 }
 // entity 7
 {
-"classname" "light"
-"origin" "168 184 560"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 8
-{
 "classname" "target_engine"
 "origin" "-512 184 208"
 "angle" "180"
 "radius" "50"
 }
-// entity 9
+// entity 8
 {
 "classname" "light"
 "origin" "80 240 560"
@@ -3981,7 +3973,7 @@
 "time" "0.2"
 "offset" ".1"
 }
-// entity 10
+// entity 9
 {
 "classname" "light"
 "origin" "-304 240 560"
@@ -3991,7 +3983,7 @@
 "time" "0.2"
 "offset" ".5"
 }
-// entity 11
+// entity 10
 {
 "classname" "light"
 "origin" "-112 240 560"
@@ -4001,22 +3993,14 @@
 "time" "0.2"
 "offset" ".3"
 }
-// entity 12
-{
-"classname" "light"
-"origin" "168 184 208"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 13
+// entity 11
 {
 "classname" "target_engine"
 "origin" "-512 -184 560"
 "angle" "180"
 "radius" "50"
 }
-// entity 14
+// entity 12
 {
 "classname" "light"
 "origin" "80 -240 208"
@@ -4026,7 +4010,7 @@
 "time" "0.2"
 "offset" "0"
 }
-// entity 15
+// entity 13
 {
 "classname" "light"
 "origin" "-304 -240 208"
@@ -4036,7 +4020,7 @@
 "time" "0.2"
 "offset" ".4"
 }
-// entity 16
+// entity 14
 {
 "classname" "light"
 "origin" "-112 -240 208"
@@ -4046,21 +4030,14 @@
 "time" "0.2"
 "offset" ".2"
 }
-// entity 17
-{
-"classname" "light"
-"origin" "168 -184 560"
-"light" "50"
-"spawnflags" "2"
-}
-// entity 18
+// entity 15
 {
 "classname" "target_engine"
 "origin" "-512 -184 208"
 "angle" "180"
 "radius" "50"
 }
-// entity 19
+// entity 16
 {
 "classname" "light"
 "origin" "80 -240 560"
@@ -4070,7 +4047,7 @@
 "time" "0.2"
 "offset" ".6"
 }
-// entity 20
+// entity 17
 {
 "classname" "light"
 "origin" "-304 -240 560"
@@ -4080,7 +4057,7 @@
 "time" "0.2"
 "offset" "0"
 }
-// entity 21
+// entity 18
 {
 "classname" "light"
 "origin" "-112 -240 560"
@@ -4090,14 +4067,7 @@
 "time" "0.2"
 "offset" ".8"
 }
-// entity 22
-{
-"classname" "light"
-"origin" "168 -184 208"
-"light" "50"
-"spawnflags" "2"
-}
-// entity 23
+// entity 19
 {
 "classname" "light"
 "origin" "-96 0 520"
@@ -4106,7 +4076,7 @@
 "time" ".2"
 "offset" ".7"
 }
-// entity 24
+// entity 20
 {
 "classname" "light"
 "origin" "608 0 456"
@@ -4114,7 +4084,7 @@
 "spawnflags" "1"
 "time" ".2"
 }
-// entity 25
+// entity 21
 {
 "classname" "light"
 "origin" "448 0 472"
@@ -4123,3 +4093,35 @@
 "time" ".2"
 "offset" ".4"
 }
+// entity 22
+{
+"classname" "target_flare"
+"origin" "168 184 208"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
+// entity 23
+{
+"classname" "target_flare"
+"origin" "168 184 560"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
+// entity 24
+{
+"classname" "target_flare"
+"origin" "168 -184 560"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
+// entity 25
+{
+"classname" "target_flare"
+"origin" "168 -184 208"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
diff --git a/base/maps/ships/orion.map b/base/maps/ships/orion.map
index 6551d4a..509ecc5 100644
--- a/base/maps/ships/orion.map
+++ b/base/maps/ships/orion.map
@@ -642,18 +642,63 @@
 ( 136 16 72 ) ( 120 32 -56 ) ( 136 16 -56 ) common/entity 0 0 0 1 1
 ( 120 -64 24 ) ( 120 64 12 ) ( 120 64 24 ) common/caulk 0 0 0 1 1
 }
+// brush 66
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -6 ) ( 138 12 6 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 10 -64 ) ( 136 10 -64 ) ( 138 10 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 67
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 136 4 -64 ) ( 138 4 -64 ) ( 136 4 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -4 -64 ) ( 136 -4 -64 ) ( 138 -4 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 68
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 8 64 ) ( 136 8 -64 ) ( 138 8 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 6 64 ) ( 138 6 -64 ) ( 136 6 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 69
+{
+( 138 14 4 ) ( 138 -10 4 ) ( 136 16 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 14 -4 ) ( 138 -10 -4 ) ( 138 -10 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -10 -4 ) ( 138 14 -4 ) ( 136 16 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -12 -24 ) ( 136 16 -24 ) ( 136 -12 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 -6 64 ) ( 136 -6 -64 ) ( 138 -6 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -8 -64 ) ( 136 -8 -64 ) ( 138 -8 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 70
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 6 ) ( 138 -12 -6 ) ( 136 -14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 -10 64 ) ( 136 -10 -64 ) ( 138 -10 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
 }
 // entity 1
 {
 "classname" "target_engine"
-"origin" "-156 -64 0"
+"origin" "-162 -64 0"
 "angle" "180"
 "radius" "50"
 }
 // entity 2
 {
 "classname" "target_engine"
-"origin" "-156 64 0"
+"origin" "-162 64 0"
 "angle" "180"
 "radius" "50"
 }
@@ -661,7 +706,7 @@
 {
 "classname" "light"
 "origin" "-16 0 52"
-"light" "20"
+"light" "10"
 "spawnflags" "1"
 "offset" "0.5"
 "time" ".2"
@@ -669,20 +714,29 @@
 // entity 4
 {
 "classname" "light"
-"origin" "36 88 0"
-"light" "20"
+"origin" "0 108 0"
+"light" "10"
+"_color" "1 0 0"
 }
 // entity 5
 {
 "classname" "light"
-"origin" "36 -88 0"
-"light" "20"
+"origin" "0 -108 0"
+"light" "10"
+"_color" "0 1 0"
 }
 // entity 6
 {
 "classname" "light"
 "origin" "56 0 52"
-"light" "20"
+"light" "10"
 "spawnflags" "1"
 "time" ".2"
 }
+// entity 7
+{
+"classname" "target_flare"
+"origin" "140 0 0"
+"radius" "30"
+"flare" "2"
+}
diff --git a/base/maps/ships/tensor.map b/base/maps/ships/tensor.map
index 021ea89..3fb1ae3 100644
--- a/base/maps/ships/tensor.map
+++ b/base/maps/ships/tensor.map
@@ -1831,28 +1831,12 @@
 }
 // entity 2
 {
-"classname" "light"
-"origin" "296 176 32"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "296 -176 32"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 4
-{
 "classname" "target_engine"
 "origin" "-320 -176 32"
 "angle" "180"
 "radius" "50"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "-160 0 -56"
@@ -1861,7 +1845,7 @@
 "time" ".1"
 "offset" ".6"
 }
-// entity 6
+// entity 4
 {
 "classname" "light"
 "origin" "320 0 120"
@@ -1869,7 +1853,7 @@
 "spawnflags" "1"
 "time" ".1"
 }
-// entity 7
+// entity 5
 {
 "classname" "light"
 "origin" "128 0 120"
@@ -1878,7 +1862,7 @@
 "time" ".1"
 "offset" ".2"
 }
-// entity 8
+// entity 6
 {
 "classname" "light"
 "origin" "-64 0 120"
@@ -1887,7 +1871,7 @@
 "time" ".1"
 "offset" ".4"
 }
-// entity 9
+// entity 7
 {
 "classname" "light"
 "origin" "-256 0 120"
@@ -1896,7 +1880,7 @@
 "time" ".1"
 "offset" ".6"
 }
-// entity 10
+// entity 8
 {
 "classname" "light"
 "origin" "224 0 -56"
@@ -1905,7 +1889,7 @@
 "time" ".1"
 "offset" "0"
 }
-// entity 11
+// entity 9
 {
 "classname" "light"
 "origin" "32 0 -56"
@@ -1914,3 +1898,19 @@
 "time" ".1"
 "offset" ".3"
 }
+// entity 10
+{
+"classname" "target_flare"
+"origin" "296 -176 32"
+"radius" "50"
+"spawnflags" "2"
+"flare" "0"
+}
+// entity 11
+{
+"classname" "target_flare"
+"origin" "296 176 32"
+"radius" "50"
+"spawnflags" "2"
+"flare" "0"
+}
diff --git a/base/maps/ships/vector.map b/base/maps/ships/vector.map
index b2555fa..abdfd6f 100644
--- a/base/maps/ships/vector.map
+++ b/base/maps/ships/vector.map
@@ -1283,15 +1283,15 @@
 }
 // entity 9
 {
-"classname" "light"
+"classname" "target_flare"
 "origin" "-8 72 -8"
-"light" "25"
+"radius" "25"
 "spawnflags" "2"
 }
 // entity 10
 {
-"classname" "light"
+"classname" "target_flare"
 "origin" "-8 -72 -8"
-"light" "25"
+"radius" "25"
 "spawnflags" "2"
 }