flares

3 files changed, 168 insertions, 102 deletions

diff --git a/base/bitmaps/fx/flare02.tga b/base/bitmaps/fx/flare02.tga
new file mode 100644
index 0000000..2625207
--- /dev/null
+++ b/base/bitmaps/fx/flare02.tga
diff --git a/base/maps/ships/sharkan.map b/base/maps/ships/sharkan.map
index b1ba00b..3f88d2c 100644
--- a/base/maps/ships/sharkan.map
+++ b/base/maps/ships/sharkan.map
@@ -55,15 +55,6 @@
 }
 // brush 4
 {
-( -64 -36 16 ) ( -58 -88 16 ) ( -64 -88 16 ) common/entity 0 0 0 1 1
-( -64 -36 16 ) ( 38 -36 12 ) ( 38 -36 16 ) common/entity 0 0 0 1 1
-( 38 -36 12 ) ( -64 -88 12 ) ( -58 -88 12 ) common/entity 0 0 0 1 1
-( -64 -36 12 ) ( -64 -88 16 ) ( -64 -88 12 ) common/entity 0 0 0 1 1
-( -64 -88 12 ) ( -64 -88 16 ) ( -58 -88 16 ) common/entity 0 0 0 1 1
-( 38 -36 16 ) ( -58 -88 12 ) ( -58 -88 16 ) common/entity 0 0 0 1 1
-}
-// brush 5
-{
 ( 56 16 20 ) ( -64 16 20 ) ( -64 28 20 ) common/entity 0 0 0 1 1
 ( 38 16 22 ) ( 38 24 22 ) ( 38 16 8 ) common/entity 0 0 0 1 1
 ( -64 16 20 ) ( 56 16 20 ) ( -64 20 8 ) common/entity 0 0 0 1 1
@@ -73,150 +64,205 @@
 ( -202 28 20 ) ( -74 36 16 ) ( -74 28 20 ) common/entity 0 0 0 1 1
 ( -202 36 12 ) ( -74 28 8 ) ( -74 36 12 ) common/entity 0 0 0 1 1
 }
+// brush 5
+{
+( -56 -112 16 ) ( -64 -112 16 ) ( 38 -36 16 ) common/entity 0 0 0 1 1
+( -64 -36 16 ) ( 38 -36 12 ) ( 38 -36 16 ) common/entity 0 0 0 1 1
+( -64 -112 12 ) ( -56 -112 12 ) ( -64 -36 12 ) common/entity 0 0 0 1 1
+( -64 -112 16 ) ( -64 -112 12 ) ( -64 -36 16 ) common/entity 0 0 0 1 1
+( -56 -112 16 ) ( -56 -112 12 ) ( -64 -112 16 ) common/entity 0 0 0 1 1
+( -56 -112 12 ) ( -56 -112 16 ) ( 38 -36 12 ) common/entity 0 0 0 1 1
+}
 // brush 6
 {
-( 38 36 16 ) ( -64 88 16 ) ( -58 88 16 ) common/entity 0 0 0 1 1
-( 38 36 16 ) ( 38 36 12 ) ( -64 36 16 ) common/entity 0 0 0 1 1
-( -64 36 12 ) ( -58 88 12 ) ( -64 88 12 ) common/entity 0 0 0 1 1
-( -64 36 16 ) ( -64 88 12 ) ( -64 88 16 ) common/entity 0 0 0 1 1
-( -64 88 12 ) ( -58 88 16 ) ( -64 88 16 ) common/entity 0 0 0 1 1
-( 38 36 12 ) ( -58 88 16 ) ( -58 88 12 ) common/entity 0 0 0 1 1
+( -64 20 -12 ) ( -64 -20 124 ) ( -64 -20 -12 ) colors/grey75 0 0 0 1 1
+( -80 0 28 ) ( -80 -12 24 ) ( -208 0 28 ) colors/grey75 0 0 0 1 1
+( -208 -20 8 ) ( -80 -18 14 ) ( -80 -20 8 ) colors/grey75 0 0 0 1 1
+( -80 -20 -8 ) ( -80 -18 -14 ) ( -208 -20 -8 ) colors/grey75 0 0 0 1 1
+( -208 0 -28 ) ( -80 -6 -26 ) ( -80 0 -28 ) colors/grey75 0 0 0 1 1
+( -80 0 -28 ) ( -80 6 -26 ) ( -208 0 -28 ) colors/grey75 0 0 0 1 1
+( -80 12 24 ) ( -80 0 28 ) ( -208 12 24 ) colors/grey75 0 0 0 1 1
+( -208 18 14 ) ( -80 20 8 ) ( -80 18 14 ) colors/grey75 0 0 0 1 1
+( -208 20 -8 ) ( -80 16 -20 ) ( -80 20 -8 ) colors/grey75 0 0 0 1 1
+( -74 -12 24 ) ( -74 -14 22 ) ( -202 -12 24 ) colors/grey75 0 0 0 1 1
+( -202 12 24 ) ( -74 14 22 ) ( -74 12 24 ) colors/grey75 0 0 0 1 1
+( -74 -16 -20 ) ( -74 -14 -22 ) ( -202 -16 -20 ) colors/grey75 0 0 0 1 1
+( -202 16 -20 ) ( -74 14 -22 ) ( -74 16 -20 ) colors/grey75 0 0 0 1 1
+( 104 -19 116 ) ( 104 -16 -12 ) ( 104 -19 -12 ) common/caulk 0 0 0 1 1
+( 106 22 -12 ) ( 107 22 -12 ) ( 106 22 116 ) common/entity 0 0 0 1 1
+( 64 -22 1 ) ( -64 -22 -1 ) ( -64 -22 1 ) common/entity 0 0 0 1 1
 }
 // brush 7
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 10 0 ) ( 192 7 7 ) ( 192 10 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 7 -7 ) ( 192 10 0 ) ( 192 7 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 6 6 ) ( 192 0 8 ) ( 192 6 6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 8 0 ) ( 192 6 6 ) ( 320 8 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 4 130 ) ( -64 0 130 ) ( -64 4 28 ) common/entity 0 0 0 1 1
+( -8 -2 28 ) ( -12 -2 28 ) ( -8 -2 130 ) common/entity 0 0 0 1 1
+( 38 -2 34 ) ( -57 -2 78 ) ( -57 0 78 ) common/entity 0 0 0 1 1
+( -64 0 78 ) ( -57 0 78 ) ( -57 -2 78 ) common/entity 0 0 0 1 1
+( 64 -4 34 ) ( -64 10 34 ) ( -64 -4 34 ) common/caulk 0 0 0 1 1
+( -12 2 130 ) ( -12 2 28 ) ( -8 2 130 ) common/entity 0 0 0 1 1
 }
 // brush 8
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 7 -7 ) ( 192 10 0 ) ( 192 7 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 7 -7 ) ( 192 0 -10 ) ( 320 7 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 8 0 ) ( 192 6 6 ) ( 192 8 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 6 -6 ) ( 192 8 0 ) ( 320 6 -6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 1 -7 ) ( -64 1 -1 ) ( -64 21 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 11 -11 ) ( -96 4 -14 ) ( -64 11 -11 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 4 -14 ) ( -96 4 -12 ) ( -64 4 -14 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 4 -12 ) ( -96 10 -10 ) ( -64 4 -12 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 10 -10 ) ( -96 11 -11 ) ( -64 11 -11 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -60 4 ) ( -78 68 -12 ) ( -94 68 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 9
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 7 7 ) ( 192 0 10 ) ( 192 7 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 10 0 ) ( 192 7 7 ) ( 192 10 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 -7 7 ) ( 192 0 10 ) ( 320 -7 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 6 6 ) ( 192 0 8 ) ( 320 6 6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 1 -7 ) ( -64 1 -1 ) ( -64 21 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 14 -4 ) ( -96 11 -11 ) ( -64 14 -4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 10 -10 ) ( -96 12 -4 ) ( -64 10 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 12 -4 ) ( -96 14 -4 ) ( -64 12 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 11 -11 ) ( -96 10 -10 ) ( -64 11 -11 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -60 4 ) ( -78 68 -12 ) ( -94 68 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 10
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 7 -7 ) ( 192 0 -10 ) ( 320 7 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -7 -7 ) ( 192 0 -10 ) ( 192 -7 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 6 -6 ) ( 192 8 0 ) ( 192 6 -6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 6 -6 ) ( 192 0 -8 ) ( 192 6 -6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 21 7 ) ( -64 1 1 ) ( -64 1 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 4 14 ) ( -96 11 11 ) ( -64 4 14 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 4 12 ) ( -96 4 14 ) ( -64 4 12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 10 10 ) ( -96 4 12 ) ( -64 10 10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 11 11 ) ( -96 10 10 ) ( -64 11 11 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -60 12 ) ( -78 68 -4 ) ( -94 68 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 11
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -7 -7 ) ( 192 0 -10 ) ( 192 -7 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -10 0 ) ( 192 -7 -7 ) ( 192 -10 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 6 -6 ) ( 192 0 -8 ) ( 320 6 -6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 -6 -6 ) ( 192 0 -8 ) ( 320 -6 -6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 21 7 ) ( -64 1 1 ) ( -64 1 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 11 11 ) ( -96 14 4 ) ( -64 11 11 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 12 4 ) ( -96 10 10 ) ( -64 12 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 14 4 ) ( -96 12 4 ) ( -64 14 4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 10 10 ) ( -96 11 11 ) ( -64 10 10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -60 12 ) ( -78 68 -4 ) ( -94 68 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 12
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -10 0 ) ( 192 -7 -7 ) ( 192 -10 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -7 7 ) ( 192 -10 0 ) ( 192 -7 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -6 -6 ) ( 192 0 -8 ) ( 192 -6 -6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 -8 0 ) ( 192 -6 -6 ) ( 320 -8 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 -21 -7 ) ( -64 -1 -1 ) ( -64 -1 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -4 -14 ) ( -96 -11 -11 ) ( -64 -4 -14 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -4 -12 ) ( -96 -4 -14 ) ( -64 -4 -14 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 -10 -10 ) ( -96 -4 -12 ) ( -64 -10 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -11 -11 ) ( -96 -10 -10 ) ( -64 -11 -11 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -68 4 ) ( -78 60 -12 ) ( -94 60 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 13
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -7 7 ) ( 192 -10 0 ) ( 192 -7 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 -7 7 ) ( 192 0 10 ) ( 320 -7 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -8 0 ) ( 192 -6 -6 ) ( 192 -8 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 -6 6 ) ( 192 -8 0 ) ( 320 -6 6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 -1 7 ) ( -64 -1 1 ) ( -64 -21 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -11 11 ) ( -96 -4 14 ) ( -64 -11 11 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -4 14 ) ( -96 -4 12 ) ( -64 -4 12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 -4 12 ) ( -96 -10 10 ) ( -64 -4 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -10 10 ) ( -96 -11 11 ) ( -64 -10 10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -68 12 ) ( -78 60 -4 ) ( -94 60 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 14
 {
-( -64 -17 -3 ) ( -64 3 3 ) ( -64 3 -3 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 192 -7 7 ) ( 192 0 10 ) ( 320 -7 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 6 6 ) ( 192 0 8 ) ( 192 6 6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -6 6 ) ( 192 -8 0 ) ( 192 -6 6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( 320 -6 6 ) ( 192 0 8 ) ( 192 -6 6 ) colors/grey50 0 0 0 1 1 134217728 0 0
-( -96 62 -10 ) ( -64 62 10 ) ( -96 -66 -10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 -21 -7 ) ( -64 -1 -1 ) ( -64 -1 -7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -11 -11 ) ( -96 -14 -4 ) ( -64 -11 -11 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -12 -4 ) ( -96 -10 -10 ) ( -64 -12 -4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -14 -4 ) ( -96 -12 -4 ) ( -64 -14 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 -10 -10 ) ( -96 -11 -11 ) ( -64 -10 -10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -68 4 ) ( -78 60 -12 ) ( -94 60 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 15
 {
-( -64 20 -12 ) ( -64 -20 124 ) ( -64 -20 -12 ) colors/grey75 0 0 0 1 1
-( -80 0 28 ) ( -80 -12 24 ) ( -208 0 28 ) colors/grey75 0 0 0 1 1
-( -208 -20 8 ) ( -80 -18 14 ) ( -80 -20 8 ) colors/grey75 0 0 0 1 1
-( -80 -20 -8 ) ( -80 -18 -14 ) ( -208 -20 -8 ) colors/grey75 0 0 0 1 1
-( -208 0 -28 ) ( -80 -6 -26 ) ( -80 0 -28 ) colors/grey75 0 0 0 1 1
-( -80 0 -28 ) ( -80 6 -26 ) ( -208 0 -28 ) colors/grey75 0 0 0 1 1
-( -80 12 24 ) ( -80 0 28 ) ( -208 12 24 ) colors/grey75 0 0 0 1 1
-( -208 18 14 ) ( -80 20 8 ) ( -80 18 14 ) colors/grey75 0 0 0 1 1
-( -208 20 -8 ) ( -80 16 -20 ) ( -80 20 -8 ) colors/grey75 0 0 0 1 1
-( -74 -12 24 ) ( -74 -14 22 ) ( -202 -12 24 ) colors/grey75 0 0 0 1 1
-( -202 12 24 ) ( -74 14 22 ) ( -74 12 24 ) colors/grey75 0 0 0 1 1
-( -74 -16 -20 ) ( -74 -14 -22 ) ( -202 -16 -20 ) colors/grey75 0 0 0 1 1
-( -202 16 -20 ) ( -74 14 -22 ) ( -74 16 -20 ) colors/grey75 0 0 0 1 1
-( 104 -19 116 ) ( 104 -16 -12 ) ( 104 -19 -12 ) common/caulk 0 0 0 1 1
-( 106 22 -12 ) ( 107 22 -12 ) ( 106 22 116 ) common/entity 0 0 0 1 1
-( 64 -22 1 ) ( -64 -22 -1 ) ( -64 -22 1 ) common/entity 0 0 0 1 1
+( -64 -1 7 ) ( -64 -1 1 ) ( -64 -21 7 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -14 4 ) ( -96 -11 11 ) ( -64 -14 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -10 10 ) ( -96 -12 4 ) ( -64 -10 10 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -96 -12 4 ) ( -96 -14 4 ) ( -64 -12 4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 -11 11 ) ( -96 -10 10 ) ( -64 -10 10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -94 -68 12 ) ( -78 60 -4 ) ( -94 60 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
 }
 // brush 16
 {
-( -64 4 130 ) ( -64 0 130 ) ( -64 4 28 ) common/entity 0 0 0 1 1
-( -8 -2 28 ) ( -12 -2 28 ) ( -8 -2 130 ) common/entity 0 0 0 1 1
-( 38 -2 34 ) ( -57 -2 78 ) ( -57 0 78 ) common/entity 0 0 0 1 1
-( -64 0 78 ) ( -57 0 78 ) ( -57 -2 78 ) common/entity 0 0 0 1 1
-( 64 -4 34 ) ( -64 10 34 ) ( -64 -4 34 ) common/caulk 0 0 0 1 1
-( -12 2 130 ) ( -12 2 28 ) ( -8 2 130 ) common/entity 0 0 0 1 1
+( -64 4 -12 ) ( -64 0 -12 ) ( -96 4 -12 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 4 -12 ) ( -76 4 -14 ) ( -64 4 -14 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 4 -12 ) ( -64 4 -14 ) ( -64 0 -12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -4 -14 ) ( -76 4 -14 ) ( -76 -4 -14 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 -4 -12 ) ( -76 -4 -14 ) ( -78 -4 -12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -78 4 -12 ) ( -76 -4 -14 ) ( -76 4 -14 ) colors/grey50 0 0 0 1 1 134217728 0 0
+}
+// brush 17
+{
+( -64 14 4 ) ( -64 12 4 ) ( -86 14 4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 14 4 ) ( -86 14 4 ) ( -64 14 -4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 14 4 ) ( -64 14 -4 ) ( -64 12 4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -86 12 -4 ) ( -64 12 -4 ) ( -86 14 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -86 12 -4 ) ( -86 12 4 ) ( -64 12 -4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -86 12 -4 ) ( -86 14 -4 ) ( -86 12 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+}
+// brush 18
+{
+( -64 -12 4 ) ( -64 -14 4 ) ( -86 -12 4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -12 4 ) ( -86 -12 4 ) ( -64 -12 -4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 -12 4 ) ( -64 -12 -4 ) ( -64 -14 4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -86 -14 -4 ) ( -64 -14 -4 ) ( -86 -12 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -86 -14 -4 ) ( -86 -14 4 ) ( -64 -14 -4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -86 -14 -4 ) ( -86 -12 -4 ) ( -86 -14 4 ) colors/grey50 0 0 0 1 1 134217728 0 0
+}
+// brush 19
+{
+( -64 4 14 ) ( -64 0 14 ) ( -96 4 14 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 4 14 ) ( -94 4 12 ) ( -64 4 12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 4 14 ) ( -64 4 12 ) ( -64 0 14 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -4 12 ) ( -94 4 12 ) ( -94 -4 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -64 -4 14 ) ( -94 -4 12 ) ( -96 -4 14 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -96 4 14 ) ( -94 -4 12 ) ( -94 4 12 ) colors/grey50 0 0 0 1 1 134217728 0 0
+}
+// brush 20
+{
+( -64 12 0 ) ( -68 12 -4 ) ( -64 12 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 10 0 ) ( -64 12 -4 ) ( -64 10 -10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -68 10 -10 ) ( -64 12 -4 ) ( -68 12 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -66 10 0 ) ( -66 12 -4 ) ( -66 12 0 ) colors/grey50 0 0 0 1 1 134217728 0 0
+( -68 -14 -12 ) ( -64 -14 -12 ) ( -68 14 -12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -68 4 -12 ) ( -64 10 -10 ) ( -68 10 -10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -68 -12 0 ) ( -64 -12 -4 ) ( -68 -12 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -10 -10 ) ( -68 -12 -4 ) ( -64 -12 -4 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -4 -12 ) ( -68 -10 -10 ) ( -64 -10 -10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -68 12 4 ) ( -64 12 4 ) ( -68 10 10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -68 14 12 ) ( -64 -14 12 ) ( -68 -14 12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -68 10 10 ) ( -64 10 10 ) ( -68 4 12 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -12 4 ) ( -68 -12 4 ) ( -64 -10 10 ) common/caulk 0 0 0 1 1 134217728 0 0
+( -64 -10 10 ) ( -68 -10 10 ) ( -64 -4 12 ) common/caulk 0 0 0 1 1 134217728 0 0
+}
+// brush 21
+{
+( 38 36 16 ) ( -64 112 16 ) ( -56 112 16 ) common/entity 0 0 0 1 1
+( 38 36 16 ) ( 38 36 12 ) ( -64 36 16 ) common/entity 0 0 0 1 1
+( -64 36 12 ) ( -56 112 12 ) ( -64 112 12 ) common/entity 0 0 0 1 1
+( -64 36 16 ) ( -64 112 12 ) ( -64 112 16 ) common/entity 0 0 0 1 1
+( -64 112 16 ) ( -56 112 12 ) ( -56 112 16 ) common/entity 0 0 0 1 1
+( 38 36 12 ) ( -56 112 16 ) ( -56 112 12 ) common/entity 0 0 0 1 1
 }
 }
 // entity 1
 {
 "classname" "target_engine"
-"origin" "-78 0 0"
+"origin" "-72 0 0"
 "angle" "180"
-"radius" "40"
+"radius" "30"
 }
 // entity 2
 {
 "classname" "light"
-"origin" "160 0 0"
-"light" "20"
-"spawnflags" "2"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "-60 92 14"
-"light" "20"
+"origin" "-60 114 14"
+"light" "10"
 "_color" "1 0 0"
 "spawnflags" "1"
 "time" ".2"
 }
-// entity 4
+// entity 3
 {
 "classname" "light"
-"origin" "-60 -92 14"
-"light" "20"
+"origin" "-60 -114 14"
+"light" "10"
 "_color" "0 1 0"
 "spawnflags" "1"
 "time" ".2"
 "offset" ".5"
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-60 0 80"
@@ -226,3 +272,10 @@
 "frequency" "1.3"
 "spawnflags" "1"
 }
+// entity 5
+{
+"classname" "target_flare"
+"origin" "156 0 0"
+"radius" "25"
+"flare" "2"
+}
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index 7c6c80c..4048fca 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -28,7 +28,7 @@ Location of the cockpit (not implemented)
 */
 
 /*QUAKED light (1 1 1) (-8 -8 -8) (8 8 8) strobe entity
-A small exterior light
+An exterior light
 
 strobe		make a strobe light (spawflag 1)
 entity		light has entity color (spawflag 2)
@@ -37,4 +37,17 @@ frequency	strobe frequency, in flashes per second
 offset		strobe offset, in seconds
 time		strobe time fraction, 0 (always off) - 1 (always on)
 flare		flare number (maps to bitmaps/fx/flare??.tga), default 0
-*/
\ No newline at end of file
+*/
+
+/*QUAKED target_flare (1 1 1) (-8 -8 -8) (8 8 8) strobe entity
+A light flare
+
+strobe		make a strobe light (spawflag 1)
+entity		light has entity color (spawflag 2)
+radius		light radius, default is 100
+frequency	strobe frequency, in flashes per second
+offset		strobe offset, in seconds
+time		strobe time fraction, 0 (always off) - 1 (always on)
+flare		flare number (maps to bitmaps/fx/flare??.tga), default 0
+angle		direction of the flare
+*/