misc_model support, full model path in ships.ini

1 files changed, 34 insertions, 34 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 1d89401..594b64a 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -13,7 +13,7 @@ label=vector
 ; name of the ship model
 name=Micron Vector
 ; name of the .map file
-model=merchant/vector
+model=maps/merchant/vector
 ; engine acceleration
 acceleration=1.5
 ; maximum speed in game units per second
@@ -36,7 +36,7 @@ info=of outrunning many larger ships.
 [ship]
 label=tensor
 name=Micron Tensor
-model=merchant/tensor
+model=maps/merchant/tensor
 acceleration=1.25
 maxspeed=2.9
 turnspeed=35
@@ -53,7 +53,7 @@ info=the cost of speed and manouverability.
 [ship]
 label=matrix
 name=Micron Matrix
-model=merchant/matrix
+model=maps/merchant/matrix
 acceleration=1.0
 maxspeed=2.8
 turnspeed=30
@@ -70,7 +70,7 @@ cargo=150
 [ship]
 label=pod
 name=P.O.D.
-model=mercenary/pod
+model=maps/mercenary/pod
 acceleration=2.5
 maxspeed=3.6
 turnspeed=60
@@ -82,7 +82,7 @@ info=TODO
 [ship]
 label=archer
 name=Archer
-model=mercenary/archer
+model=maps/mercenary/archer
 acceleration=2.4
 maxspeed=3.7
 turnspeed=60
@@ -94,7 +94,7 @@ info=TODO
 [ship]
 label=longbow
 name=Longbow
-model=mercenary/longbow
+model=maps/mercenary/longbow
 acceleration=2.4
 maxspeed=3.7
 turnspeed=60
@@ -106,7 +106,7 @@ info=TODO
 ;[ship]
 ;label=enforcer
 ;name=Enforcer
-;model=mercenary/enforcer
+;model=maps/mercenary/enforcer
 ;acceleration=2.3
 ;maxspeed=3.5
 ;turnspeed=55
@@ -118,7 +118,7 @@ info=TODO
 [ship]
 label=talon
 name=Talon
-model=mercenary/talon
+model=maps/mercenary/talon
 acceleration=2.6
 maxspeed=3.8
 turnspeed=55
@@ -130,7 +130,7 @@ info=TODO
 [ship]
 label=enforcer
 name=Enforcer
-model=mercenary/enforcer
+model=maps/mercenary/enforcer
 acceleration=2.5
 maxspeed=3.7
 turnspeed=50
@@ -146,7 +146,7 @@ info=TODO
 [ship]
 label=custodian
 name=Custodian
-model=colonial/custodian
+model=maps/colonial/custodian
 acceleration=0.6
 maxspeed=2.5
 turnspeed=20
@@ -155,7 +155,7 @@ jumpdrive=yes
 [ship]
 label=sharkan
 name=Sharkan
-model=colonial/sharkan
+model=maps/colonial/sharkan
 acceleration=2
 maxspeed=4.0
 turnspeed=80
@@ -176,7 +176,7 @@ info=choice for hit and run operations.
 [ship]
 label=betelgeuse
 name=Betelgeuse
-model=independent/betelgeuse
+model=maps/independent/betelgeuse
 acceleration=0.5
 maxspeed=2.25
 turnspeed=5
@@ -185,7 +185,7 @@ jumpdrive=yes
 [ship]
 label=horizon
 name=Horizon
-model=independent/horizon
+model=maps/independent/horizon
 acceleration=1.5
 maxspeed=3.0
 turnspeed=35
@@ -193,7 +193,7 @@ turnspeed=35
 [ship]
 label=orion
 name=Orion
-model=independent/orion
+model=maps/independent/orion
 acceleration=1.5
 maxspeed=3.5
 turnspeed=30
@@ -201,7 +201,7 @@ turnspeed=30
 [ship]
 label=bumblebee
 name=Bumblebee
-model=independent/bumblebee
+model=maps/independent/bumblebee
 acceleration=1.5
 maxspeed=3.5
 turnspeed=30
@@ -209,7 +209,7 @@ turnspeed=30
 [ship]
 label=jupiter
 name=Jupiter
-model=independent/jupiter
+model=maps/independent/jupiter
 acceleration=1.5
 maxspeed=2.5
 turnspeed=10
@@ -217,7 +217,7 @@ turnspeed=10
 [ship]
 label=avenger
 name=Avenger
-model=independent/avenger
+model=maps/independent/avenger
 acceleration=2
 maxspeed=3
 turnspeed=40
@@ -225,7 +225,7 @@ turnspeed=40
 [ship]
 label=shootingstar
 name=Shooting Star
-model=independent/shootingstar
+model=maps/independent/shootingstar
 acceleration=1.8
 maxspeed=3
 turnspeed=30
@@ -233,7 +233,7 @@ turnspeed=30
 [ship]
 label=galaxy
 name=Galaxy
-model=independent/galaxy
+model=maps/independent/galaxy
 acceleration=0.75
 maxspeed=2.0
 turnspeed=15
@@ -246,7 +246,7 @@ jumpdrive=yes
 [ship]
 label=avatar
 name=Avatar
-model=lindblade/avatar
+model=maps/lindblade/avatar
 acceleration=1.2
 maxspeed=3.25
 turnspeed=20
@@ -255,7 +255,7 @@ jumpdrive=yes
 [ship]
 label=supertanker
 name=Supertanker
-model=lindblade/supertanker
+model=maps/lindblade/supertanker
 acceleration=0.5
 maxspeed=2.5
 turnspeed=20
@@ -264,7 +264,7 @@ jumpdrive=yes
 [ship]
 label=halcyon
 name=Halcyon
-model=lindblade/halcyon
+model=maps/lindblade/halcyon
 acceleration=0.6
 maxspeed=2.5
 turnspeed=20
@@ -281,7 +281,7 @@ info=regarding this ship.
 [ship]
 label=heavycruiser
 name=Heavy Cruiser
-model=tsukhan/heavycruiser
+model=maps/tsukhan/heavycruiser
 acceleration=0.65
 maxspeed=2.5
 turnspeed=2.5
@@ -295,7 +295,7 @@ info=regarding this ship.
 [ship]
 label=scout
 name=Scout
-model=tsukhan/scout
+model=maps/tsukhan/scout
 acceleration=1.5
 maxspeed=3.7
 turnspeed=60
@@ -319,7 +319,7 @@ info=important hard-to-kill capital ships.
 [ship]
 label=interceptor
 name=Interceptor
-model=tsukhan/interceptor
+model=maps/tsukhan/interceptor
 acceleration=1.2
 maxspeed=3.5
 turnspeed=50
@@ -341,7 +341,7 @@ info=the Carrier.
 [ship]
 label=destroyer
 name=Destroyer
-model=tsukhan/destroyer
+model=maps/tsukhan/destroyer
 acceleration=0.5
 maxspeed=2.5
 turnspeed=40
@@ -357,7 +357,7 @@ info=the beam cannon of a capital ship.
 [ship]
 label=carrier
 name=Carrier
-model=tsukhan/carrier
+model=maps/tsukhan/carrier
 acceleration=1.1
 maxspeed=2.6
 turnspeed=20
@@ -378,7 +378,7 @@ info=well as repair damaged fighters.
 [ship]
 label=freighter
 name=Freighter
-model=tsukhan/freighter
+model=maps/tsukhan/freighter
 acceleration=1
 maxspeed=2.7
 turnspeed=30
@@ -398,7 +398,7 @@ info=moon.
 [ship]
 label=bomber
 name=Bomber
-model=tsukhan/bomber
+model=maps/tsukhan/bomber
 acceleration=1
 maxspeed=2.5
 turnspeed=30
@@ -416,7 +416,7 @@ info=during the Tsu-Khan Exodus.
 [ship]
 label=ravager
 name=Ravager
-model=tsukhan/ravager
+model=maps/tsukhan/ravager
 turnspeed=25
 maxspeed=2.25
 jumpdrive=yes
@@ -435,7 +435,7 @@ info=Kuu-Saar 500-year civil war.
 [ship]
 label=raider
 name=Raider
-model=pirate/raider
+model=maps/pirate/raider
 acceleration=2.5
 maxspeed=3.5
 turnspeed=60
@@ -454,7 +454,7 @@ info=effective ramming and boarding of ships.
 [ship]
 label=juggernaut
 name=Juggernaut
-model=pirate/juggernaut
+model=maps/pirate/juggernaut
 acceleration=0.5
 maxspeed=2.5
 turnspeed=20
@@ -478,7 +478,7 @@ info=deadly assault when in position.
 [ship]
 label=hades
 name=Hades
-model=derelict/hades
+model=maps/derelict/hades
 acceleration=0.45
 maxspeed=2.75
 turnspeed=10
@@ -492,7 +492,7 @@ info=regarding this ship.
 [ship]
 label=ares
 name=Ares
-model=derelict/ares
+model=maps/derelict/ares
 acceleration=0.50
 maxspeed=2.70
 turnspeed=10