6 files changed, 28 insertions, 173 deletions
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index d0e0c0d..8163dfb 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -193,8 +193,24 @@ cargo=2
 thrust  = 2.1
 impulse = 10
 strafe  = 0.2
-turn    = 10
-roll    = 4
+turn    = 18
+roll    = 8
+
+[ship]
+label=miningprotector
+name=Mining Protector
+template=ship_medium
+model=maps/miners/protector
+jumpdrive=no
+
+price=14000
+cargo=2
+
+thrust  = 3.9
+impulse = 20
+strafe  = 0.7
+turn    = 106
+roll    = 98
 
 [ship]
 label=archer
@@ -213,6 +229,7 @@ turn=4
 
 info=The Archer was considered to be leap in technology by the Joint Miners Association, allowing for rapid exploration of mineral deposits. Featuring high maneuverability the Archer was capable of outrunning any threat, while having enough cargo-space to return with mineral samples.
 info=Unfortunately, the design revealed several sensor blind spots and as a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the sensor range since.
+info=The Archer is no longer mass-produced. Nearly all models have been retrofitted with entirely different sensor equipment based on the newer Longbow scout fighter. The old sensors are integral to the design of the Archer and thus cannot be easily switched out, so newer equipment has been simply crammed into the empty spaces of the hull.
 
 [ship]
 label=longbow
@@ -250,7 +267,7 @@ thrust  = 4
 impulse = 20
 strafe  = 0.8
 turn    = 60
-roll    = 8
+roll    = 102
 
 ; info
 info=The P.O.D. was originally designed as a racing vehicle, but the sturdy design placed it at a considerable weight disadvantage against its competitors. The ship fell out of grace on the race circuit, but was picked up by scouts and couriers in need for a small and fast vessel.
@@ -267,7 +284,7 @@ cargo=10
 thrust=4.4
 impulse=20
 strafe=0.6
-turn=64
+turn=98
 roll=128
 
 info=The Talon heavy fighter is an elite combat vessel designed for high-priority missions. It's built for speed and high maneuverability without sacrificing firepower. It houses a fusion plant for the main thruster, complimented by an additional fusion plant for powering two secondary thrusters capable of individual high-frequency power modulation to improve turn speed as well as maximum thrust. On top of that, the Talon is capable of utilizing the highest level weaponry a fighter can mount.
@@ -285,8 +302,8 @@ cargo=35
 thrust=1.6
 impulse=7
 strafe=0.15
-turn=13.4
-roll=11
+turn=80
+roll=97
 
 info=The Enforcer is a classic space combat vessel originally mass-produced by the now-defunct Davis-Alexander Aerospace Co. Way out of mass production, this flying antique is still used today by many mercenary groups and skilled freelancers. Most veteran pilots owning and operating these vessels know the ship inside and out. Due to its popularity with professional pilots, several joint-effort companies still build these ships by hand, using the original blueprints and a little ingenuity.
 info=The design was copied shortly after mass production by pirates, but most of the resulting knockoff ships lacked the unique engine that the Enforcer was known for. Eventually the blueprints were recovered from a military raid on a pirate convoy.
diff --git a/base/maps/mercenary/sections/archer_engine_large.map b/base/maps/mercenary/sections/archer_engine_large.map
index ffd4282..7e5d74c 100644
--- a/base/maps/mercenary/sections/archer_engine_large.map
+++ b/base/maps/mercenary/sections/archer_engine_large.map
@@ -165,33 +165,25 @@ colors/grey50_shiny
 "classname" "fx_particles"
 "origin" "-2.000000 0.000000 0.000000"
 "angle" "-179.999985"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 3
-{
-"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
 "script" "engine_exhaust"
 "spawnflags" "4"
 "scale" "1.2"
 }
-// entity 4
+// entity 3
 {
 "classname" "light"
 "origin" "-17.000000 0.000000 0.000000"
 "light" "24"
 "spawnflags" "4"
 }
-// entity 5
+// entity 4
 {
 "classname" "light"
 "origin" "-23.000000 0.000000 0.000000"
 "light" "16"
 "spawnflags" "4"
 }
-// entity 6
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-2.000000 0.000000 0.000000"
diff --git a/base/maps/mercenary/sections/archer_engine_medium.map b/base/maps/mercenary/sections/archer_engine_medium.map
index 4a67b83..fdefd96 100644
--- a/base/maps/mercenary/sections/archer_engine_medium.map
+++ b/base/maps/mercenary/sections/archer_engine_medium.map
@@ -196,14 +196,6 @@ colors/grey50_shiny
 }
 // entity 3
 {
-"classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 4
-{
 "classname" "light"
 "origin" "-12.000000 0.000000 0.000000"
 "spawnflags" "4"
diff --git a/base/maps/mercenary/sections/archer_engine_small.map b/base/maps/mercenary/sections/archer_engine_small.map
index 8566d9c..a9d1ca4 100644
--- a/base/maps/mercenary/sections/archer_engine_small.map
+++ b/base/maps/mercenary/sections/archer_engine_small.map
@@ -179,21 +179,13 @@ colors/grey25_shiny
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-180"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 2
-{
-"classname" "fx_particles"
 "origin" "0.000000 0.000000 0.000000"
 "angle" "-180"
 "script" "engine_exhaust"
 "spawnflags" "4"
 "scale" "0.4"
 }
-// entity 3
+// entity 2
 {
 "classname" "light"
 "origin" "-14.000000 0.000000 0.000000"
diff --git a/base/maps/mercenary/sections/archer_engine_tiny.map b/base/maps/mercenary/sections/archer_engine_tiny.map
index 964ce18..4c0d3b9 100644
--- a/base/maps/mercenary/sections/archer_engine_tiny.map
+++ b/base/maps/mercenary/sections/archer_engine_tiny.map
@@ -179,21 +179,13 @@ colors/grey25_shiny
 // entity 1
 {
 "classname" "fx_particles"
-"origin" "-2.000000 0.000000 0.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-"spawnflags" "2"
-}
-// entity 2
-{
-"classname" "fx_particles"
 "origin" "0.000000 0.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 "spawnflags" "4"
 "scale" "0.4"
 }
-// entity 3
+// entity 2
 {
 "classname" "light"
 "origin" "-7.000000 0.000000 0.000000"
diff --git a/base/maps/miners/defender.map b/base/maps/miners/defender.map
index 3c79771..01788b5 100644
--- a/base/maps/miners/defender.map
+++ b/base/maps/miners/defender.map
@@ -146,136 +146,6 @@ colors/black_bright
 ( -72 64 19 ) ( -17 64 23 ) ( -72 -64 19 ) common/entity 0 0 0 1 1 0 0 0
 ( -69 64 18 ) ( -69 64 19 ) ( -69 -64 18 ) common/caulk 0 0 0 1 1 0 0 0
 }
-// brush 14
-{
-( -8 -16 -24 ) ( 0 16 -24 ) ( 0 -16 -24 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 0 -12 -26 ) ( -8 -12 -24 ) ( 0 -12 -24 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 0 16 -24 ) ( 0 -16 -26 ) ( 0 -16 -24 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -8 -16 -26 ) ( 0 16 -26 ) ( -8 16 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 0 -4 -28 ) ( -8 -4 -26 ) ( -8 -4 -28 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -8 16 -24 ) ( -8 -16 -26 ) ( -8 16 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 15
-{
-( -8 -14 -26 ) ( 0 -2 -26 ) ( 0 -14 -26 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -6 -14 -34 ) ( -10 -14 -34 ) ( -2 -10 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -6 -10 -34 ) ( -6 -14 -34 ) ( -2 -6 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -6 -10 -34 ) ( -10 -10 -34 ) ( -6 -14 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -10 -10 -34 ) ( -6 -10 -34 ) ( -6 -6 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -10 -14 -34 ) ( -10 -10 -34 ) ( -6 -10 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 16
-{
-( -10 -14 -34 ) ( -2 -10 -34 ) ( -2 -14 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -2 -14 -40 ) ( -10 -14 -34 ) ( -2 -14 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -6 -10 -34 ) ( -6 -14 -40 ) ( -6 -14 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -10 -14 -40 ) ( -2 -10 -40 ) ( -10 -10 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -2 -10 -40 ) ( -10 -10 -34 ) ( -10 -10 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -10 -10 -34 ) ( -10 -14 -40 ) ( -10 -10 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 17
-{
-( 4 -16 -39 ) ( -24 -16 -39 ) ( 4 -15 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 -16 -41 ) ( -24 -16 -41 ) ( 4 -16 -39 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 -16 -41 ) ( 4 -16 -39 ) ( 4 -15 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 -16 -41 ) ( 4 -16 -41 ) ( 4 -15 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 -16 -39 ) ( -24 -16 -41 ) ( -24 -15 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -64 -15 -38 ) ( -64 -15 -40 ) ( 64 -15 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 18
-{
-( -24 -16 -39 ) ( -28 -16 -37 ) ( -24 -15 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 -16 -39 ) ( -24 -16 -41 ) ( -28 -16 -37 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 -16 -41 ) ( -24 -16 -39 ) ( -24 -15 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -28 -16 -39 ) ( -24 -16 -41 ) ( -24 -15 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 -16 -37 ) ( -28 -16 -39 ) ( -28 -15 -38 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -64 -15 -38 ) ( -64 -15 -40 ) ( 64 -15 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 19
-{
-( -2 14 -34 ) ( -2 10 -34 ) ( -10 14 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -2 14 -34 ) ( -10 14 -34 ) ( -2 14 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -6 14 -34 ) ( -6 14 -40 ) ( -6 10 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -10 10 -40 ) ( -2 10 -40 ) ( -10 14 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -10 10 -40 ) ( -10 10 -34 ) ( -2 10 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -10 10 -40 ) ( -10 14 -40 ) ( -10 10 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 20
-{
-( 0 14 -26 ) ( 0 2 -26 ) ( -8 14 -26 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -2 10 -26 ) ( -10 14 -34 ) ( -6 14 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -2 6 -26 ) ( -6 14 -34 ) ( -6 10 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -6 14 -34 ) ( -10 10 -34 ) ( -6 10 -34 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -6 6 -26 ) ( -6 10 -34 ) ( -10 10 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -6 10 -26 ) ( -10 10 -34 ) ( -10 14 -34 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 21
-{
-( 0 16 -24 ) ( 0 -16 -24 ) ( -8 16 -24 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 0 12 -24 ) ( -8 12 -24 ) ( 0 12 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 0 16 -24 ) ( 0 16 -26 ) ( 0 -16 -24 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -8 -16 -26 ) ( 0 -16 -26 ) ( -8 16 -26 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -8 4 -28 ) ( -8 4 -26 ) ( 0 4 -28 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -8 -16 -26 ) ( -8 16 -26 ) ( -8 -16 -24 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 22
-{
-( -28 -15 -38 ) ( -28 -8 -38 ) ( -24 -8 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 -9 -40 ) ( -28 -15 -40 ) ( -24 -9 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 -9 -40 ) ( -28 -8 -39 ) ( -28 -15 -38 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 -15 -40 ) ( -28 -15 -38 ) ( -24 -15 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -28 -8 -38 ) ( -28 -8 -39 ) ( -24 -8 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 -8 -39 ) ( -28 -9 -40 ) ( -24 -8 -41 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 64 -40 ) ( -24 -64 -42 ) ( -24 -64 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 23
-{
-( 4 15 -40 ) ( -24 16 -39 ) ( 4 16 -39 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 16 -39 ) ( -24 16 -41 ) ( 4 16 -41 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 15 -40 ) ( 4 16 -39 ) ( 4 16 -41 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 15 -42 ) ( 4 16 -41 ) ( -24 16 -41 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 15 -40 ) ( -24 16 -41 ) ( -24 16 -39 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 64 15 -38 ) ( -64 15 -40 ) ( -64 15 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 24
-{
-( -24 15 -40 ) ( -28 16 -37 ) ( -24 16 -39 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 16 -37 ) ( -24 16 -41 ) ( -24 16 -39 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 15 -40 ) ( -24 16 -39 ) ( -24 16 -41 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -24 15 -42 ) ( -24 16 -41 ) ( -28 16 -39 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 15 -38 ) ( -28 16 -39 ) ( -28 16 -37 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 64 15 -38 ) ( -64 15 -40 ) ( -64 15 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 25
-{
-( -24 -8 -40 ) ( 4 -8 -40 ) ( -24 -16 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 -8 -40 ) ( 4 -8 -42 ) ( 4 -16 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 -8 -42 ) ( -24 -8 -42 ) ( 4 -16 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 -8 -42 ) ( -24 -8 -40 ) ( -24 -16 -42 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 64 -15 -38 ) ( -64 -15 -40 ) ( -64 -15 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 4 -8 -40 ) ( -24 -8 -40 ) ( 4 -8 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 64 -9 -42 ) ( -64 -8 -41 ) ( -64 -9 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 26
-{
-( -24 16 -40 ) ( 4 8 -40 ) ( -24 8 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 16 -40 ) ( 4 8 -42 ) ( 4 8 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( 4 16 -42 ) ( -24 8 -42 ) ( 4 8 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 16 -42 ) ( -24 8 -40 ) ( -24 8 -42 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -64 15 -38 ) ( -64 15 -40 ) ( 64 15 -38 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 4 8 -42 ) ( -24 8 -40 ) ( 4 8 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -64 9 -42 ) ( -64 8 -41 ) ( 64 9 -42 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 27
-{
-( -24 8 -40 ) ( -28 8 -38 ) ( -28 15 -38 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 9 -42 ) ( -28 15 -40 ) ( -28 9 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -28 15 -38 ) ( -28 8 -39 ) ( -28 9 -40 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 15 -40 ) ( -28 15 -38 ) ( -28 15 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -24 8 -40 ) ( -28 8 -39 ) ( -28 8 -38 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 8 -41 ) ( -28 9 -40 ) ( -28 8 -39 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
-( -24 64 -40 ) ( -24 64 -42 ) ( -24 -64 -40 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-}
 }
 // entity 1
 {