model updates

2 files changed, 99 insertions, 61 deletions

diff --git a/base/maps/satellites/ikarus.map b/base/maps/satellites/ikarus.map
index 8fa9390..bc262a1 100644
--- a/base/maps/satellites/ikarus.map
+++ b/base/maps/satellites/ikarus.map
@@ -1744,12 +1744,12 @@
 }
 // brush 195
 {
-( -128 96 -240 ) ( -128 32 -240 ) ( -136 40 -248 ) colors/grey25 0 0 0 1 1 134217728 0 0
-( -136 88 -248 ) ( -128 96 -272 ) ( -128 96 -240 ) colors/grey25 0 0 0 1 1 134217728 0 0
-( -128 96 -240 ) ( -128 32 -272 ) ( -128 32 -240 ) common/caulk 0 0 0 1 1 134217728 0 0
-( -128 96 -272 ) ( -136 40 -264 ) ( -128 32 -272 ) colors/grey25 0 0 0 1 1 134217728 0 0
-( -136 40 -248 ) ( -128 32 -240 ) ( -128 32 -272 ) colors/grey25 0 0 0 1 1 134217728 0 0
-( -136 88 -264 ) ( -136 40 -248 ) ( -136 40 -264 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -16 -64 144 ) ( 16 -64 144 ) ( 8 -72 136 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -8 -72 136 ) ( -16 -64 112 ) ( -16 -64 144 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -16 -64 144 ) ( 16 -64 112 ) ( 16 -64 144 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -16 -64 112 ) ( 8 -72 120 ) ( 16 -64 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 8 -72 136 ) ( 16 -64 144 ) ( 16 -64 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -8 -72 120 ) ( 8 -72 136 ) ( 8 -72 120 ) colors/red 0 0 0 1 1 134217728 1 0
 }
 // brush 196
 {
@@ -2034,52 +2034,52 @@
 ( -128 -128 -352 ) ( -128 -128 -320 ) ( 128 -128 -352 ) colors/grey50 0 0 0 1 1
 ( -128 -128 -352 ) ( -128 128 -352 ) ( -128 -128 -320 ) colors/grey50 0 0 0 1 1
 }
-}
-// entity 1
+// brush 219
 {
-"classname" "light"
-"origin" "0 0 1544"
-"light" "50"
-"_color" "1 0 0"
-"spawnflags" "1"
+( -128 96 -240 ) ( -128 32 -240 ) ( -136 40 -248 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -136 88 -248 ) ( -128 96 -272 ) ( -128 96 -240 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -128 96 -240 ) ( -128 32 -272 ) ( -128 32 -240 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -128 96 -272 ) ( -136 40 -264 ) ( -128 32 -272 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -136 40 -248 ) ( -128 32 -240 ) ( -128 32 -272 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -136 88 -264 ) ( -136 40 -248 ) ( -136 40 -264 ) colors/grey25 0 0 0 1 1 134217728 0 0
 }
-// entity 2
+// brush 220
 {
-"classname" "light"
-"origin" "0 80 128"
-"light" "50"
-"_color" "1 0 0"
-"frequency" "2"
-"flare" "1"
+( -64 16 144 ) ( -64 -16 144 ) ( -72 -8 136 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -72 8 136 ) ( -64 16 112 ) ( -64 16 144 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -64 16 144 ) ( -64 -16 112 ) ( -64 -16 144 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 16 112 ) ( -72 -8 120 ) ( -64 -16 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -72 -8 136 ) ( -64 -16 144 ) ( -64 -16 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -72 8 120 ) ( -72 -8 136 ) ( -72 -8 120 ) colors/red 0 0 0 1 1 134217728 1 0
 }
-// entity 3
+// brush 221
 {
-"classname" "light"
-"origin" "-80 0 128"
-"light" "50"
-"_color" "1 0 0"
-"frequency" "2"
-"flare" "1"
+( 16 64 144 ) ( -16 64 144 ) ( -8 72 136 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 8 72 136 ) ( 16 64 112 ) ( 16 64 144 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 16 64 144 ) ( -16 64 112 ) ( -16 64 144 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 16 64 112 ) ( -8 72 120 ) ( -16 64 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( -8 72 136 ) ( -16 64 144 ) ( -16 64 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 8 72 120 ) ( -8 72 136 ) ( -8 72 120 ) colors/red 0 0 0 1 1 134217728 1 0
 }
-// entity 4
+// brush 222
 {
-"classname" "light"
-"origin" "0 -80 128"
-"light" "50"
-"_color" "1 0 0"
-"frequency" "2"
-"flare" "1"
+( 64 -16 144 ) ( 64 16 144 ) ( 72 8 136 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 72 -8 136 ) ( 64 -16 112 ) ( 64 -16 144 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 64 -16 144 ) ( 64 16 112 ) ( 64 16 144 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 64 -16 112 ) ( 72 8 120 ) ( 64 16 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 72 8 136 ) ( 64 16 144 ) ( 64 16 112 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 72 -8 120 ) ( 72 8 136 ) ( 72 8 120 ) colors/red 0 0 0 1 1 134217728 1 0
 }
-// entity 5
+}
+// entity 1
 {
 "classname" "light"
-"origin" "80 0 128"
+"origin" "0 0 1544"
 "light" "50"
 "_color" "1 0 0"
-"frequency" "2"
-"flare" "1"
+"spawnflags" "1"
 }
-// entity 6
+// entity 2
 {
 "classname" "light"
 "origin" "72 0 0"
@@ -2088,7 +2088,7 @@
 "offset" "0.7"
 "time" "0.1"
 }
-// entity 7
+// entity 3
 {
 "classname" "light"
 "origin" "72 0 1024"
@@ -2097,7 +2097,7 @@
 "offset" "-0.1"
 "time" "0.1"
 }
-// entity 8
+// entity 4
 {
 "classname" "light"
 "origin" "72 0 640"
@@ -2106,7 +2106,7 @@
 "offset" "0.2"
 "time" "0.1"
 }
-// entity 9
+// entity 5
 {
 "classname" "light"
 "origin" "72 0 384"
@@ -2115,7 +2115,7 @@
 "offset" "0.4"
 "time" "0.1"
 }
-// entity 10
+// entity 6
 {
 "classname" "light"
 "origin" "72 0 256"
@@ -2124,7 +2124,7 @@
 "offset" "0.5"
 "time" "0.1"
 }
-// entity 11
+// entity 7
 {
 "classname" "light"
 "origin" "72 0 896"
@@ -2133,7 +2133,7 @@
 "offset" "0"
 "time" "0.1"
 }
-// entity 12
+// entity 8
 {
 "classname" "light"
 "origin" "72 0 1152"
@@ -2142,7 +2142,7 @@
 "offset" "-0.2"
 "time" "0.1"
 }
-// entity 13
+// entity 9
 {
 "classname" "light"
 "origin" "72 0 768"
@@ -2151,3 +2151,39 @@
 "offset" "0.1"
 "time" "0.1"
 }
+// entity 10
+{
+"classname" "target_flare"
+"origin" "0 -80 128"
+"angle" "-90"
+"radius" "50"
+"_color" "1 0 0"
+"flare" "2"
+}
+// entity 11
+{
+"classname" "target_flare"
+"origin" "-80 0 128"
+"angle" "180"
+"radius" "50"
+"_color" "1 0 0"
+"flare" "2"
+}
+// entity 12
+{
+"classname" "target_flare"
+"origin" "0 80 128"
+"angle" "90"
+"radius" "50"
+"_color" "1 0 0"
+"flare" "2"
+}
+// entity 13
+{
+"classname" "target_flare"
+"origin" "80 0 128"
+"angle" "-1.40334e-14"
+"radius" "50"
+"_color" "1 0 0"
+"flare" "2"
+}
diff --git a/base/maps/ships/canasta.map b/base/maps/ships/canasta.map
index 955224d..80f6ba2 100644
--- a/base/maps/ships/canasta.map
+++ b/base/maps/ships/canasta.map
@@ -892,26 +892,12 @@
 // entity 9
 {
 "classname" "light"
-"origin" "64 -80 -8"
-"light" "20"
-"spawnflags" "2"
-}
-// entity 10
-{
-"classname" "light"
-"origin" "64 80 -8"
-"light" "20"
-"spawnflags" "2"
-}
-// entity 11
-{
-"classname" "light"
 "origin" "-72 24 36"
 "light" "15"
 "spawnflags" "1"
 "time" ".1"
 }
-// entity 12
+// entity 10
 {
 "classname" "light"
 "origin" "-28 232 -8"
@@ -921,3 +907,19 @@
 "_color" "1 0 0"
 "offset" ".65"
 }
+// entity 11
+{
+"classname" "target_flare"
+"origin" "64 80 -8"
+"spawnflags" "2"
+"radius" "20"
+"flare" "0"
+}
+// entity 12
+{
+"classname" "target_flare"
+"origin" "64 -80 -8"
+"spawnflags" "2"
+"radius" "20"
+"flare" "0"
+}