renamed capital ship template, moved ship model template keys before model keys

2 files changed, 39 insertions, 38 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 0f414bd..84da737 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -14,6 +14,8 @@
 label=vector
 ; name of the ship model
 name=Micron Vector
+; template, defines the ships size class
+template=ship_small
 ; 3d model file name, can be a .map or a .ase file
 model=maps/merchant/vector
 
@@ -41,9 +43,6 @@ turn=2.5
 ; roll power
 ; defines how fast the ship will roll
 roll=1.0
-; ship size template
-; defines what size class the ship is
-template=ship_small
 
 ; info
 ; long lines will be wrapped in-game, empty lines are allowed
@@ -52,8 +51,8 @@ info=Micron Corporation's entry-level model has been a hit sale for many decades
 [ship]
 label=scalar
 name=Micron Scalar
-model=maps/merchant/scalar
 template=ship_small
+model=maps/merchant/scalar
 jumpdrive=yes
 
 price=15000
@@ -75,8 +74,8 @@ info=The Scalar is much more armored than the Vector, with improved VE-1 engines
 [ship]
 label=matrix
 name=Micron Matrix
-model=maps/merchant/matrix
 template=ship_medium
+model=maps/merchant/matrix
 jumpdrive=yes
 
 price=95000
@@ -102,8 +101,8 @@ info=The unprecedented success of the Vector had stimulated the market for cheap
 [ship]
 label=miningcruiser
 name=Mining Cruiser
-model=maps/miners/cruiser
 template=ship_cruiser
+model=maps/miners/cruiser
 jumpdrive=yes
 dock=yes
 
@@ -114,8 +113,8 @@ cargo=1000
 [ship]
 label=miningfreighter
 name=Mining Freighter
-model=maps/miners/freighter
 template=ship_large
+model=maps/miners/freighter
 jumpdrive=no
 
 price=100000
@@ -129,8 +128,8 @@ cargo=160
 [ship]
 label=archer
 name=Archer
-model=maps/mercenary/archer
 template=ship_small
+model=maps/mercenary/archer
 jumpdrive=no
 
 price=20000
@@ -148,8 +147,8 @@ info=Unfortunately, the design revealed several sensor blind spots and as a resu
 [ship]
 label=longbow
 name=Longbow
-model=maps/mercenary/longbow
 template=ship_medium
+model=maps/mercenary/longbow
 jumpdrive=no
 
 price=45000
@@ -166,8 +165,8 @@ info=The replacement for the Archer scout ship. After the first costly mistake,
 [ship]
 label=pod
 name=P.O.D.
-model=maps/mercenary/pod
 template=ship_medium
+model=maps/mercenary/pod
 
 price=15000
 
@@ -187,8 +186,8 @@ info=Although only lightly armed, this fast and nimble ship is perfectly capable
 [ship]
 label=talon
 name=Talon
-model=maps/mercenary/talon
 template=ship_medium
+model=maps/mercenary/talon
 
 price=22500
 
@@ -204,8 +203,8 @@ info=TODO
 [ship]
 label=enforcer
 name=Enforcer
-model=maps/mercenary/enforcer
 template=ship_medium
+model=maps/mercenary/enforcer
 price=45000
 
 cargo=25
@@ -219,8 +218,8 @@ info=TODO
 [ship]
 label=custodian
 name=Custodian
-model=maps/colonial/custodian
 template=ship_battleship
+model=maps/colonial/custodian
 jumpdrive=yes
 dock=yes
 
@@ -239,8 +238,8 @@ info=The Custodian class battleship is the Independent Colonies most valued long
 [ship]
 label=sharkan
 name=Sharkan
-model=maps/colonial/sharkan
 template=ship_small
+model=maps/colonial/sharkan
 
 price=8500
 
@@ -262,8 +261,8 @@ info=The Sharkan is the fastest ship known to exist, which makes it an excellent
 [ship]
 label=betelgeuse
 name=Betelgeuse
-model=maps/independent/betelgeuse
 template=ship_cruiser
+model=maps/independent/betelgeuse
 jumpdrive=yes
 dock=yes
 
@@ -274,8 +273,8 @@ cargo=400
 [ship]
 label=horizon
 name=Horizon
-model=maps/independent/horizon
 template=ship_large
+model=maps/independent/horizon
 
 price=60000
 
@@ -284,8 +283,8 @@ cargo=70
 [ship]
 label=orion
 name=Orion
-model=maps/independent/orion
 template=ship_medium
+model=maps/independent/orion
 price=65000
 
 cargo=80
@@ -295,8 +294,9 @@ info=DEPRICATED
 [ship]
 label=bumblebee
 name=Bumblebee
-model=maps/independent/bumblebee
 template=ship_medium
+model=maps/independent/bumblebee
+
 
 price=50000
 
@@ -305,8 +305,8 @@ cargo=65
 [ship]
 label=jupiter
 name=Jupiter
-model=maps/independent/jupiter
 template=ship_medium
+model=maps/independent/jupiter
 
 price=67500
 
@@ -315,8 +315,8 @@ cargo=55
 [ship]
 label=avenger
 name=Avenger
-model=maps/independent/avenger
 template=ship_small
+model=maps/independent/avenger
 
 price=11500
 
@@ -325,8 +325,8 @@ cargo=5
 [ship]
 label=shootingstar
 name=Shooting Star
-model=maps/independent/shootingstar
 template=ship_medium
+model=maps/independent/shootingstar
 
 price=35000
 
@@ -335,8 +335,9 @@ cargo=30
 [ship]
 label=galaxy
 name=Galaxy
-model=maps/independent/galaxy
 template=ship_large
+model=maps/independent/galaxy
+
 jumpdrive=yes
 
 price=82500
@@ -350,8 +351,8 @@ cargo=120
 [ship]
 label=avatar
 name=Avatar
-model=maps/lindblade/avatar
 template=ship_large
+model=maps/lindblade/avatar
 jumpdrive=yes
 
 price=80000
@@ -361,8 +362,8 @@ cargo=85
 [ship]
 label=supertanker
 name=Supertanker
-model=maps/lindblade/supertanker
 template=ship_cruiser
+model=maps/lindblade/supertanker
 jumpdrive=yes
 
 price=515000
@@ -372,8 +373,8 @@ cargo=685
 [ship]
 label=halcyon
 name=Halcyon
-model=maps/lindblade/halcyon
 template=ship_large
+model=maps/lindblade/halcyon
 jumpdrive=yes
 
 price=515000
@@ -391,8 +392,8 @@ info=For authorized personnel only.
 [ship]
 label=colosus
 name=Colosus
+template=ship_capital
 model=maps/tsukhan/colosus
-template=ship_supercapital
 jumpdrive=yes
 
 price=10000000
@@ -406,8 +407,8 @@ info=For authorized personnel only.
 [ship]
 label=imp
 name=Imp
-model=maps/tsukhan/imp
 template=ship_small
+model=maps/tsukhan/imp
 jumpdrive=no
 
 price=22500
@@ -421,8 +422,8 @@ info = Many Imp pilots carried a single warhead in the tiny cargo bays, and were
 [ship]
 label=inquisitor
 name=Inquisitor
-model=maps/tsukhan/inquisitor
 template=ship_medium
+model=maps/tsukhan/inquisitor
 jumpdrive=no
 
 price=60000
@@ -435,8 +436,8 @@ info=An experimental Interceptor fighter was outfitted with a jump drive after t
 [ship]
 label=panzer
 name=Panzer
-model=maps/tsukhan/panzer
 template=ship_battleship
+model=maps/tsukhan/panzer
 jumpdrive=yes
 
 price=750000
@@ -448,8 +449,8 @@ info=The 'Panzer'-class Tsu-Khan destroyer is a recent design with the hopes of
 [ship]
 label=warbringer
 name=Warbringer
-model=maps/tsukhan/warbringer
 template=ship_cruiser
+model=maps/tsukhan/warbringer
 jumpdrive=yes
 
 price=600000
@@ -463,8 +464,8 @@ info=A warbringer can jump to any star system and deploy fighters to key battles
 [ship]
 label=camel
 name=Camel
-model=maps/tsukhan/camel
 template=ship_large
+model=maps/tsukhan/camel
 jumpdrive=yes
 
 price=575000
@@ -478,8 +479,8 @@ info=The original Camels were used to transport the remaining Tsu-Khan populatio
 [ship]
 label=obliterator
 name=Obliterator
-model=maps/tsukhan/obliterator
 template=ship_medium
+model=maps/tsukhan/obliterator
 
 price=50000
 
@@ -493,8 +494,8 @@ info=The Obliterator bomber was used on the remaining opposition on Kiana Prime
 [ship]
 label=ravager
 name=Ravager
-model=maps/tsukhan/ravager
 template=ship_battleship
+model=maps/tsukhan/ravager
 jumpdrive=yes
 
 price=17500000
@@ -512,8 +513,8 @@ info=It is based upon the original heavy cruiser design that was used to win the
 [ship]
 label=raider
 name=Raider
-model=maps/pirate/raider
 template=ship_medium
+model=maps/pirate/raider
 jumpdrive=no
 
 price=12500
@@ -526,8 +527,8 @@ info=Many pirate factions cover the surfaces of their Raiders with spikes for mo
 [ship]
 label=juggernaut
 name=Juggernaut
-model=maps/pirate/juggernaut
 template=ship_battleship
+model=maps/pirate/juggernaut
 jumpdrive=yes
 dock=yes
 
@@ -545,8 +546,8 @@ info=The Juggernaut has a lower turning speed compared to other capital ships. H
 [ship]
 label=hades
 name=Hades
+template=ship_capital
 model=maps/derelict/hades
-template=ship_supercapital
 jumpdrive=yes
 
 price=2000000
@@ -560,8 +561,8 @@ info=For authorized personnel only.
 [ship]
 label=ares
 name=Ares
+template=ship_capital
 model=maps/derelict/ares
-template=ship_supercapital
 jumpdrive=yes
 
 price=2750000
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index d33b49b..28b8d22 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -36,5 +36,5 @@ label=ship_battleship
 radius=2
 
 [template]
-label=ship_supercapital
+label=ship_capital
 radius=2.5