major reorganization

1 files changed, 56 insertions, 46 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 5a0dfe6..25e1094 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -3,13 +3,17 @@
 ; these are the ships that can be purchased with the 'buy' command
 ;
 
+; ------------------------------------------------------------------ ;
+;		MERCHANT
+; ------------------------------------------------------------------ ;
+
 [ship]
 ; identification label
 label=vector
 ; name of the ship model
 name=Micron Vector
 ; name of the .map file
-model=vector
+model=merchant/vector
 ; engine acceleration
 acceleration=1.5
 ; maximum speed in game units per second
@@ -22,7 +26,7 @@ default=yes
 [ship]
 label=tensor
 name=Micron Tensor
-model=tensor
+model=merchant/tensor
 acceleration=1.25
 maxspeed=2.9
 turnspeed=35
@@ -30,89 +34,90 @@ turnspeed=35
 [ship]
 label=matrix
 name=Micron Matrix
-model=matrix
+model=merchant/matrix
 acceleration=1.0
 maxspeed=2.8
 turnspeed=30
 jumpdrive=yes
 
+; ------------------------------------------------------------------ ;
+;		MERCENARY
+; ------------------------------------------------------------------ ;
+
 [ship]
 label=pod
 name=P.O.D.
-model=pod
+model=mercenary/pod
 acceleration=2.5
 maxspeed=3.6
 turnspeed=60
 
-[ship]
-label=orion
-name=Orion
-model=orion
-acceleration=1.5
-maxspeed=3.5
-turnspeed=30
+; ------------------------------------------------------------------ ;
+;		COLONIAL
+; ------------------------------------------------------------------ ;
 
 [ship]
 label=custodian
 name=Custodian
-model=custodian
+model=colonial/custodian
 acceleration=0.6
 maxspeed=2.5
 turnspeed=20
 jumpdrive=yes
 
 [ship]
-label=obsidian
-name=Obsidian
-model=obsidian
-acceleration=0.5
-maxspeed=2.5
-turnspeed=20
-jumpdrive=yes
+label=sharkan
+name=Sharkan
+model=colonial/sharkan
+acceleration=2
+maxspeed=4.0
+turnspeed=80
 
-;
-; Thorn's ships
+; ------------------------------------------------------------------ ;
+;		INDEPENDENT
+; ------------------------------------------------------------------ ;
 
 [ship]
 label=horizon
 name=Horizon
-model=horizon
+model=independent/horizon
 acceleration=1.5
 maxspeed=3.0
 turnspeed=35
 
 [ship]
-label=sharkan
-name=Sharkan
-model=sharkan
-acceleration=2
-maxspeed=4.0
-turnspeed=80
+label=orion
+name=Orion
+model=independent/orion
+acceleration=1.5
+maxspeed=3.5
+turnspeed=30
 
-;
-; supertanker's ships
+[ship]
+label=bumblebee
+name=Bumblebee
+model=ships/bumblebee
+acceleration=1.5
+maxspeed=3.5
+turnspeed=30
+
+; ------------------------------------------------------------------ ;
+;		LINDBLADE
+; ------------------------------------------------------------------ ;
 
 [ship]
 label=avatar
 name=Avatar
-model=avatar
+model=lindblade/avatar
 acceleration=1.2
 maxspeed=3.25
 turnspeed=20
 jumpdrive=yes
 
 [ship]
-label=bumblebee
-name=Bumblebee
-model=bumblebee
-acceleration=1.5
-maxspeed=3.5
-turnspeed=30
-
-[ship]
 label=supertanker
 name=Supertanker Mk. II
-model=supertanker
+model=lindblade/supertanker
 acceleration=0.5
 maxspeed=2.5
 turnspeed=20
@@ -121,19 +126,20 @@ jumpdrive=yes
 [ship]
 label=halcyon
 name=Halcyon Destroyer
-model=halcyon
+model=lindblade/halcyon
 acceleration=0.6
 maxspeed=2.5
 turnspeed=20
 jumpdrive=yes
 
-;
-; Odin's ships
+; ------------------------------------------------------------------ ;
+;		LINDBLADE
+; ------------------------------------------------------------------ ;
 
 [ship]
 label=heavycruiser
 name=Heavy Cruiser
-model=heavycruiser
+model=tsukhan/heavycruiser
 acceleration=0.65
 maxspeed=2.5
 turnspeed=20
@@ -142,7 +148,7 @@ jumpdrive=yes
 [ship]
 label=scout
 name=Scout
-model=scout
+model=tsukhan/scout
 acceleration=1.5
 maxspeed=3.7
 turnspeed=60
@@ -152,12 +158,16 @@ jumpdrive=no
 [ship]
 label=interceptor
 name=Interceptor
-model=interceptor
+model=tsukhan/interceptor
 acceleration=1.2
 maxspeed=3.5
 turnspeed=50
 jumpdrive=yes
 
+;
+;
+
+
 [ship]
 label=destroyer
 name=Destroyer