From 2bb99af9a87b2d15268a123d0c0daef38d7dd7a5 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 26 Dec 2012 21:13:19 +0000
Subject: Updated cargo hold ship stats.

---
 base/ini/ships.ini | 347 ++++++++++++++++++++++++++---------------------------
 1 file changed, 173 insertions(+), 174 deletions(-)

(limited to 'base')

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 664e029..a84bbb0 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -59,7 +59,7 @@ price=12500
 ; technical specifications
 
 ; cargo hold size, 1 is 1 cubic meter
-cargo=20
+cargo=25
 
 ; thruster power, maximum thrust speed depends on this
 thrust=1.8
@@ -78,10 +78,8 @@ turn=10
 roll=2.5
 
 ; 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. 
-info=Despite the moderate size of its cargo hold, 
-info=this ship offers a fast and reliable means of transport,
+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.
 
 [ship]
@@ -103,12 +101,11 @@ turn    = 12
 roll    = 2
 
 ; info
-info=Due to rising pirate activity,
-info=the Micron corporation saw a need in the market for more protected transport vessels. 
+info=Due to rising pirate activity, the Micron corporation saw a need in the market for more protected transport vessels. 
 info=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.
-info=These improvements came at the cost of cargo space, but it was a welcome addition to established traders.
+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.
 
 [ship]
 label=matrix
@@ -135,6 +132,158 @@ info=The unprecedented success of the Vector had stimulated the market for cheap
 info=and prompted Micron Corporations to develop the larger Matrix, 
 info=with an increased cargo hold at the cost of speed and maneuverability.
 
+; ------------------------------------------------------------------ ;
+;		COLONIAL MILITIA
+; ------------------------------------------------------------------ ;
+
+[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
+
+thrust  = 12
+impulse = 60
+strafe  = 0.8
+turn    = 700
+roll    = 200
+
+info=The Tyson-class science vessel is on the forefront of Colonial scientific research.
+
+[ship]
+label=custodian
+name=Custodian
+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
+
+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.
+
+[ship]
+label=goliath
+name=Goliath
+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
+
+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.
+
+[ship]
+; TODO retire
+label=sharkan
+name=Sharkan
+template=ship_small
+model=maps/colonial/sharkan
+price=8500
+cargo=5
+
+thrust  = 2
+impulse = 10
+strafe  = 0.34
+turn    = 11
+roll    = 8
+
+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.
+
+[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
+model=maps/colonial/oldlancer
+jumpdrive=no
+price=28000
+cargo=12
+
+thrust  = 1.8
+impulse = 9.95
+strafe  = 0.3
+turn    = 7
+roll    = 12
+
+info=
+info=
+
+[ship]
+; TODO retire or move to different faction
+; alternatively, make this the milita's primary fighter
+label=lancer
+name=Lancer mkII
+template=ship_medium
+model=maps/colonial/lancer
+jumpdrive=no
+price=54000
+cargo=16
+
+thrust  = 4.1
+impulse = 20
+strafe  = 0.3
+turn    = 60
+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=It also includes an improved power plant and better handling.
+
+[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
+
+thrust  = 7.64
+impulse = 40
+strafe  = 0.7
+turn    = 170
+roll    = 55
+
 ; ------------------------------------------------------------------ ;
 ; 		JOINT MINERS ASSOCIATION
 ; ------------------------------------------------------------------ ;
@@ -320,156 +469,6 @@ info=The Enforcer is a classic space combat vessel originally mass-produced by t
 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.
 info=At first glance, the Enforcer has little distinctive features compared to most recent ship designs. However, one feature it has that other ships do not is its innovative engine design. The Enforcer's twin fusion engines are actually fully-fledged impulse drives, which can sustain a nuclear reaction when thrust is lowered significantly. This allows the engine to be used for conventional thrust as well as impulse cruise speed. Unfortunately, this design is not allowed on newer ships because it tends to explode extremely violently when shot down in combat, or otherwise in the event of a failure if extreme caution is not used during running maintenance.
 
-; ------------------------------------------------------------------ ;
-;		COLONIAL MILITIA
-; ------------------------------------------------------------------ ;
-
-[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
-
-thrust  = 12
-impulse = 60
-strafe  = 0.8
-turn    = 700
-roll    = 200
-
-info=The Tyson-class science vessel is on the forefront of Colonial scientific research.
-
-[ship]
-label=custodian
-name=Custodian
-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
-
-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.
-
-[ship]
-label=goliath
-name=Goliath
-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
-
-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.
-
-[ship]
-; TODO retire
-label=sharkan
-name=Sharkan
-template=ship_small
-model=maps/colonial/sharkan
-price=8500
-cargo=5
-
-thrust  = 2
-impulse = 10
-strafe  = 0.34
-turn    = 11
-roll    = 8
-
-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.
-
-[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
-model=maps/colonial/oldlancer
-jumpdrive=no
-price=28000
-cargo=12
-
-thrust  = 1.8
-impulse = 9.95
-strafe  = 0.3
-turn    = 7
-roll    = 12
-
-info=
-info=
-
-[ship]
-; TODO retire or move to different faction
-; alternatively, make this the milita's primary fighter
-label=lancer
-name=Lancer mkII
-template=ship_medium
-model=maps/colonial/lancer
-jumpdrive=no
-price=54000
-cargo=16
-
-thrust  = 4.1
-impulse = 20
-strafe  = 0.3
-turn    = 60
-roll    = 60
-
-info=The 'Lancer mkII' is the primary Colonial strike fighter. 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. It also includes an improved power plant and better handling.
-
-[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
-
-thrust  = 7.64
-impulse = 40
-strafe  = 0.7
-turn    = 170
-roll    = 55
-
 ; ------------------------------------------------------------------ ;
 ;		INDEPENDENT
 ; ------------------------------------------------------------------ ;
@@ -588,7 +587,7 @@ template=ship_small
 model=maps/lindblade/winsor
 jumpdrive=no
 price=14000
-cargo=8
+cargo=15
 
 thrust=2
 impulse=4
@@ -625,7 +624,7 @@ template=ship_large
 model=maps/lindblade/penchant
 jumpdrive=yes
 price=50000
-cargo=20
+cargo=25
 
 thrust  = 11.3
 impulse = 40
@@ -645,7 +644,7 @@ template=ship_cruiser
 model=maps/lindblade/supertanker
 jumpdrive=yes
 price=515000
-cargo=685
+cargo=150
 
 thrust  = 40
 impulse = 200
@@ -663,7 +662,7 @@ template=ship_battleship
 model=maps/lindblade/halcyon
 jumpdrive=yes
 price=515000
-cargo=625
+cargo=250
 
 thrust=55.6
 impulse=280
@@ -685,7 +684,7 @@ name=Dagon DM6LF "Leo" Light Fighter
 template=ship_small
 model=maps/dagon/leo
 price=12000
-cargo=6
+cargo=15
 
 thrust  = 2.0
 impulse = 1.0
@@ -703,7 +702,7 @@ template=ship_medium
 model=maps/dagon/raptor
 jumpdrive=no
 price=60000
-cargo=24
+cargo=30
 
 thrust  = 4.1
 impulse = 20
@@ -721,7 +720,7 @@ template=ship_medium
 model=maps/dagon/gorgon
 jumpdrive=no
 price=54000
-cargo=60
+cargo=50
 
 thrust  = 4.1
 impulse = 20
@@ -739,7 +738,7 @@ template=ship_battleship
 model=maps/dagon/chimera
 jumpdrive=yes
 price=12500000
-cargo=22000
+cargo=350
 
 thrust  = 52
 impulse = 280
@@ -757,7 +756,7 @@ template=ship_cruiser
 model=maps/dagon/jormungandr
 jumpdrive=yes
 price=3500000
-cargo=100000
+cargo=500
 
 thrust  = 25
 impulse = 160
@@ -779,7 +778,7 @@ template=ship_dreadnought
 model=maps/tsukhan/colossus
 jumpdrive=yes
 price=10000000
-cargo=50000
+cargo=1000
 
 thrust=80
 impulse=400
@@ -817,7 +816,7 @@ template=ship_small
 model=maps/tsukhan/drake
 jumpdrive=no
 price=32500
-cargo=25
+cargo=45
 
 thrust  = 1.92
 impulse = 10
@@ -853,7 +852,7 @@ template=ship_large
 model=maps/tsukhan/camel
 jumpdrive=yes
 price=575000
-cargo=850
+cargo=75
 
 thrust  = 7.54
 impulse = 40
@@ -871,7 +870,7 @@ template=ship_battleship
 model=maps/tsukhan/ravager
 jumpdrive=yes
 price=17500000
-cargo=25000
+cargo=250
 
 thrust  = 55.5
 impulse = 280
@@ -893,7 +892,7 @@ template=ship_medium
 model=maps/pirate/raider
 jumpdrive=no
 price=25500
-cargo=5
+cargo=30
 
 thrust  = 3.9
 impulse = 20
@@ -911,7 +910,7 @@ template=ship_large
 model=maps/pirate/jaguar
 jumpdrive=no
 price=35000
-cargo=30
+cargo=50
 
 thrust  = 7.9
 impulse = 40
@@ -950,7 +949,7 @@ model=maps/pirate/juggernaut
 jumpdrive=yes
 dock=yes
 price=1500000
-cargo=7000
+cargo=250
 
 thrust=55.6
 impulse=280
-- 
cgit v1.2.3