update ship definitions

1 files changed, 214 insertions, 269 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 6a59460..e077b12 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -19,10 +19,11 @@ model=maps/merchant/vector
 
 ; dealer price
 price=12500
+
+; technical specifications
+
 ; cargo hold size, 1 is 1 cubic meter
 cargo=20
-
-; mass of the ship 
 ; can not be set on-the-fly with the specs command
 mass=10
 ; thruster power, maximum thrust speed depends on this
@@ -34,13 +35,15 @@ impulse=4
 ; defines strafe engine and afterburner power
 ; is generally a lot smaller than thrust
 strafe=0.1
-; torque power
-; defines how fast a ship will turn and roll
-torque=2.5
-
-; ship info
-; long text will be wrapped in-game
-; empty lines are allowed
+; turn power
+; defines how fast a ship will turn
+turn=2.5
+; roll power
+; defines how fast the ship will roll
+roll=1.0
+
+; info
+; long lines will be wrapped in-game, empty lines are allowed
 info=Micron Corporation's entry-level model has been a hit sale for many decades. Despite the moderate size of its cargo hold, this ship offers a fast and reliable means of transport, capable of outrunning many larger ships.
 
 [ship]
@@ -48,36 +51,44 @@ label=scalar
 name=Micron Scalar
 model=maps/merchant/scalar
 jumpdrive=yes
+
 price=15000
-cargo=40
-info=Due to rising pirate activity, the Micron corporation saw a need in the market for more protected transport vessels. The Scalar was developed as a continuation of the Vector, using much of its original design. 
-info=
-info=The Scalar is much more armored than the Vector, with improved VE-1 engines, and a new XE-1 engine. These improvements came at the cost of cargo space, but it was a welcome addition to established traders.
 
-; ship movement specifications
+; technical specifications
+cargo=40
 mass=15
 thrust=1
 impulse=6
 strafe=0.15
-torque=3
+turn=3
+roll=1.2
+
+; info
+info=Due to rising pirate activity, the Micron corporation saw a need in the market for more protected transport vessels. The Scalar was developed as a continuation of the Vector, using much of its original design. 
+info=
+info=The Scalar is much more armored than the Vector, with improved VE-1 engines, and a new XE-1 engine. These improvements came at the cost of cargo space, but it was a welcome addition to established traders.
 
 [ship]
 label=matrix
 name=Micron Matrix
 model=maps/merchant/matrix
-acceleration=1.0
-maxspeed=2.8
-turnspeed=30
 jumpdrive=yes
+
 price=95000
+
+; technical specifications
 cargo=175
-info=The unprecedented success of the Vector had stimulated the market for cheap transport vessels and prompted Micron Corporations to develop the larger Matrix, with an increased cargo hold at the cost of speed and maneuverability.
-; ship movement specifications
+
+cargo   = 175
 mass    = 50
 thrust  = 3.7
 impulse = 20
 strafe  = 0.5
-torque  = 40
+turn    = 75
+roll    = 15
+
+; info
+info=The unprecedented success of the Vector had stimulated the market for cheap transport vessels and prompted Micron Corporations to develop the larger Matrix, with an increased cargo hold at the cost of speed and maneuverability.
 
 ; ------------------------------------------------------------------ ;
 ;		MERCENARY
@@ -87,75 +98,82 @@ torque  = 40
 label=pod
 name=P.O.D.
 model=maps/mercenary/pod
-cargo=10
+
 price=15000
-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.
-info=
-info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
-; ship movement specifications
+
+; technical specifications
+cargo   = 10
 mass    = 15
-thrust  = 1.5
+thrust  = 1.4
 impulse = 6
 strafe  = 0.15
-torque  = 11
+turn    = 12
+roll    = 5
+
+; 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.
+info=
+info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
 
 
 [ship]
 label=archer
 name=Archer
 model=maps/mercenary/archer
-cargo=15
+
 price=20000
-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=
-info=Unfortunately, the Archer was not equipped with adequately ranged sensors. As a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the range since.
-; ship movement specifications
+
+cargo=15
 mass=20
 thrust=1
 impulse=6
 strafe=0.15
-torque=3
+turn=3
+
+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=
+info=Unfortunately, the Archer was not equipped with adequately ranged sensors. As a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the range since.
 
 [ship]
 label=longbow
 name=Longbow
 model=maps/mercenary/longbow
-acceleration=2.4
-maxspeed=3.7
-turnspeed=60
-cargo=30
+
 price=45000
-info=The replacement for the Archer scout ship. After the first costly mistake, the Joint Miners Association decided to outsource development to a trusted third-party contractor. As a result, the flaws in the ship design were fixed.
-; ship movement specifications
+
+cargo=30
 mass=35
 thrust=1
 impulse=6
 strafe=0.15
-torque=3
+turn=3
+
+info=The replacement for the Archer scout ship. After the first costly mistake, the Joint Miners Association decided to outsource development to a trusted third-party contractor. As a result, the flaws in the ship design were fixed.
 
 [ship]
 label=talon
 name=Talon
 model=maps/mercenary/talon
-cargo=10
+
 price=22500
-info=TODO
-; ship movement specifications
+
+cargo=10
 mass=15
 thrust=1
 impulse=6
 strafe=0.15
-torque=3
+turn=3
+
+info=TODO
 
 [ship]
 label=enforcer
 name=Enforcer
 model=maps/mercenary/enforcer
-acceleration=2.2
-maxspeed=3.6
-turnspeed=50
-cargo=25
 price=45000
+
+cargo=25
+
 info=TODO
 
 ; ------------------------------------------------------------------ ;
@@ -168,25 +186,34 @@ name=Custodian
 model=maps/colonial/custodian
 jumpdrive=yes
 dock=yes
-cargo=2500
+
 price=750000
-info=The Custodian class battleship is the Independent Colonies most valued long-range fighter carrier. Equipped with a jumpdrive and a sizeable launch bay, this battleship is a force to be reckoned with.
-; ship movement specifications
+
+cargo=2500
 mass=100
-thrust=1
-impulse=6
-strafe=0.15
-torque=3
+thrust=8
+impulse=15
+strafe=5
+turn=1500
+roll=1000
+
+info=The Custodian class battleship is the Independent Colonies most valued long-range fighter carrier. Equipped with a jumpdrive and a sizeable launch bay, this battleship is a force to be reckoned with.
 
 [ship]
 label=sharkan
 name=Sharkan
 model=maps/colonial/sharkan
-acceleration=2
-maxspeed=4.0
-turnspeed=80
-cargo=5
+
 price=8500
+
+cargo   = 5
+mass    = 8
+thrust  = 0.75
+impulse = 3.2
+strafe  = 0.1
+turn    = 2.5
+roll    = 1.2
+
 info=This military scoutship's lack of firepower is compensated by its phenomenal speed and maneuverability.
 info=The Sharkan is the fastest ship known to exist, which makes it an excellent choice for hit and run operations.
 
@@ -198,86 +225,78 @@ info=The Sharkan is the fastest ship known to exist, which makes it an excellent
 label=betelgeuse
 name=Betelgeuse
 model=maps/independent/betelgeuse
-acceleration=0.5
-maxspeed=2.25
-turnspeed=5
 jumpdrive=yes
 dock=yes
+
 price=325000
+
 cargo=400
 
 [ship]
 label=horizon
 name=Horizon
 model=maps/independent/horizon
-acceleration=1.5
-maxspeed=3.0
-turnspeed=35
+
 price=60000
+
 cargo=70
 
 [ship]
 label=orion
 name=Orion
 model=maps/independent/orion
-acceleration=1.5
-maxspeed=3.5
-turnspeed=30
-cargo=80
 price=65000
 
+cargo=80
+
+info=DEPRICATED
+
 [ship]
 label=bumblebee
 name=Bumblebee
 model=maps/independent/bumblebee
-acceleration=1.5
-maxspeed=3.5
-turnspeed=30
-cargo=65
+
 price=50000
 
+cargo=65
+
 [ship]
 label=jupiter
 name=Jupiter
 model=maps/independent/jupiter
-acceleration=1.6
-maxspeed=2.8
-turnspeed=40
-cargo=55
+
 price=67500
 
+cargo=55
+
 [ship]
 label=avenger
 name=Avenger
 model=maps/independent/avenger
-acceleration=2
-maxspeed=3
-turnspeed=55
-cargo=5
+
 price=11500
 
+cargo=5
+
 [ship]
 label=shootingstar
 name=Shooting Star
 model=maps/independent/shootingstar
-acceleration=1.8
-maxspeed=3
-turnspeed=50
-cargo=30
+
 price=35000
 
+cargo=30
 
 [ship]
 label=galaxy
 name=Galaxy
 model=maps/independent/galaxy
-acceleration=0.75
-maxspeed=2.0
-turnspeed=15
 jumpdrive=yes
-cargo=120
+
 price=82500
 
+cargo=120
+
 ; ------------------------------------------------------------------ ;
 ;		LINDBLADE
 ; ------------------------------------------------------------------ ;
@@ -286,34 +305,32 @@ price=82500
 label=avatar
 name=Avatar
 model=maps/lindblade/avatar
-acceleration=1.2
-maxspeed=3.25
-turnspeed=20
 jumpdrive=yes
-cargo=85
+
 price=80000
 
+cargo=85
+
 [ship]
 label=supertanker
 name=Supertanker
 model=maps/lindblade/supertanker
-acceleration=0.5
-maxspeed=2.5
-turnspeed=20
 jumpdrive=yes
-cargo=685
+
 price=515000
 
+cargo=685
+
 [ship]
 label=halcyon
 name=Halcyon
 model=maps/lindblade/halcyon
-acceleration=0.6
-maxspeed=2.5
-turnspeed=20
 jumpdrive=yes
-cargo=625
+
 price=515000
+
+cargo=625
+
 info=^1CLASSIFIED^N
 info=
 info=For authorized personnel only.
@@ -326,13 +343,12 @@ info=For authorized personnel only.
 label=colosus
 name=Colosus
 model=maps/tsukhan/colosus
-acceleration=0.65
-maxspeed=2.5
-turnspeed=2.5
 jumpdrive=yes
-cargo=50000
+
 price=10000000
-;If only there was room for a >9000 remark.
+
+cargo=50000
+
 info=^1CLASSIFIED^N
 info=
 info=For authorized personnel only.
@@ -341,153 +357,96 @@ info=For authorized personnel only.
 label=imp
 name=Imp
 model=maps/tsukhan/imp
-acceleration=1.5
-maxspeed=3.7
-turnspeed=60
 jumpdrive=no
+
 price=22500
+
 cargo=30
-; ---- maximal width ------------------------|
-info=The 'Imp' scout fighter was
-info=designed to be cheap, and have a
-info=powerful engine to push it through space
-info=faster than any of its competition.
-info=
-info=During the Kuu-Saar civil war, many
-info=who piloted Imps were ordered to
-info=kamikaze into enemy capital ships. Since
-info=they were so cheap to build, they often
-info=played the role as inexpensive guided
-info=torpedoes. Many Imp pilots carried a
-info=single warhead in the tiny cargo bays,
-info=and were used as last ditch efforts to 
-info=destroy important hard-to-kill capital
-info=ships.
+
+info =The 'Imp' scout fighter was designed to be cheap, and have a powerful engine to push it through space faster than any of its competition.
+info = During the Kuu-Saar civil war, many who piloted Imps were ordered to kamikaze into enemy capital ships. Since they were so cheap to build, they often played the role as inexpensive guided torpedoes. 
+info = Many Imp pilots carried a single warhead in the tiny cargo bays, and were used as last ditch efforts to destroy important hard-to-kill capital ships.
 
 [ship]
 label=inquisitor
 name=Inquisitor
 model=maps/tsukhan/inquisitor
-acceleration=1.2
-maxspeed=3.5
-turnspeed=50
 jumpdrive=no
+
 price=60000
+
 cargo=60
-; ---- maximal width ------------------------|
-info=The 'Inquisitor' Interceptor is the main
-info=strike fighter of the Tsu-Khan navy. It
-info=has been in use since the Kuu-Saar civil
-info=war and won many key battles for the
-info=Tsu-Khan empire.
-info=
-info=An experimental Interceptor fighter was
-info=outfitted with a jump drive after the
-info=Bringers of Great Knowledge disappeared.
-info=The design was too costly to be viable
-info=and the project was canned in favor of
-info=the Carrier.
+
+info=The 'Inquisitor' Interceptor is the main strike fighter of the Tsu-Khan navy. It has been in use since the Kuu-Saar civil war and won many key battles for the Tsu-Khan empire.
+info=An experimental Interceptor fighter was outfitted with a jump drive after the Bringers of Great Knowledge disappeared. The design was too costly to be viable and the project was canned in favor of the Carrier.
 
 [ship]
 label=panzer
 name=Panzer
 model=maps/tsukhan/panzer
-acceleration=0.5
-maxspeed=2.5
-turnspeed=25
 jumpdrive=yes
+
 price=750000
+
 cargo=615
-; ---- maximal width ------------------------|
-info=The 'Panzer'-class Tsu-Khan destroyer
-info=is a recent design with the hopes of
-info=getting the best of both worlds from
-info=frigates and capital ships. It has an
-info=exceptional turn rate of a frigate, with 
-info=the beam cannon of a capital ship.
+
+info=The 'Panzer'-class Tsu-Khan destroyer is a recent design with the hopes of getting the best of both worlds from frigates and capital ships. It has an exceptional turn rate of a frigate, with the beam cannon of a capital ship.
 
 [ship]
 label=warbringer
 name=Warbringer
 model=maps/tsukhan/warbringer
-acceleration=1.1
-maxspeed=2.6
-turnspeed=20
 jumpdrive=yes
+
 price=600000
+
 cargo=400
-; ---- maximal width ------------------------|
-info=Anticipating a war with an alien race on
-info=the horizon, Tsu-Khan engineers designed
-info=the Warbringer to transport and repair
-info=many different sizes of ship, ranging 
-info=from fighter to frigate. It can carry the
-info=most ships out of all of the Tsu-Khan
-info=capital ships in the fleet. Its primary
-info=use is to give fighters jump capability.
-info=A warbringer can jump to any star system
-info=and deploy fighters to key battles, as
-info=well as repair damaged fighters.
+
+info=Anticipating a war with an alien race on the horizon, Tsu-Khan engineers designed the Warbringer to transport and repair many different sizes of ship, ranging from fighter to frigate. It can carry the most ships out of all of the Tsu-Khan capital ships in the fleet. Its primary use is to give fighters jump capability.
+info=
+info=A warbringer can jump to any star system and deploy fighters to key battles, as well as repair damaged fighters.
 
 [ship]
 label=camel
 name=Camel
 model=maps/tsukhan/camel
-acceleration=1
-maxspeed=2.7
-turnspeed=30
 jumpdrive=yes
-cargo=850
+
 price=575000
-; ---- maximal width ------------------------|
-info=The Tsu-Khan Camel is the main work-
-info=horse of the fleet and is used mainly to
-info=transfer slaves and prisoners, as well
-info=as food to distant Tsu-Khan occupied
-info=star systems.
+
+cargo=850
+
+info=The Tsu-Khan Camel is the main workhorse of the fleet and is used mainly to transfer slaves and prisoners, as well as food to distant Tsu-Khan occupied star systems.
 info=
-info=The original Camels were used to
-info=transport the remaining Tsu-Khan
-info=population to their new home around the
-info=moon. Some of the original Camels are
-info=still in use.
+info=The original Camels were used to transport the remaining Tsu-Khan population to their new home around the moon. Some of the original Camels are still in use.
 
 [ship]
 label=obliterator
 name=Obliterator
 model=maps/tsukhan/obliterator
-acceleration=1
-maxspeed=2.5
-turnspeed=30
-cargo=50
+
 price=50000
-; ---- maximal width ------------------------|
-info=The Tsu-Khan 'Obliterator' bomber is
-info=most effective against frigates and
-info=other large slow-moving ships. It has a
-info=large torpedo bank for repeated bombing
-info=of vulnerable ships.
+
+cargo=50
+
+
+info=The Tsu-Khan 'Obliterator' bomber is most effective against frigates and other large slow-moving ships. It has a large torpedo bank for repeated bombing of vulnerable ships.
 info=
-info=The Obliterator bomber was used on the
-info=remaining opposition on Kiana Prime
-info=during the Tsu-Khan Exodus.
+info=The Obliterator bomber was used on the remaining opposition on Kiana Prime during the Tsu-Khan Exodus.
 
 [ship]
 label=ravager
 name=Ravager
 model=maps/tsukhan/ravager
-turnspeed=10
-maxspeed=2.25
 jumpdrive=yes
-cargo=25000
+
 price=17500000
-; ---- maximal width ------------------------|
-info=The Ravager is the main heavy assault
-info=ship of the Tsu-Khan fleet.
+
+cargo=25000
+
+info=The Ravager is the main heavy assault ship of the Tsu-Khan fleet.
 info=
-info=It is based upon the original heavy
-info=cruiser design that was used to win the
-info=Kuu-Saar 500-year civil war.
+info=It is based upon the original heavy cruiser design that was used to win the Kuu-Saar 500-year civil war.
 
 ; ------------------------------------------------------------------ ;
 ;		PIRATES
@@ -497,56 +456,69 @@ info=Kuu-Saar 500-year civil war.
 label=raider
 name=Raider
 model=maps/pirate/raider
-acceleration=2.5
-maxspeed=3.5
-turnspeed=60
 jumpdrive=no
-cargo=5
+
 price=12500
-; ---- maximal width ------------------------|
-info=The Raider is the main strike fighter of
-info=various pirate factions. It is cheap to
-info=build and effective in combat versus
-info=lightly defended trade convoys. Many
-info=pirate factions cover the surfaces of
-info=their Raiders with spikes for more
-info=effective ramming and boarding of ships.
+
+cargo=5
+
+info=The Raider is the main strike fighter of various pirate factions. It is cheap to build and effective in combat versus lightly defended trade convoys.
+info=Many pirate factions cover the surfaces of their Raiders with spikes for more effective ramming and boarding of ships.
 
 [ship]
 label=juggernaut
 name=Juggernaut
 model=maps/pirate/juggernaut
-acceleration=0.5
-maxspeed=2.5
-turnspeed=20
 jumpdrive=yes
+dock=yes
+
 price=1500000
+
 cargo=7000
-; ---- maximal width ------------------------|
-info=The pirate Juggernaut is a flying 
-info=fortress designed to serve as support 
-info=carrier during raids on large ships
-info=and small space stations. The Juggernaut
-info=has a lower turning speed compared to
-info=other capital ships. However, it has the
-info=largest array of guns, allowing for a
-info=deadly assault when in position.
+
+info=The pirate Juggernaut is a flying fortress designed to serve as support carrier during raids on large ships and small space stations. 
+info=The Juggernaut has a lower turning speed compared to other capital ships. However, it has a large array of guns, allowing for a deadly assault when in position.
+
+; ------------------------------------------------------------------ ;
+; 		MINERS
+; ------------------------------------------------------------------ ;
+
+
+[ship]
+label=miningcruiser
+name=Mining Cruiser
+model=maps/miners/cruiser
+jumpdrive=yes
+dock=yes
+
+price=800000
+
+cargo=1000
+
+[ship]
+label=miningfreighter
+name=Mining Freighter
+model=maps/miners/freighter
+jumpdrive=no
+
+price=100000
+
+cargo=160
 
 ; ------------------------------------------------------------------ ;
-; 		NO FACTION(yet) or DERELICT
+; 		NO FACTION or DERELICT
 ; ------------------------------------------------------------------ ;
 
 [ship]
 label=hades
 name=Hades
 model=maps/derelict/hades
-acceleration=0.45
-maxspeed=2.75
-turnspeed=10
 jumpdrive=yes
-cargo=6000
+
 price=2000000
-; ---- maximal width ------------------------|
+
+cargo=6000
+
 info=^1CLASSIFIED^N
 info=
 info=For authorized personnel only.
@@ -555,51 +527,24 @@ info=For authorized personnel only.
 label=ares
 name=Ares
 model=maps/derelict/ares
-acceleration=0.50
-maxspeed=2.70
-turnspeed=10
 jumpdrive=yes
-cargo=10000
+
 price=2750000
-; ---- maximal width ------------------------|
+
+cargo=10000
+
 info=^1CLASSIFIED^N
 info=
 info=For authorized personnel only.
 
-[ship]
-label=miningcruiser
-name=Mining Cruiser
-model=maps/miners/cruiser
-acceleration=0.50
-maxspeed=2.70
-turnspeed=10
-jumpdrive=yes
-cargo=1000
-price=800000
-; ---- maximal width ------------------------|
-info=
-
-[ship]
-label=miningfreighter
-name=Mining Freighter
-model=maps/miners/freighter
-acceleration=0.75
-maxspeed=2.0
-turnspeed=15
-jumpdrive=no
-cargo=160
-price=100000
-
-; Test ship - model does not exist
+; ------------------------------------------------------------------ ;
+; 		TESTS
+; ------------------------------------------------------------------ ;
 
 [ship]
 label=unknown
 name=Unknown
 model=unknown
-turnspeed=75
-maxspeed=3
 jumpdrive=yes
-; ---- maximal width ------------------------|
-info=This ship is intended to test engine
-info=behaviour on ships without model.
 
+info=This ship is intended to test engine behaviour on ships with invalid model names.