From 6a4e07a162474b2dd3e373403d01f8fad1fbfac9 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 23 Nov 2008 22:17:50 +0000 Subject: renamed target_flare to fx_flare, added fx_particles --- base/maps/satellites/ikarus.map | 8 +- base/maps/satellites/jumpgate.map | 4 +- base/maps/ships/matrix.map | 154 +++++++++++++++++----------------- base/maps/ships/pod.map | 12 +-- base/maps/ships/sharkan.map | 26 +++--- base/maps/ships/tensor.map | 58 ++++++------- base/maps/ships/vector.map | 54 ++++++------ base/maps/stations/alexandria.map | 12 +-- base/maps/stations/cantor.map | 12 +-- base/maps/stations/regula_storage.map | 6 +- 10 files changed, 175 insertions(+), 171 deletions(-) diff --git a/base/maps/satellites/ikarus.map b/base/maps/satellites/ikarus.map index bc262a1..dd7764e 100644 --- a/base/maps/satellites/ikarus.map +++ b/base/maps/satellites/ikarus.map @@ -2153,7 +2153,7 @@ } // entity 10 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "0 -80 128" "angle" "-90" "radius" "50" @@ -2162,7 +2162,7 @@ } // entity 11 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-80 0 128" "angle" "180" "radius" "50" @@ -2171,7 +2171,7 @@ } // entity 12 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "0 80 128" "angle" "90" "radius" "50" @@ -2180,7 +2180,7 @@ } // entity 13 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "80 0 128" "angle" "-1.40334e-14" "radius" "50" diff --git a/base/maps/satellites/jumpgate.map b/base/maps/satellites/jumpgate.map index 22b9177..03829ea 100644 --- a/base/maps/satellites/jumpgate.map +++ b/base/maps/satellites/jumpgate.map @@ -13743,7 +13743,7 @@ } // entity 33 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-2368 0 0" "flare" "2" "radius" "1024" @@ -13751,7 +13751,7 @@ } // entity 34 { -"classname" "trigger_dock" +"classname" "location_dock" "origin" "2304 0 0" "radius" "64" } diff --git a/base/maps/ships/matrix.map b/base/maps/ships/matrix.map index b829ffc..b84c63d 100644 --- a/base/maps/ships/matrix.map +++ b/base/maps/ships/matrix.map @@ -3955,27 +3955,6 @@ } // entity 1 { -"classname" "target_engine" -"origin" "-736 80 384" -"angle" "180" -"radius" "80" -} -// entity 2 -{ -"classname" "target_engine" -"origin" "-736 -80 384" -"angle" "180" -"radius" "80" -} -// entity 3 -{ -"classname" "target_engine" -"origin" "-552 184 560" -"angle" "180" -"radius" "40" -} -// entity 4 -{ "classname" "light" "origin" "80 240 208" "light" "15" @@ -3984,7 +3963,7 @@ "time" "0.2" "offset" ".5" } -// entity 5 +// entity 2 { "classname" "light" "origin" "-304 240 208" @@ -3994,7 +3973,7 @@ "time" "0.2" "offset" ".9" } -// entity 6 +// entity 3 { "classname" "light" "origin" "-112 240 208" @@ -4004,14 +3983,7 @@ "time" "0.2" "offset" ".7" } -// entity 7 -{ -"classname" "target_engine" -"origin" "-552 184 208" -"angle" "180" -"radius" "40" -} -// entity 8 +// entity 4 { "classname" "light" "origin" "80 240 560" @@ -4021,7 +3993,7 @@ "time" "0.2" "offset" ".1" } -// entity 9 +// entity 5 { "classname" "light" "origin" "-304 240 560" @@ -4031,7 +4003,7 @@ "time" "0.2" "offset" ".5" } -// entity 10 +// entity 6 { "classname" "light" "origin" "-112 240 560" @@ -4041,14 +4013,7 @@ "time" "0.2" "offset" ".3" } -// entity 11 -{ -"classname" "target_engine" -"origin" "-552 -184 560" -"angle" "180" -"radius" "40" -} -// entity 12 +// entity 7 { "classname" "light" "origin" "80 -240 208" @@ -4058,7 +4023,7 @@ "time" "0.2" "offset" "0" } -// entity 13 +// entity 8 { "classname" "light" "origin" "-304 -240 208" @@ -4068,7 +4033,7 @@ "time" "0.2" "offset" ".4" } -// entity 14 +// entity 9 { "classname" "light" "origin" "-112 -240 208" @@ -4078,14 +4043,7 @@ "time" "0.2" "offset" ".2" } -// entity 15 -{ -"classname" "target_engine" -"origin" "-552 -184 208" -"angle" "180" -"radius" "40" -} -// entity 16 +// entity 10 { "classname" "light" "origin" "80 -240 560" @@ -4095,7 +4053,7 @@ "time" "0.2" "offset" ".6" } -// entity 17 +// entity 11 { "classname" "light" "origin" "-304 -240 560" @@ -4105,7 +4063,7 @@ "time" "0.2" "offset" "0" } -// entity 18 +// entity 12 { "classname" "light" "origin" "-112 -240 560" @@ -4115,7 +4073,7 @@ "time" "0.2" "offset" ".8" } -// entity 19 +// entity 13 { "classname" "light" "origin" "-96 0 520" @@ -4124,7 +4082,7 @@ "time" ".2" "offset" ".7" } -// entity 20 +// entity 14 { "classname" "light" "origin" "608 0 456" @@ -4132,7 +4090,7 @@ "spawnflags" "1" "time" ".2" } -// entity 21 +// entity 15 { "classname" "light" "origin" "448 0 472" @@ -4141,87 +4099,131 @@ "time" ".2" "offset" ".4" } -// entity 22 +// entity 16 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "168 184 208" "flare" "0" "spawnflags" "2" "radius" "50" } -// entity 23 +// entity 17 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "168 184 560" "flare" "0" "spawnflags" "2" "radius" "50" } -// entity 24 +// entity 18 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "168 -184 560" "flare" "0" "spawnflags" "2" "radius" "50" } -// entity 25 +// entity 19 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "168 -184 208" "flare" "0" "spawnflags" "2" "radius" "50" } -// entity 26 +// entity 20 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-488 184 560" "angle" "180" "spawnflags" "4" "flare" "1" "radius" "40" } -// entity 27 +// entity 21 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-488 184 208" "angle" "180" "spawnflags" "4" "flare" "1" "radius" "40" } -// entity 28 +// entity 22 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-488 -184 208" "angle" "180" "spawnflags" "4" "flare" "1" "radius" "40" } -// entity 29 +// entity 23 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-488 -184 560" "angle" "180" "spawnflags" "4" "flare" "1" "radius" "40" } -// entity 30 +// entity 24 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-576 80 384" "angle" "180" "spawnflags" "4" "radius" "80" +"flare" "1" } -// entity 31 +// entity 25 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-576 -80 384" "angle" "180" "spawnflags" "4" "radius" "80" +"flare" "1" +} +// entity 26 +{ +"classname" "fx_particles" +"origin" "-544 184 208" +"angle" "180" +"script" "engine_trail" +} +// entity 27 +{ +"classname" "fx_particles" +"origin" "-544 184 560" +"angle" "180" +"script" "engine_trail" +} +// entity 28 +{ +"classname" "fx_particles" +"origin" "-544 -184 560" +"angle" "180" +"script" "engine_trail" +} +// entity 29 +{ +"classname" "fx_particles" +"origin" "-728 80 384" +"angle" "180" +"script" "engine_smoke" +} +// entity 30 +{ +"classname" "fx_particles" +"origin" "-544 -184 208" +"angle" "180" +"script" "engine_trail" +} +// entity 31 +{ +"classname" "fx_particles" +"origin" "-728 -80 384" +"angle" "180" +"script" "engine_smoke" } diff --git a/base/maps/ships/pod.map b/base/maps/ships/pod.map index db64020..d78d623 100644 --- a/base/maps/ships/pod.map +++ b/base/maps/ships/pod.map @@ -1631,26 +1631,26 @@ } // entity 3 { -"classname" "target_engine" +"classname" "fx_particles" "origin" "-320 0 0" "angle" "180" -"radius" "50" +"script" "engine_trail" } // entity 4 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "192 0 -48" "radius" "30" "flare" "2" } // entity 5 { -"classname" "target_cannon" +"classname" "location_cannon" "origin" "128 112 -12" } // entity 6 { -"classname" "target_cannon" +"classname" "location_cannon" "origin" "128 -112 -12" } // entity 7 @@ -1690,7 +1690,7 @@ } // entity 11 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-248 0 0" "angle" "180" "radius" "80" diff --git a/base/maps/ships/sharkan.map b/base/maps/ships/sharkan.map index 3c06cbb..9fd639b 100644 --- a/base/maps/ships/sharkan.map +++ b/base/maps/ships/sharkan.map @@ -415,13 +415,6 @@ } // entity 1 { -"classname" "target_engine" -"origin" "-88 0 0" -"angle" "180" -"radius" "30" -} -// entity 2 -{ "classname" "light" "origin" "-60 114 14" "light" "10" @@ -429,7 +422,7 @@ "spawnflags" "1" "time" ".2" } -// entity 3 +// entity 2 { "classname" "light" "origin" "-60 -114 14" @@ -439,7 +432,7 @@ "time" ".2" "offset" ".5" } -// entity 4 +// entity 3 { "classname" "light" "origin" "-60 0 90" @@ -449,20 +442,27 @@ "frequency" "1.3" "spawnflags" "1" } -// entity 5 +// entity 4 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "176 0 0" "flare" "2" "time" "-1" "radius" "35" } -// entity 6 +// entity 5 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-72 0 0" "angle" "180" "spawnflags" "4" "radius" "30" "flare" "1" } +// entity 6 +{ +"classname" "fx_particles" +"origin" "-88 0 0" +"angle" "180" +"script" "engine_trail" +} diff --git a/base/maps/ships/tensor.map b/base/maps/ships/tensor.map index 13ab54c..92f20fa 100644 --- a/base/maps/ships/tensor.map +++ b/base/maps/ships/tensor.map @@ -1960,20 +1960,6 @@ } // entity 1 { -"classname" "target_engine" -"origin" "-360 176 32" -"angle" "180" -"radius" "50" -} -// entity 2 -{ -"classname" "target_engine" -"origin" "-360 -176 32" -"angle" "180" -"radius" "50" -} -// entity 3 -{ "classname" "light" "origin" "-160 0 -56" "light" "15" @@ -1981,7 +1967,7 @@ "time" ".1" "offset" ".6" } -// entity 4 +// entity 2 { "classname" "light" "origin" "320 0 120" @@ -1989,7 +1975,7 @@ "spawnflags" "1" "time" ".1" } -// entity 5 +// entity 3 { "classname" "light" "origin" "128 0 120" @@ -1998,7 +1984,7 @@ "time" ".1" "offset" ".2" } -// entity 6 +// entity 4 { "classname" "light" "origin" "-64 0 120" @@ -2007,7 +1993,7 @@ "time" ".1" "offset" ".4" } -// entity 7 +// entity 5 { "classname" "light" "origin" "-256 0 120" @@ -2016,7 +2002,7 @@ "time" ".1" "offset" ".6" } -// entity 8 +// entity 6 { "classname" "light" "origin" "224 0 -56" @@ -2025,7 +2011,7 @@ "time" ".1" "offset" "0" } -// entity 9 +// entity 7 { "classname" "light" "origin" "32 0 -56" @@ -2034,35 +2020,51 @@ "time" ".1" "offset" ".3" } -// entity 10 +// entity 8 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "296 -176 32" "radius" "50" "spawnflags" "2" "flare" "0" } -// entity 11 +// entity 9 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "296 176 32" "radius" "50" "spawnflags" "2" "flare" "0" } -// entity 12 +// entity 10 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-296 -176 32" "angle" "180" "spawnflags" "4" "radius" "50" +"flare" "1" } -// entity 13 +// entity 11 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-296 176 32" "angle" "180" "spawnflags" "4" "radius" "50" +"flare" "1" +} +// entity 12 +{ +"classname" "fx_particles" +"origin" "-352 -176 32" +"angle" "180" +"script" "engine_trail" +} +// entity 13 +{ +"classname" "fx_particles" +"origin" "-352 176 32" +"angle" "180" +"script" "engine_trail" } diff --git a/base/maps/ships/vector.map b/base/maps/ships/vector.map index 75f7bde..bf6c7c0 100644 --- a/base/maps/ships/vector.map +++ b/base/maps/ships/vector.map @@ -1216,20 +1216,6 @@ } // entity 1 { -"classname" "target_engine" -"origin" "-184 72 -8" -"angle" "180" -"radius" "25" -} -// entity 2 -{ -"classname" "target_engine" -"origin" "-184 -72 -8" -"angle" "180" -"radius" "25" -} -// entity 3 -{ "classname" "light" "origin" "152 0 0" "light" "15" @@ -1237,7 +1223,7 @@ "spawnflags" "1" "offset" "0.3" } -// entity 4 +// entity 2 { "classname" "light" "origin" "-56 -72 24" @@ -1246,7 +1232,7 @@ "spawnflags" "1" "time" "0.2" } -// entity 5 +// entity 3 { "classname" "light" "origin" "-56 72 24" @@ -1256,7 +1242,7 @@ "offset" "0.5" "time" "0.2" } -// entity 6 +// entity 4 { "classname" "light" "origin" "-112 0 -8" @@ -1264,7 +1250,7 @@ "time" "0.1" "spawnflags" "1" } -// entity 7 +// entity 5 { "classname" "light" "origin" "112 0 52" @@ -1273,7 +1259,7 @@ "spawnflags" "1" "offset" "0.5" } -// entity 8 +// entity 6 { "classname" "light" "origin" "-112 0 52" @@ -1282,35 +1268,49 @@ "spawnflags" "1" "offset" "0.8" } -// entity 9 +// entity 7 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-8 72 -8" "radius" "25" "spawnflags" "2" } -// entity 10 +// entity 8 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-8 -72 -8" "radius" "25" "spawnflags" "2" } -// entity 11 +// entity 9 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-152 72 -8" "spawnflags" "4" "angle" "180" "radius" "25" "flare" "1" } -// entity 12 +// entity 10 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-152 -72 -8" "spawnflags" "4" "angle" "180" "radius" "25" "flare" "1" } +// entity 11 +{ +"classname" "fx_particles" +"origin" "-172 72 -8" +"angle" "180" +"script" "engine_trail" +} +// entity 12 +{ +"classname" "fx_particles" +"origin" "-172 -72 -8" +"angle" "180" +"script" "engine_trail" +} diff --git a/base/maps/stations/alexandria.map b/base/maps/stations/alexandria.map index 8ba0700..075ee89 100644 --- a/base/maps/stations/alexandria.map +++ b/base/maps/stations/alexandria.map @@ -4811,7 +4811,7 @@ } // entity 10 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "1544 704 0" "angle" "-1.4033e-14" "flare" "2" @@ -4819,7 +4819,7 @@ } // entity 11 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "1544 320 0" "angle" "-1.4033e-14" "flare" "2" @@ -4827,7 +4827,7 @@ } // entity 12 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "1544 -320 0" "angle" "-1.4033e-14" "flare" "2" @@ -4835,7 +4835,7 @@ } // entity 13 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "1544 -704 0" "angle" "-1.4033e-14" "flare" "2" @@ -4987,14 +4987,14 @@ } // entity 30 { -"classname" "trigger_dock" +"classname" "location_dock" "origin" "1728 512 0" "angle" "-1.4033e-14" "radius" "32" } // entity 31 { -"classname" "trigger_dock" +"classname" "location_dock" "origin" "1728 -512 0" "angle" "-1.4033e-14" "radius" "32" diff --git a/base/maps/stations/cantor.map b/base/maps/stations/cantor.map index cc28d86..40bcb17 100644 --- a/base/maps/stations/cantor.map +++ b/base/maps/stations/cantor.map @@ -12159,7 +12159,7 @@ } // entity 3 { -"classname" "trigger_dock" +"classname" "location_dock" "origin" "-2560 -896 0" "angle" "-90" "radius" "16" @@ -12184,7 +12184,7 @@ } // entity 6 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-2560 880 320" "flare" "2" "radius" "25" @@ -12192,7 +12192,7 @@ } // entity 7 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-2560 880 -320" "flare" "2" "radius" "25" @@ -12254,7 +12254,7 @@ } // entity 14 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-2560 -880 320" "flare" "2" "radius" "25" @@ -12262,7 +12262,7 @@ } // entity 15 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-2560 -880 -320" "flare" "2" "radius" "25" @@ -12306,7 +12306,7 @@ } // entity 20 { -"classname" "trigger_dock" +"classname" "location_dock" "origin" "-2560 896 0" "angle" "90" "radius" "16" diff --git a/base/maps/stations/regula_storage.map b/base/maps/stations/regula_storage.map index ba1ebed..453442c 100644 --- a/base/maps/stations/regula_storage.map +++ b/base/maps/stations/regula_storage.map @@ -1714,7 +1714,7 @@ } // entity 1 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "-768 -876 -512" "angle" "-90" "radius" "100" @@ -1722,7 +1722,7 @@ } // entity 2 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "768 -876 -512" "angle" "-90" "radius" "100" @@ -1730,7 +1730,7 @@ } // entity 3 { -"classname" "target_flare" +"classname" "fx_flare" "origin" "0 -876 -512" "angle" "-90" "radius" "100" -- cgit v1.2.3