engine trails

6 files changed, 120 insertions, 22 deletions

diff --git a/base/maps/ships/matrix.map b/base/maps/ships/matrix.map
index e1afb63..b829ffc 100644
--- a/base/maps/ships/matrix.map
+++ b/base/maps/ships/matrix.map
@@ -3956,24 +3956,23 @@
 // entity 1
 {
 "classname" "target_engine"
-"origin" "-656 80 384"
+"origin" "-736 80 384"
 "angle" "180"
 "radius" "80"
 }
 // entity 2
 {
 "classname" "target_engine"
-"origin" "-656 -80 384"
+"origin" "-736 -80 384"
 "angle" "180"
 "radius" "80"
 }
 // entity 3
 {
 "classname" "target_engine"
-"origin" "-512 184 560"
+"origin" "-552 184 560"
 "angle" "180"
 "radius" "40"
-"spawnflags" "2"
 }
 // entity 4
 {
@@ -4008,10 +4007,9 @@
 // entity 7
 {
 "classname" "target_engine"
-"origin" "-512 184 208"
+"origin" "-552 184 208"
 "angle" "180"
 "radius" "40"
-"spawnflags" "2"
 }
 // entity 8
 {
@@ -4046,10 +4044,9 @@
 // entity 11
 {
 "classname" "target_engine"
-"origin" "-512 -184 560"
+"origin" "-552 -184 560"
 "angle" "180"
 "radius" "40"
-"spawnflags" "2"
 }
 // entity 12
 {
@@ -4084,10 +4081,9 @@
 // entity 15
 {
 "classname" "target_engine"
-"origin" "-512 -184 208"
+"origin" "-552 -184 208"
 "angle" "180"
 "radius" "40"
-"spawnflags" "2"
 }
 // entity 16
 {
@@ -4177,3 +4173,55 @@
 "spawnflags" "2"
 "radius" "50"
 }
+// entity 26
+{
+"classname" "target_flare"
+"origin" "-488 184 560"
+"angle" "180"
+"spawnflags" "4"
+"flare" "1"
+"radius" "40"
+}
+// entity 27
+{
+"classname" "target_flare"
+"origin" "-488 184 208"
+"angle" "180"
+"spawnflags" "4"
+"flare" "1"
+"radius" "40"
+}
+// entity 28
+{
+"classname" "target_flare"
+"origin" "-488 -184 208"
+"angle" "180"
+"spawnflags" "4"
+"flare" "1"
+"radius" "40"
+}
+// entity 29
+{
+"classname" "target_flare"
+"origin" "-488 -184 560"
+"angle" "180"
+"spawnflags" "4"
+"flare" "1"
+"radius" "40"
+}
+// entity 30
+{
+"classname" "target_flare"
+"origin" "-576 80 384"
+"angle" "180"
+"spawnflags" "4"
+"radius" "80"
+}
+// entity 31
+{
+"classname" "target_flare"
+"origin" "-576 -80 384"
+"angle" "180"
+"spawnflags" "4"
+"radius" "80"
+}
diff --git a/base/maps/ships/pod.map b/base/maps/ships/pod.map
index 0ce8289..db64020 100644
--- a/base/maps/ships/pod.map
+++ b/base/maps/ships/pod.map
@@ -1632,7 +1632,7 @@
 // entity 3
 {
 "classname" "target_engine"
-"origin" "-288 0 0"
+"origin" "-320 0 0"
 "angle" "180"
 "radius" "50"
 }
@@ -1688,3 +1688,12 @@
 "time" "0.4"
 "offset" "0.15"
 }
+// entity 11
+{
+"classname" "target_flare"
+"origin" "-248 0 0"
+"angle" "180"
+"radius" "80"
+"spawnflags" "4"
+"flare" "1"
+}
diff --git a/base/maps/ships/sharkan.map b/base/maps/ships/sharkan.map
index 45cfab9..3c06cbb 100644
--- a/base/maps/ships/sharkan.map
+++ b/base/maps/ships/sharkan.map
@@ -416,7 +416,7 @@
 // entity 1
 {
 "classname" "target_engine"
-"origin" "-72 0 0"
+"origin" "-88 0 0"
 "angle" "180"
 "radius" "30"
 }
@@ -457,3 +457,12 @@
 "time" "-1"
 "radius" "35"
 }
+// entity 6
+{
+"classname" "target_flare"
+"origin" "-72 0 0"
+"angle" "180"
+"spawnflags" "4"
+"radius" "30"
+"flare" "1"
+}
diff --git a/base/maps/ships/tensor.map b/base/maps/ships/tensor.map
index 1c86056..13ab54c 100644
--- a/base/maps/ships/tensor.map
+++ b/base/maps/ships/tensor.map
@@ -1961,14 +1961,14 @@
 // entity 1
 {
 "classname" "target_engine"
-"origin" "-320 176 32"
+"origin" "-360 176 32"
 "angle" "180"
 "radius" "50"
 }
 // entity 2
 {
 "classname" "target_engine"
-"origin" "-320 -176 32"
+"origin" "-360 -176 32"
 "angle" "180"
 "radius" "50"
 }
@@ -2050,3 +2050,19 @@
 "spawnflags" "2"
 "flare" "0"
 }
+// entity 12
+{
+"classname" "target_flare"
+"origin" "-296 -176 32"
+"angle" "180"
+"spawnflags" "4"
+"radius" "50"
+}
+// entity 13
+{
+"classname" "target_flare"
+"origin" "-296 176 32"
+"angle" "180"
+"spawnflags" "4"
+"radius" "50"
+}
diff --git a/base/maps/ships/vector.map b/base/maps/ships/vector.map
index 10983c3..75f7bde 100644
--- a/base/maps/ships/vector.map
+++ b/base/maps/ships/vector.map
@@ -1217,14 +1217,14 @@
 // entity 1
 {
 "classname" "target_engine"
-"origin" "-168 72 -8"
+"origin" "-184 72 -8"
 "angle" "180"
 "radius" "25"
 }
 // entity 2
 {
 "classname" "target_engine"
-"origin" "-168 -72 -8"
+"origin" "-184 -72 -8"
 "angle" "180"
 "radius" "25"
 }
@@ -1296,3 +1296,21 @@
 "radius" "25"
 "spawnflags" "2"
 }
+// entity 11
+{
+"classname" "target_flare"
+"origin" "-152 72 -8"
+"spawnflags" "4"
+"angle" "180"
+"radius" "25"
+"flare" "1"
+}
+// entity 12
+{
+"classname" "target_flare"
+"origin" "-152 -72 -8"
+"spawnflags" "4"
+"angle" "180"
+"radius" "25"
+"flare" "1"
+}
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index 30565ee..049887d 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -29,11 +29,12 @@ flare		flare texture number (maps to bitmaps/fx/flare??.tga), default 0
 
 // ---- TARGET_FLARE -----------------------------------------------
 
-/*QUAKED target_flare (1 1 1) (-8 -8 -8) (8 8 8) strobe entity
+/*QUAKED target_flare (1 1 1) (-8 -8 -8) (8 8 8) strobe entity engine
 A light flare
 
 strobe		make a strobe flare (spawflag 1)
 entity		flare has entity color (spawflag 2)
+engine		flare is actived by engine (spawnflag 4)
 radius		flare radius, default is 100
 frequency	strobe frequency, in flashes per second
 offset		strobe offset, in seconds
@@ -44,12 +45,9 @@ angle		direction of the flare
 
 // ---- TARGET_ENGINE-----------------------------------------------
 
-/*QUAKED target_engine (1 0 0) (-8 -8 -8) (8 8 8) noflare notrail
-An engine flare with a trail. Bit the flare and the trail can be
-disabled.
+/*QUAKED target_engine (1 0 0) (-8 -8 -8) (8 8 8) 
+An engine trail.
 
-noflare		do not draw the engine flare (spawnflag 1)
-notrail		do not dra the engine trail (spawnflag 2)
 radius		engine radius, default is 100
 */