From 33328b1ad01307b9a9da91845ff8f277342f2839 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Sun, 17 Apr 2011 04:41:12 +0000
Subject: camel.map: additional detail. decommissioning panzer, warbringer,
 obliterator.

---
 base/ini/ships.ini       | 61 ------------------------------------------------
 base/ini/zones/kiana.ini |  8 ++++++-
 2 files changed, 7 insertions(+), 62 deletions(-)

(limited to 'base/ini')

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 22b59bb..ce524f5 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -684,46 +684,6 @@ roll    = 30
 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
-template=ship_battleship
-model=maps/tsukhan/panzer
-jumpdrive=yes
-
-price=750000
-
-cargo=615
-
-thrust  = 53.8
-impulse = 280
-strafe  = 1.8
-turn    = 30000
-roll    = 5000
-
-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
-template=ship_cruiser
-model=maps/tsukhan/warbringer
-jumpdrive=yes
-
-price=600000
-
-cargo=400
-
-thrust  = 39
-impulse = 200
-strafe  = 2
-turn    = 25000
-roll    = 5000
-
-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
@@ -745,27 +705,6 @@ info=The Tsu-Khan Camel is the main workhorse of the fleet and is used mainly to
 info=
 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
-template=ship_medium
-model=maps/tsukhan/obliterator
-
-price=50000
-
-cargo=50
-
-thrust  = 3.85
-impulse = 20
-strafe  = 0.46
-turn    = 80
-roll    = 30
-
-
-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 remaining opposition on Kiana Prime during the Tsu-Khan Exodus.
-
 [ship]
 label=ravager
 name=Ravager
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index b75c807..0637650 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -56,6 +56,12 @@ default=yes
 	[ship]
 	label=imp
 
+	[ship]
+	label=inquisitor
+
+	[ship]
+	label=camel
+
 	[ship]
 	label=ravager
 
@@ -198,7 +204,7 @@ location=256 16 16
 	label=inquisitor
 
 	[ship]
-	label=obliterator
+	label=camel
 
 [jumpgate]
 label=jumpgate_alphakosiya
-- 
cgit v1.2.3