From 0b78e557397874db2b1be0877f8eae9128f93311 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Thu, 18 Nov 2010 12:53:34 +0000
Subject: Modified some particle scripts to have multiple emitters.. All ship
 models corrected for recent svn changes regarding rotations. raider.map:
 Created brushwork out of most patch meshes to complete model. freighter.map:
 Added more structure to the model, still work in progress. inquisitor.map:
 Completely rebuilt cockpit. Increased width of the overall ship.

---
 base/maps/mercenary/archer.map                     |  3 +--
 base/maps/mercenary/enforcer.map                   | 30 ++++++++++++----------
 base/maps/mercenary/longbow.map                    |  1 -
 base/maps/mercenary/pod.map                        |  8 +++---
 .../mercenary/sections/archer_engine_large.map     | 15 +++++++++--
 .../mercenary/sections/archer_engine_medium.map    |  5 ++--
 .../mercenary/sections/archer_engine_small.map     |  6 ++---
 .../maps/mercenary/sections/archer_engine_tiny.map |  2 +-
 base/maps/mercenary/talon.map                      |  1 +
 9 files changed, 42 insertions(+), 29 deletions(-)

(limited to 'base/maps/mercenary')

diff --git a/base/maps/mercenary/archer.map b/base/maps/mercenary/archer.map
index 6d89708..f9a25fa 100644
--- a/base/maps/mercenary/archer.map
+++ b/base/maps/mercenary/archer.map
@@ -282,10 +282,9 @@
 "origin" "-113.000000 0.000000 8.000000"
 "flare" "5"
 "spawnflags" "4"
-"roll" "90"
 "cull" "none"
 "radius" "150"
-"angle" "-179.999985"
+"angle" "-180"
 }
 // entity 2
 {
diff --git a/base/maps/mercenary/enforcer.map b/base/maps/mercenary/enforcer.map
index 60f9cd0..afb419a 100644
--- a/base/maps/mercenary/enforcer.map
+++ b/base/maps/mercenary/enforcer.map
@@ -4085,7 +4085,8 @@
 "origin" "-162.000000 -40.000000 0.000000"
 "spawnflags" "4"
 "script" "engine_exhaust"
-"angle" "180.000000"
+"angle" "-179.999985"
+"scale" "0.25"
 }
 // entity 4
 {
@@ -4100,7 +4101,8 @@
 "origin" "-162.000000 -24.000000 0.000000"
 "spawnflags" "4"
 "script" "engine_exhaust"
-"angle" "180.000000"
+"angle" "-179.999985"
+"scale" "0.25"
 }
 // entity 6
 {
@@ -4108,7 +4110,8 @@
 "origin" "-162.000000 40.000000 0.000000"
 "spawnflags" "4"
 "script" "engine_exhaust"
-"angle" "180.000000"
+"angle" "-179.999985"
+"scale" "0.25"
 }
 // entity 7
 {
@@ -4116,38 +4119,39 @@
 "origin" "-162.000000 24.000000 0.000000"
 "spawnflags" "4"
 "script" "engine_exhaust"
-"angle" "180.000000"
+"angle" "-179.999985"
+"scale" "0.25"
 }
 // entity 8
 {
 "classname" "fx_particles"
-"origin" "-162.000000 24.000000 0.000000"
+"origin" "-166.000000 24.000000 0.000000"
 "script" "engine_trail"
-"angle" "180.000000"
+"angle" "-179.999985"
 "spawnflags" "2"
 }
 // entity 9
 {
 "classname" "fx_particles"
-"origin" "-162.000000 40.000000 0.000000"
+"origin" "-166.000000 40.000000 0.000000"
 "script" "engine_trail"
-"angle" "180.000000"
+"angle" "-179.999985"
 "spawnflags" "2"
 }
 // entity 10
 {
 "classname" "fx_particles"
-"origin" "-162.000000 -24.000000 0.000000"
+"origin" "-166.000000 -24.000000 0.000000"
 "script" "engine_trail"
-"angle" "180.000000"
+"angle" "-179.999985"
 "spawnflags" "2"
 }
 // entity 11
 {
 "classname" "fx_particles"
-"origin" "-162.000000 -40.000000 0.000000"
+"origin" "-166.000000 -40.000000 0.000000"
 "script" "engine_trail"
-"angle" "180.000000"
+"angle" "-179.999985"
 "spawnflags" "2"
 }
 // entity 12
@@ -4199,7 +4203,6 @@
 "spawnflags" "4"
 "angle" "180"
 "radius" "50"
-"roll" "90"
 }
 // entity 17
 {
@@ -4210,7 +4213,6 @@
 "spawnflags" "4"
 "angle" "180"
 "radius" "50"
-"roll" "90"
 }
 // entity 18
 {
diff --git a/base/maps/mercenary/longbow.map b/base/maps/mercenary/longbow.map
index 90eb9bf..b18c673 100644
--- a/base/maps/mercenary/longbow.map
+++ b/base/maps/mercenary/longbow.map
@@ -586,7 +586,6 @@
 "spawnflags" "4"
 "flare" "5"
 "cull" "none"
-"roll" "90"
 "radius" "250"
 }
 // entity 2
diff --git a/base/maps/mercenary/pod.map b/base/maps/mercenary/pod.map
index 33ad8dc..1b43e09 100644
--- a/base/maps/mercenary/pod.map
+++ b/base/maps/mercenary/pod.map
@@ -1264,15 +1264,15 @@
 "classname" "fx_particles"
 "origin" "-40 -168 -12"
 "angle" "180"
-"script" "engine_trail"
+"script" "dust_trail"
 }
 // entity 4
 {
 "classname" "fx_flare"
-"origin" "190 0 -46"
+"origin" "190.000000 0.000000 -46.000000"
 "radius" "64"
 "flare" "2"
-"pitch" "-45"
+"angles" "45 0.000000 0.000000"
 }
 // entity 5
 {
@@ -1340,7 +1340,7 @@
 "classname" "fx_particles"
 "origin" "-40 168 -12"
 "angle" "180"
-"script" "engine_trail"
+"script" "dust_trail"
 }
 // entity 14
 {
diff --git a/base/maps/mercenary/sections/archer_engine_large.map b/base/maps/mercenary/sections/archer_engine_large.map
index fe12a97..ea71c17 100644
--- a/base/maps/mercenary/sections/archer_engine_large.map
+++ b/base/maps/mercenary/sections/archer_engine_large.map
@@ -401,10 +401,11 @@
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-24.000000 0.000000 0.000000"
+"origin" "-2.000000 0.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_smoke"
 "spawnflags" "4"
+"scale" "0.4"
 }
 // entity 2
 {
@@ -417,10 +418,11 @@
 // entity 3
 {
 "classname" "fx_particles"
-"origin" "-16.000000 0.000000 0.000000"
+"origin" "-2.000000 0.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 "spawnflags" "4"
+"scale" "1.2"
 }
 // entity 4
 {
@@ -436,3 +438,12 @@
 "light" "16"
 "spawnflags" "4"
 }
+// entity 6
+{
+"classname" "fx_particles"
+"origin" "-2.000000 0.000000 0.000000"
+"angle" "-179.999985"
+"script" "engine_exhaust"
+"spawnflags" "4"
+"scale" "0.5"
+}
diff --git a/base/maps/mercenary/sections/archer_engine_medium.map b/base/maps/mercenary/sections/archer_engine_medium.map
index a8782ed..035222f 100644
--- a/base/maps/mercenary/sections/archer_engine_medium.map
+++ b/base/maps/mercenary/sections/archer_engine_medium.map
@@ -177,11 +177,11 @@
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-16.000000 0.000000 0.000000"
+"origin" "-2.000000 0.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_smoke"
 "spawnflags" "4"
-"radius" "2"
+"scale" "0.25"
 }
 // entity 2
 {
@@ -190,6 +190,7 @@
 "angle" "-179.999985"
 "script" "engine_exhaust"
 "spawnflags" "4"
+"scale" "0.8"
 }
 // entity 3
 {
diff --git a/base/maps/mercenary/sections/archer_engine_small.map b/base/maps/mercenary/sections/archer_engine_small.map
index 04e3c26..d7ae458 100644
--- a/base/maps/mercenary/sections/archer_engine_small.map
+++ b/base/maps/mercenary/sections/archer_engine_small.map
@@ -337,7 +337,7 @@ colors/grey25_shiny
 {
 "classname" "fx_particles"
 "origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
+"angle" "-180"
 "script" "engine_trail"
 "spawnflags" "2"
 }
@@ -345,10 +345,10 @@ colors/grey25_shiny
 {
 "classname" "fx_particles"
 "origin" "0.000000 0.000000 0.000000"
-"angle" "-179.999985"
+"angle" "-180"
 "script" "engine_exhaust"
 "spawnflags" "4"
-"radius" "1"
+"scale" "0.4"
 }
 // entity 3
 {
diff --git a/base/maps/mercenary/sections/archer_engine_tiny.map b/base/maps/mercenary/sections/archer_engine_tiny.map
index 2c610ba..1186dd1 100644
--- a/base/maps/mercenary/sections/archer_engine_tiny.map
+++ b/base/maps/mercenary/sections/archer_engine_tiny.map
@@ -188,8 +188,8 @@
 "origin" "0.000000 0.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
-"radius" "1"
 "spawnflags" "4"
+"scale" "0.4"
 }
 // entity 3
 {
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index 3b0f275..ace7e37 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -1645,6 +1645,7 @@ common/entity
 "spawnflags" "4"
 "angle" "180.000000"
 "script" "engine_exhaust"
+"scale" "0.6"
 }
 // entity 3
 {
-- 
cgit v1.2.3