From 9a1cde6aadac7a38aecee7b70357fe655faf630c Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 28 Dec 2012 22:36:48 +0000
Subject: Ship model definitions cleanup.

---
 base/ini/ships.ini | 408 +++++++++++++++++++++++++++++------------------------
 1 file changed, 225 insertions(+), 183 deletions(-)

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index a84bbb0..df26cd4 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -9,7 +9,7 @@
 ;		TEMPLATES
 ; ------------------------------------------------------------------ ;
 
-; templates define default settings, like radius
+; templates define default settings like radius
 
 [template]
 label=ship_small
@@ -43,6 +43,8 @@ radius=8
 ;		MERCHANT
 ; ------------------------------------------------------------------ ;
 
+; ---- Micron Vector ----------------------------------------------- ;
+
 [ship]
 ; identification label
 label=vector
@@ -53,35 +55,37 @@ template=ship_small
 ; 3d model file name, can be a .map or a .ase file
 model=maps/merchant/vector
 
-; dealer price
-price=12500
-
-; technical specifications
+; default dealer price
+price	= 12500
 
 ; cargo hold size, 1 is 1 cubic meter
-cargo=25
+cargo	= 25
+; hull armor
+armor	= 100
 
 ; thruster power, maximum thrust speed depends on this
-thrust=1.8
+thrust	= 1.8
 ; impulse engine power
 ; this has to be high enough, otherwise the ship won't be able to reach maximum impulse speed
-impulse=10
+impulse	= 10
 ; strafe power
 ; defines strafe engine and afterburner power
 ; is generally a lot smaller than thrust
-strafe=0.2
+strafe	= 0.2
 ; turn power
 ; defines how fast a ship will turn
-turn=10
+turn	= 10
 ; roll power
 ; defines how fast the ship will roll
-roll=2.5
+roll	= 2.5
 
 ; info
 info=Micron Corporation's entry-level model has been a hit sale for many decades. 
 info=Despite the moderate size of its cargo hold, this ship offers a fast and reliable means of transport,
 info=capable of outrunning many larger ships.
 
+; ---- Micron Scalar ----------------------------------------------- ;
+
 [ship]
 label=scalar
 name=Micron Scalar
@@ -89,10 +93,10 @@ template=ship_small
 model=maps/merchant/scalar
 jumpdrive=no
 
-price=24500
+price	= 24500
 
-; technical specifications
 cargo   = 45
+armor	= 125
 
 thrust  = 1.75
 impulse = 10
@@ -107,6 +111,8 @@ info=
 info=The Scalar has more armor than the Vector, has improved VE-1 engines, and a new XE-1 engine.
 info=These improvements came at the cost of potential cargo space, but it was a welcome addition to established traders.
 
+; ---- Micron Matrix ----------------------------------------------- ;
+
 [ship]
 label=matrix
 name=Micron Matrix
@@ -114,12 +120,10 @@ template=ship_medium
 model=maps/merchant/matrix
 jumpdrive=yes
 
-price=95000
-
-; technical specifications
-cargo=175
+price	= 95000
 
 cargo   = 175
+armor	= 250
 
 thrust  = 3.6
 impulse = 20
@@ -136,25 +140,28 @@ info=with an increased cargo hold at the cost of speed and maneuverability.
 ;		COLONIAL MILITIA
 ; ------------------------------------------------------------------ ;
 
+; ---- Tiger ------------------------------------------------------- ;
+
 [ship]
-; TODO move ship to 'research' faction, make it ship_medium
-;
-label=tyson
-name=Tyson
-template=ship_frigate
-model=maps/colonial/tyson
-jumpdrive=yes
-dock=yes
-price=1800000
-cargo=780
+label=tiger
+name=Tiger
+template=ship_small
+model=maps/colonial/tiger
 
-thrust  = 12
-impulse = 60
-strafe  = 0.8
-turn    = 700
-roll    = 200
+price	= 12500
 
-info=The Tyson-class science vessel is on the forefront of Colonial scientific research.
+cargo	= 10
+armor	= 100
+
+thrust  = 1.9
+impulse = 9.95
+strafe  = 0.3
+turn    = 8
+roll    = 15
+
+info=Known for its speed and maneuverability, the Tiger class interceptor was selected by the Colonial Militia as its primary light figher.
+
+; ---- Custodian --------------------------------------------------- ;
 
 [ship]
 label=custodian
@@ -163,18 +170,23 @@ template=ship_cruiser
 model=maps/colonial/custodian
 jumpdrive=yes
 dock=yes
-price=750000
-cargo=2500
 
-thrust=22
-impulse=200
-strafe=1
-turn=15000
-roll=7000
+price	= 750000
+
+cargo	= 750
+armor	= 1000
+
+thrust	= 22
+impulse	= 200
+strafe	= 1
+turn	= 15000
+roll	= 7000
 
 info=The Custodian-class cruiser is the Independent Colonies most valued long-range fighter carrier. Equipped with a jumpdrive and a sizable launch bay,
 info=this carrier can deploy several wings of fighters to wherever conflict requires a swift resolution.
 
+; ---- Goliath ----------------------------------------------------- ;
+
 [ship]
 label=goliath
 name=Goliath
@@ -182,52 +194,25 @@ template=ship_battleship
 model=maps/colonial/goliath
 jumpdrive=yes
 dock=yes
-price=1250000
-cargo=6000
 
-thrust=28
-impulse=280
-strafe=1
-turn=25000
-roll=10000
+price	= 1250000
 
-info=The Goliath-class battleship is the primary assault warship of the Colonial Militia. It is a very old design that continues to stand strong against opposition.
+cargo	= 1200
+armor	= 1500
 
-[ship]
-; TODO retire
-label=sharkan
-name=Sharkan
-template=ship_small
-model=maps/colonial/sharkan
-price=8500
-cargo=5
+thrust	= 28
+impulse	= 280
+strafe	= 1
+turn	= 25000
+roll	=10000
 
-thrust  = 2
-impulse = 10
-strafe  = 0.34
-turn    = 11
-roll    = 8
+info=The Goliath-class battleship is the primary assault warship of the Colonial Militia.
+info=Although aging, its proven design continues to stand strong against opposition.
 
-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.
+; ---- Oldlancer --------------------------------------------------- ;
+; TODO retire or move to different factions
 
 [ship]
-; TODO retire or move to different faction
-label=tiger
-name=Tiger
-template=ship_small
-model=maps/colonial/tiger
-price=13000
-cargo=7
-
-thrust  = 1.9
-impulse = 9.95
-strafe  = 0.3
-turn    = 8
-roll    = 15
-
-[ship]
-; TODO retire or move to different faction
 label=oldlancer
 name=Lancer mkI
 template=ship_small
@@ -245,9 +230,10 @@ roll    = 12
 info=
 info=
 
-[ship]
+; ---- Lancer mark II ---------------------------------------------- ;
 ; TODO retire or move to different faction
-; alternatively, make this the milita's primary fighter
+
+[ship]
 label=lancer
 name=Lancer mkII
 template=ship_medium
@@ -265,18 +251,46 @@ roll    = 60
 info=The 'Lancer mkII' is the primary Colonial strike fighter.
 info=It is built with quad energy cannons standard, and an optional light beam cannon can be mounted to the underside.
 info=
-info=The Mark II is an overhaul of the original design, including a beam cannon mount point for fighting frigates and other small capital ships.
+info=The mark II is an overhaul of the original design, including a beam cannon mount point for fighting frigates and other small capital ships.
 info=It also includes an improved power plant and better handling.
 
+; ------------------------------------------------------------------ ;
+; 		TRAINS
+; ------------------------------------------------------------------ ;
+
+; ---- Galaxy ------------------------------------------------------ ;
+
+[ship]
+label=galaxy
+name=Galaxy
+template=ship_large
+model=maps/independent/galaxy
+jumpdrive=yes
+
+price	= 82500
+
+cargo	= 120
+armor	= 300
+
+thrust  = 7.52
+impulse = 40
+strafe  = 0.8
+turn    = 150
+roll    = 50
+
+; ---- Wagon ------------------------------------------------------- ;
+
 [ship]
-; TODO almost the same ship as the galaxy? move to merchant?
 label=wagon
 name=Wagon
 template=ship_large
 model=maps/colonial/wagon
 jumpdrive=yes
-price=92500
-cargo=160
+
+price	= 118500
+
+cargo	= 160
+armor	= 350
 
 thrust  = 7.64
 impulse = 40
@@ -285,41 +299,36 @@ turn    = 170
 roll    = 55
 
 ; ------------------------------------------------------------------ ;
-; 		JOINT MINERS ASSOCIATION
+; 		RESEARCH
 ; ------------------------------------------------------------------ ;
 
 [ship]
-label=miningcruiser
-name=Mining Cruiser
-template=ship_cruiser
-model=maps/miners/cruiser
+; TODO move ship to 'research' faction
+;
+label=tyson
+name=Tyson
+template=ship_medium
+model=maps/colonial/tyson
 jumpdrive=yes
 dock=yes
 
-price=1000000
-cargo=1000
+price	= 250000
 
-thrust  = 40
-impulse = 200
-strafe  = 2
-turn    = 14000
-roll    = 1400
+cargo	= 100
+armor	= 225
 
-[ship]
-label=miningfreighter
-name=Mining Freighter
-template=ship_large
-model=maps/miners/freighter
-jumpdrive=no
+thrust  = 12
+impulse = 60
+strafe  = 0.8
+turn    = 700
+roll    = 200
 
-price=110000
-cargo=200
+info=The Tyson-class science vessel is on the forefront of Colonial scientific research.
 
-thrust  = 7.8
-impulse = 40
-strafe  = 1
-turn    = 150
-roll    = 14
+
+; ------------------------------------------------------------------ ;
+; 		JOINT MINERS ASSOCIATION
+; ------------------------------------------------------------------ ;
 
 [ship]
 label=miningsurveyer
@@ -328,8 +337,8 @@ template=ship_small
 model=maps/miners/surveyor
 jumpdrive=no
 
-price=11500
-cargo=25
+price	= 11500
+cargo	= 25
 
 thrust  = 1.9
 impulse = 10
@@ -338,38 +347,39 @@ turn    = 4
 roll    = 1.4
 
 [ship]
-; TODO to be retired ?
-label=miningdefender
-name=Mining Defender
-template=ship_small
-model=maps/miners/defender
+label=miningfreighter
+name=Mining Freighter
+template=ship_large
+model=maps/miners/freighter
 jumpdrive=no
 
-price=7000
-cargo=10
+price	= 110000
+cargo	= 200
 
-thrust  = 2.1
-impulse = 10
-strafe  = 0.2
-turn    = 18
-roll    = 8
+thrust  = 7.8
+impulse = 40
+strafe  = 1
+turn    = 150
+roll    = 14
 
 [ship]
-; TODO to be retired ?
-label=miningprotector
-name=Mining Protector
-template=ship_medium
-model=maps/miners/protector
-jumpdrive=no
+label=miningcruiser
+name=Mining Cruiser
+template=ship_cruiser
+model=maps/miners/cruiser
+jumpdrive=yes
+dock=yes
 
-price=14000
-cargo=15
+price	= 1000000
 
-thrust  = 3.9
-impulse = 20
-strafe  = 0.7
-turn    = 106
-roll    = 98
+cargo	= 500
+armor	= 1500
+
+thrust  = 40
+impulse = 200
+strafe  = 2
+turn    = 14000
+roll    = 1400
 
 [ship]
 label=archer
@@ -379,13 +389,15 @@ model=maps/mercenary/archer
 jumpdrive=no
 
 price=20000
-cargo=15
 
-thrust=2.1
-impulse=10
-strafe=0.15
-turn=16
-roll=12
+cargo	= 15
+armor	= 125
+
+thrust	= 2.1
+impulse	= 10
+strafe	= 0.15
+turn	= 16
+roll	= 12
 
 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.
@@ -398,9 +410,10 @@ template=ship_medium
 model=maps/mercenary/longbow
 jumpdrive=no
 
-price=45000
+price	= 45000
 
-cargo=30
+cargo	= 30
+armor	= 250
 
 thrust=4.2
 impulse=25
@@ -410,42 +423,85 @@ roll=92
 
 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 corrected.
 
+
+[ship]
+; TODO to be retired ?
+label=miningdefender
+name=Mining Defender
+template=ship_small
+model=maps/miners/defender
+jumpdrive=no
+
+price=7000
+cargo=10
+
+thrust  = 2.1
+impulse = 10
+strafe  = 0.2
+turn    = 18
+roll    = 8
+
+[ship]
+; TODO to be retired ?
+label=miningprotector
+name=Mining Protector
+template=ship_medium
+model=maps/miners/protector
+jumpdrive=no
+
+price=14000
+cargo=15
+
+thrust  = 3.9
+impulse = 20
+strafe  = 0.7
+turn    = 106
+roll    = 98
+
 ; ------------------------------------------------------------------ ;
 ;		MERCENARY
 ; ------------------------------------------------------------------ ;
 
+; ---- P.O.D. ------------------------------------------------------ ;
+
 [ship]
 label=pod
 name=P.O.D.
-template=ship_medium
+template=ship_small
 model=maps/mercenary/pod
 price=15000
-cargo   = 10
+
+cargo   = 15
+armor	= 75
 
 ; technical specifications
-thrust  = 4
-impulse = 20
-strafe  = 0.8
-turn    = 75
-roll    = 75
+thrust  = 2
+impulse = 10
+strafe  = 0.2
+turn    = 20
+roll    = 20
 
 ; 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=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
 
+; ---- Talon ------------------------------------------------------- ;
 [ship]
 label=talon
 name=Talon
 template=ship_medium
 model=maps/mercenary/talon
-price=22500
-cargo=10
 
-thrust=4.4
-impulse=20
-strafe=0.6
-turn=98
-roll=128
+price	= 22500
+
+cargo	= 25
+armor	= 150
+
+thrust	= 4.4
+impulse	= 20
+strafe	= 0.6
+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.
 info=The Talon was supposedly top secret and was only going to be deployed by the military during extreme situations, but rumor has it that its design was leaked to several large corporations. Somehow, the design was acquired by mercenary groups. Each year, only a handful are built, by hand.
@@ -527,15 +583,16 @@ info=
 info=Originally designed as a pleasure yacht by the Lindblade shipyards, the Bumblebee quickly found a niche among the independent market due to its attractive price. It provides a comfortable compromise between nimble engines and tough armor plating.
 
 [ship]
-; TODO move to colonial militia to replace sharkan?
-;
 label=anansi
 name=Anansi
 template=ship_small
 model=maps/independent/anansi
 jumpdrive=no
-price=11500
-cargo=5
+
+price	= 11500
+
+cargo	= 5
+armor	= 225
 
 thrust  = 2
 impulse = 13
@@ -544,15 +601,16 @@ turn    = 15
 roll    = 15
 
 [ship]
-; TODO move to colonial militia to replace tiger?
-;
 label=iktomi
 name=Iktomi
 template=ship_medium
 model=maps/independent/iktomi
 jumpdrive=no
-price=15000
-cargo=30
+
+price	= 15000
+cargo	= 30
+
+armor	= 300
 
 thrust  = 4
 impulse = 26
@@ -560,22 +618,6 @@ strafe  = 0.92
 turn    = 26
 roll    = 26
 
-[ship]
-; TODO very simimlar to the wagon
-label=galaxy
-name=Galaxy
-template=ship_large
-model=maps/independent/galaxy
-jumpdrive=yes
-price=82500
-cargo=120
-
-thrust  = 7.52
-impulse = 40
-strafe  = 0.8
-turn    = 150
-roll    = 50
-
 ; ------------------------------------------------------------------ ;
 ;		LINDBLADE
 ; ------------------------------------------------------------------ ;
-- 
cgit v1.2.3