Moved ships inside ships/ dir to their correct dirs.

7 files changed, 34 insertions, 38 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 4aa75bf..29fe7fa 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -96,11 +96,19 @@ turnspeed=30
 [ship]
 label=bumblebee
 name=Bumblebee
-model=ships/bumblebee
+model=independent/bumblebee
 acceleration=1.5
 maxspeed=3.5
 turnspeed=30
 
+[ship]
+label=avenger
+name=Avenger
+model=independent/avenger
+acceleration=2
+maxspeed=3
+turnspeed=40
+
 ; ------------------------------------------------------------------ ;
 ;		LINDBLADE
 ; ------------------------------------------------------------------ ;
@@ -133,7 +141,7 @@ turnspeed=20
 jumpdrive=yes
 
 ; ------------------------------------------------------------------ ;
-;		LINDBLADE
+;		TSU-KHAN
 ; ------------------------------------------------------------------ ;
 
 [ship]
@@ -164,36 +172,10 @@ maxspeed=3.5
 turnspeed=50
 jumpdrive=yes
 
-; ------------------------------------------------------------------ ;
-;		PIRATES
-; ------------------------------------------------------------------ ;
-
-[ship]
-label=raider
-name=Raider
-model=pirate/raider
-acceleration=2.5
-maxspeed=3.5
-turnspeed=60
-jumpdrive=no
-
-[ship]
-label=juggernaut
-name=Juggernaut
-model=pirate/juggernaut
-acceleration=0.5
-maxspeed=2.5
-turnspeed=20
-jumpdrive=yes
-
-;
-;
-
-
 [ship]
 label=destroyer
 name=Destroyer
-model=ships/destroyer
+model=tsukhan/destroyer
 acceleration=0.5
 maxspeed=2.5
 turnspeed=40
@@ -202,7 +184,7 @@ jumpdrive=yes
 [ship]
 label=carrier
 name=Carrier
-model=ships/carrier
+model=tsukhan/carrier
 acceleration=1.1
 maxspeed=2.6
 turnspeed=20
@@ -211,7 +193,7 @@ jumpdrive=yes
 [ship]
 label=freighter
 name=Freighter
-model=ships/freighter
+model=tsukhan/freighter
 acceleration=1
 maxspeed=2.7
 turnspeed=30
@@ -220,18 +202,32 @@ jumpdrive=yes
 [ship]
 label=bomber
 name=Bomber
-model=ships/bomber
+model=tsukhan/bomber
 acceleration=1
 maxspeed=2.5
 turnspeed=30
 
+; ------------------------------------------------------------------ ;
+;		PIRATES
+; ------------------------------------------------------------------ ;
+
 [ship]
-label=avenger
-name=Avenger
-model=ships/avenger
-acceleration=2
-maxspeed=3
-turnspeed=40
+label=raider
+name=Raider
+model=pirate/raider
+acceleration=2.5
+maxspeed=3.5
+turnspeed=60
+jumpdrive=no
+
+[ship]
+label=juggernaut
+name=Juggernaut
+model=pirate/juggernaut
+acceleration=0.5
+maxspeed=2.5
+turnspeed=20
+jumpdrive=yes
 
 ;
 ; Test ship - model does not exist
diff --git a/base/maps/ships/avenger.map b/base/maps/independent/avenger.map
index c01b59d..c01b59d 100644
--- a/base/maps/ships/avenger.map
+++ b/base/maps/independent/avenger.map
diff --git a/base/maps/ships/bumblebee.map b/base/maps/independent/bumblebee.map
index d0f5253..d0f5253 100644
--- a/base/maps/ships/bumblebee.map
+++ b/base/maps/independent/bumblebee.map
diff --git a/base/maps/ships/bomber.map b/base/maps/tsukhan/bomber.map
index 3a194a7..3a194a7 100644
--- a/base/maps/ships/bomber.map
+++ b/base/maps/tsukhan/bomber.map
diff --git a/base/maps/ships/carrier.map b/base/maps/tsukhan/carrier.map
index a0b4357..a0b4357 100644
--- a/base/maps/ships/carrier.map
+++ b/base/maps/tsukhan/carrier.map
diff --git a/base/maps/ships/destroyer.map b/base/maps/tsukhan/destroyer.map
index efe94ed..efe94ed 100644
--- a/base/maps/ships/destroyer.map
+++ b/base/maps/tsukhan/destroyer.map
diff --git a/base/maps/ships/freighter.map b/base/maps/tsukhan/freighter.map
index e78af06..e78af06 100644
--- a/base/maps/ships/freighter.map
+++ b/base/maps/tsukhan/freighter.map