Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2013-10-19 01:24:00 +0000
committerEvan Goers <mega@osirion.org>2013-10-19 01:24:00 +0000
commit6e63ebd63a9e9906e1d617eb60760eee755ce19b (patch)
tree42f9b4e1dc560b1da2964d7a9519cafcba5cc1c2 /base/maps/mercenary
parentbe746d32138f6df755ffad05835d0b4e679acb32 (diff)
Updated a bunch of ships to have engine particles.
Diffstat (limited to 'base/maps/mercenary')
-rw-r--r--base/maps/mercenary/archer.map24
-rw-r--r--base/maps/mercenary/longbow.map44
-rw-r--r--base/maps/mercenary/sections/archer_engine_large.map26
-rw-r--r--base/maps/mercenary/sections/archer_engine_medium.map19
-rw-r--r--base/maps/mercenary/sections/archer_engine_small.map13
-rw-r--r--base/maps/mercenary/sections/archer_engine_tiny.map11
6 files changed, 33 insertions, 104 deletions
diff --git a/base/maps/mercenary/archer.map b/base/maps/mercenary/archer.map
index d0c076f..db873c6 100644
--- a/base/maps/mercenary/archer.map
+++ b/base/maps/mercenary/archer.map
@@ -372,57 +372,47 @@
}
// entity 1
{
-"classname" "fx_flare"
-"origin" "-113.000000 0.000000 8.000000"
-"flare" "5"
-"spawnflags" "4"
-"cull" "none"
-"radius" "96"
-"angle" "-180"
-}
-// entity 2
-{
"classname" "misc_model"
"origin" "-96.000000 -32.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 3
+// entity 2
{
"classname" "misc_model"
"origin" "-96.000000 32.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 4
+// entity 3
{
"classname" "misc_model"
"origin" "-96.000000 26.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 5
+// entity 4
{
"classname" "misc_model"
"origin" "-96.000000 -26.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 6
+// entity 5
{
"classname" "misc_model"
"origin" "-96.000000 0.000000 8.000000"
"model" "maps/mercenary/sections/archer_engine_medium"
}
-// entity 7
+// entity 6
{
"classname" "misc_model"
"origin" "-68.000000 -48.000000 8.000000"
"model" "maps/mercenary/sections/archer_wing_starboard"
}
-// entity 8
+// entity 7
{
"classname" "misc_model"
"origin" "-68.000000 48.000000 8.000000"
"model" "maps/mercenary/sections/archer_wing_port"
}
-// entity 9
+// entity 8
{
"classname" "misc_model"
"origin" "0.000000 0.000000 8.000000"
diff --git a/base/maps/mercenary/longbow.map b/base/maps/mercenary/longbow.map
index 7d08ea7..2cb9565 100644
--- a/base/maps/mercenary/longbow.map
+++ b/base/maps/mercenary/longbow.map
@@ -860,119 +860,109 @@ thorn/panel_01_secondary
}
// entity 1
{
-"classname" "fx_flare"
-"origin" "-153.000000 0.000000 8.000000"
-"angle" "180.000000"
-"spawnflags" "4"
-"flare" "5"
-"cull" "none"
-"radius" "128"
-}
-// entity 2
-{
"classname" "fx_particles"
"origin" "-146.000000 0.000000 60.000000"
"angle" "180"
"script" "dust_trail"
}
-// entity 3
+// entity 2
{
"classname" "fx_particles"
"origin" "-146.000000 0.000000 -44.000000"
"angle" "180.000000"
"script" "dust_trail"
}
-// entity 4
+// entity 3
{
"classname" "misc_model"
"origin" "-128.000000 66.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 5
+// entity 4
{
"classname" "misc_model"
"origin" "-128.000000 72.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 6
+// entity 5
{
"classname" "misc_model"
"origin" "-128.000000 34.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 7
+// entity 6
{
"classname" "misc_model"
"origin" "-128.000000 56.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 8
+// entity 7
{
"classname" "misc_model"
"origin" "-128.000000 50.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 9
+// entity 8
{
"classname" "misc_model"
"origin" "-128.000000 -72.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 10
+// entity 9
{
"classname" "misc_model"
"origin" "-128.000000 40.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 11
+// entity 10
{
"classname" "misc_model"
"origin" "-128.000000 -40.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 12
+// entity 11
{
"classname" "misc_model"
"origin" "-128.000000 -34.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 13
+// entity 12
{
"classname" "misc_model"
"origin" "-128.000000 -50.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 14
+// entity 13
{
"classname" "misc_model"
"origin" "-128.000000 -56.000000 12.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 15
+// entity 14
{
"classname" "misc_model"
"origin" "-128.000000 -66.000000 -2.000000"
"model" "maps/mercenary/sections/archer_engine_small"
}
-// entity 16
+// entity 15
{
"classname" "misc_model"
"origin" "-128.000000 0.000000 8.000000"
"model" "maps/mercenary/sections/archer_engine_large"
}
-// entity 17
+// entity 16
{
"classname" "misc_model"
"origin" "-96.000000 -112.000000 8.000000"
"model" "maps/mercenary/sections/archer_wing_starboard"
}
-// entity 18
+// entity 17
{
"classname" "misc_model"
"origin" "-96.000000 112.000000 8.000000"
"model" "maps/mercenary/sections/archer_wing_port"
}
-// entity 19
+// entity 18
{
"classname" "misc_model"
"origin" "64.000000 0.000000 8.000000"
diff --git a/base/maps/mercenary/sections/archer_engine_large.map b/base/maps/mercenary/sections/archer_engine_large.map
index b284c54..ae1ce91 100644
--- a/base/maps/mercenary/sections/archer_engine_large.map
+++ b/base/maps/mercenary/sections/archer_engine_large.map
@@ -203,30 +203,8 @@ detail/line
// entity 1
{
"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_smoke"
-"scale" "0.4"
-}
-// entity 2
-{
-"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
+"origin" "-1.000000 0.000000 0.000000"
"angle" "-179.999985"
"script" "engine_exhaust"
-"scale" "1.2"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "-17.000000 0.000000 0.000000"
-"light" "24"
-"spawnflags" "4"
-}
-// entity 4
-{
-"classname" "light"
-"origin" "-23.000000 0.000000 0.000000"
-"light" "16"
-"spawnflags" "4"
+"scale" "1"
}
diff --git a/base/maps/mercenary/sections/archer_engine_medium.map b/base/maps/mercenary/sections/archer_engine_medium.map
index ecd9798..6faf086 100644
--- a/base/maps/mercenary/sections/archer_engine_medium.map
+++ b/base/maps/mercenary/sections/archer_engine_medium.map
@@ -228,23 +228,8 @@ colors/grey25_shiny
// entity 1
{
"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_smoke"
-"scale" "0.25"
-}
-// entity 2
-{
-"classname" "fx_particles"
-"origin" "0.000000 0.000000 0.000000"
+"origin" "-1.000000 0.000000 0.000000"
"angle" "-179.999985"
"script" "engine_exhaust"
-"scale" "0.8"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "-12.000000 0.000000 0.000000"
-"spawnflags" "4"
-"light" "16"
+"scale" "0.5"
}
diff --git a/base/maps/mercenary/sections/archer_engine_small.map b/base/maps/mercenary/sections/archer_engine_small.map
index f8281f4..7b96418 100644
--- a/base/maps/mercenary/sections/archer_engine_small.map
+++ b/base/maps/mercenary/sections/archer_engine_small.map
@@ -228,15 +228,8 @@ colors/grey25_shiny
// entity 1
{
"classname" "fx_particles"
-"origin" "0.000000 0.000000 0.000000"
-"angle" "-180"
+"origin" "-1.000000 0.000000 0.000000"
+"angle" "-179.999985"
"script" "engine_exhaust"
-"scale" "0.4"
-}
-// entity 2
-{
-"classname" "light"
-"origin" "-14.000000 0.000000 0.000000"
-"light" "8"
-"spawnflags" "4"
+"scale" "0.25"
}
diff --git a/base/maps/mercenary/sections/archer_engine_tiny.map b/base/maps/mercenary/sections/archer_engine_tiny.map
index 54cdc19..d3e4b63 100644
--- a/base/maps/mercenary/sections/archer_engine_tiny.map
+++ b/base/maps/mercenary/sections/archer_engine_tiny.map
@@ -228,15 +228,8 @@ colors/grey25_shiny
// entity 1
{
"classname" "fx_particles"
-"origin" "0.000000 0.000000 0.000000"
+"origin" "-1.000000 0.000000 0.000000"
"angle" "-179.999985"
"script" "engine_exhaust"
-"scale" "0.4"
-}
-// entity 2
-{
-"classname" "light"
-"origin" "-7.000000 0.000000 0.000000"
-"light" "8"
-"spawnflags" "4"
+"scale" "0.25"
}