From f594e8dc9c2e516b17632e6ed669f8fc3fe44cfb Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 25 Nov 2010 21:26:54 +0000
Subject: Made one corona plain in intro, applied Thorn's
 Merchant-JMA-Mercenary-Colonial engine tweaks patch.

---
 base/ini/intro.ini |  3 +--
 base/ini/ships.ini | 72 ++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 47 insertions(+), 28 deletions(-)

(limited to 'base')

diff --git a/base/ini/intro.ini b/base/ini/intro.ini
index 15dba88..22a73fa 100644
--- a/base/ini/intro.ini
+++ b/base/ini/intro.ini
@@ -122,7 +122,7 @@ name=Star
 color=210 210 255
 radius=64
 location=512 96 128
-corona=default
+corona=plain
 
 ;
 ; LINDBLADE
@@ -165,4 +165,3 @@ color=1 .9 .5
 radius=92
 location=128 32 64
 corona=default
-
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 0a297ed..652ff2f 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -93,11 +93,11 @@ price=15000
 ; technical specifications
 cargo   = 40
 
-thrust  = 1
-impulse = 6
+thrust  = 1.75
+impulse = 10
 strafe  = 0.15
-turn    = 3
-roll    = 1.2
+turn    = 12
+roll    = 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. 
@@ -118,11 +118,11 @@ cargo=175
 
 cargo   = 175
 
-thrust  = 3.7
+thrust  = 3.6
 impulse = 20
 strafe  = 0.5
-turn    = 75
-roll    = 15
+turn    = 62
+roll    = 10
 
 ; 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.
@@ -142,6 +142,12 @@ dock=yes
 price=1500000
 cargo=1000
 
+thrust  = 40
+impulse = 200
+strafe  = 2
+turn    = 14000
+roll    = 1400
+
 [ship]
 label=miningfreighter
 name=Mining Freighter
@@ -152,6 +158,12 @@ jumpdrive=no
 price=100000
 cargo=160
 
+thrust  = 7.8
+impulse = 40
+strafe  = 1
+turn    = 150
+roll    = 14
+
 [ship]
 label=miningsurveyor
 name=Mining Surveyor
@@ -162,6 +174,12 @@ jumpdrive=no
 price=10000
 cargo=5
 
+thrust  = 1.9
+impulse = 10
+strafe  = 0.2
+turn    = 4
+roll    = 1.4
+
 [ship]
 label=archer
 name=Archer
@@ -172,10 +190,10 @@ jumpdrive=no
 price=20000
 cargo=15
 
-thrust=1.4
-impulse=8
+thrust=1.7
+impulse=10
 strafe=0.15
-turn=2
+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.
@@ -190,10 +208,12 @@ jumpdrive=no
 price=45000
 
 cargo=30
-thrust=1.4
-impulse=6
-strafe=0.15
-turn=3
+
+thrust=4
+impulse=25
+strafe=0.4
+turn=35
+roll=15
 
 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.
 
@@ -270,13 +290,13 @@ dock=yes
 price=750000
 cargo=2500
 
-thrust=8
-impulse=15
-strafe=5
-turn=1500
-roll=1000
+thrust=55
+impulse=280
+strafe=3
+turn=25000
+roll=10000
 
-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.
+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
@@ -286,11 +306,11 @@ model=maps/colonial/sharkan
 price=8500
 cargo=5
 
-thrust  = 0.75
-impulse = 3.2
-strafe  = 0.1
-turn    = 2.5
-roll    = 1.2
+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.
@@ -303,7 +323,7 @@ model=maps/colonial/tiger
 price=13000
 cargo=7
 
-thrust  = 1.2
+thrust  = 1.9
 impulse = 9.95
 strafe  = 0.3
 turn    = 5
-- 
cgit v1.2.3