major reorganization

13 files changed, 144 insertions, 164 deletions

diff --git a/base/ini/intro.ini b/base/ini/intro.ini
index c14e69e..ed70c7d 100644
--- a/base/ini/intro.ini
+++ b/base/ini/intro.ini
@@ -18,18 +18,18 @@ direction=15
 speed=1
 
 ; convoy ships
-ship=matrix
-ship=matrix
-ship=tensor
-ship=tensor
-ship=tensor
-ship=vector
-ship=vector
-ship=vector
-ship=vector
-ship=vector
-ship=vector
-ship=vector
+ship=merchant/matrix
+ship=merchant/matrix
+ship=merchant/tensor
+ship=merchant/tensor
+ship=merchant/tensor
+ship=merchant/vector
+ship=merchant/vector
+ship=merchant/vector
+ship=merchant/vector
+ship=merchant/vector
+ship=merchant/vector
+ship=merchant/vector
 
 [globe]
 label=planet
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
diff --git a/base/ini/world.ini b/base/ini/world.ini
index a599e4a..ba87393 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -8,7 +8,7 @@
 ; borderworld colonies
 zone=ghant
 zone=brogha
-zone=whendune
+zone=antwerp
 
 ; neutral space
 zone=eastend
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 5027b67..4907ae6 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -20,7 +20,7 @@ sky=sky21
 label=star
 ; [string] entity name
 name=class D star
-location=-512 0 0
+location=-768 0 0
 ; [r g b] entity primary color, values in the 0-255 range
 color=255 255 255
 ; [float] entity radius (10 game units == 1km ingame)
@@ -35,7 +35,7 @@ label=brogha
 ; [string] entity name
 name=planet Brogha
 ; [x y x] entity location
-location=512 -464 32
+location=768 -786 32
 ; [r g b] entity primary color, values in the 0-1 range
 color=.7 0.95 0.4
 ; [string] globe texture name
@@ -66,7 +66,7 @@ location=-256 0 32
 color=222 192 145
 colorsecond=.5 .4 .4
 direction=135
-model=stations/cantor
+model=colonial/cantor
 
 ;
 ; GHANT JUMPGATE
@@ -79,26 +79,26 @@ location=-512 792 128
 [jumpgate]
 label=jumpgate_ghant
 name=Jumpgate Brogha -> Ghant
-model=satellites/jumpgate
+model=colonial/jumpgate
 target=ghant:jumpgate_brogha
 location=-512 824 128
 direction=270
 color=222 192 145
 
 ;
-; WHENDUNE JUMPGATE
+; EASTEND JUMPGATE
 
 [navpoint]
 label=navpoint_east
 name=Navigation point East
-location=256 -1000 -2
+location=768 -256 -8
 
 [jumpgate]
-label=jumpgate_whendune
-name=Jumpgate Brogha -> Whendune
-model=satellites/jumpgate
-target=whendune:jumpgate_brogha
-location=256 -1024 0
-direction=90
+label=jumpgate_eastend
+name=Jumpgate Brogha -> East End
+model=colonial/jumpgate
+target=eastend:jumpgate_brogha
+location=780 -256 0
+direction=180
 color=222 192 145
 
diff --git a/base/ini/zones/dover.ini b/base/ini/zones/dover.ini
index 10f2a4c..58050ce 100644
--- a/base/ini/zones/dover.ini
+++ b/base/ini/zones/dover.ini
@@ -41,7 +41,7 @@ location=504 0 0
 [jumpgate]
 label=jumpgate_lindblade
 name=Jumpgate Dover -> Lindblade 
-model=satellites/jumpgate
+model=colonial/jumpgate
 target=lindblade:jumpgate_dover
 color=0.5 0.1 0.1
 location=512 0 0
@@ -58,7 +58,7 @@ location=0 -504 0
 [jumpgate]
 label=jumpgate_eastend
 name=Jumpgate Dover -> East End
-model=satellites/jumpgate
+model=colonial/jumpgate
 target=eastend:jumpgate_dover
 color=0.5 0.1 0.1
 location=0 -512 0
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 11bdd02..92996df 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -24,9 +24,9 @@ label=ensor
 name=Ensor station
 color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95
-location=-32 0 2
+location=-32 32 2
 direction=30
-model=stations/ensor
+model=independent/ensor
 ; this entity is the default zone view
 default = yes
 
@@ -34,34 +34,34 @@ default = yes
 ; DOVER JUMPGATE
 
 [navpoint]
-label=navpoint_west
-name=Navigation point West
-location=0 504 0
+label=navpoint_north
+name=Navigation point North
+location=504 0 0
 
 [jumpgate]
 label=jumpgate_dover
 name=Jumpgate East End -> Dover
-model=satellites/jumpgate
+model=colonial/jumpgate
 target=dover:jumpgate_eastend
 color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95
-location=0 512 0
+location=520 0 0
 direction=270
 
 ;
-; WHENDUNE JUMPGATE
+; BROGHA JUMPGATE
 
 [navpoint]
-label=navpoint_east
-name=Navigation point East
-location=0 -504 0
+label=navpoint_south
+name=Navigation point South
+location=-504 0 0
 
 [jumpgate]
-label=jumpgate_whendune
-name=Jumpgate East End -> Whendune
-model=satellites/jumpgate
-target=whendune:jumpgate_eastend
+label=jumpgate_brogha
+name=Jumpgate East End -> Brogha
+model=colonial/jumpgate
+target=brogha:jumpgate_eastend
 color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95
-location=0 -512 0
-direction=90
+location=-520 0 0
+direction=0
diff --git a/base/ini/zones/eastend/ensor.ini b/base/ini/zones/eastend/ensor.ini
index 4e293cd..428f04c 100644
--- a/base/ini/zones/eastend/ensor.ini
+++ b/base/ini/zones/eastend/ensor.ini
@@ -6,7 +6,4 @@
 ; ship dealer
 
 [dealer]
-ship=tensor
-ship=matrix
-ship=pod
 ship=horizon
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 913705b..c72ea6f 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -71,7 +71,7 @@ label=alexandria
 ; [string] entity name
 name=Alexandria outpost
 ; [string] entity model name
-model=stations/alexandria
+model=colonial/alexandria
 ; [x y x] entity location
 location=-192 -704 32
 ; [r g b] entity primary color, values in the 0-255 range
@@ -112,7 +112,7 @@ radius=68
 [station]
 label=regula
 name=Regula station
-model=stations/regula
+model=colonial/regula
 location=-128 928 -32
 color=0.4 0.7 0
 direction=225
@@ -120,7 +120,7 @@ direction=225
 [entity]
 label=regula_storage
 name=storage tanks
-model=stations/regula_storage
+model=colonial/regula_storage
 location=-122 928 -32
 color=0.4 0.7 0
 
@@ -130,7 +130,7 @@ color=0.4 0.7 0
 [entity]
 label=ikarus
 name=Ikarus satellite
-model=satellites/ikarus
+model=colonial/ikarus
 location=64 0 0
 color=100 100 230
 direction=120
@@ -147,8 +147,20 @@ location=716 -1008 20
 [jumpgate]
 label=jumpgate_brogha
 name=Jumpgate Ghant -> Brogha
-model=satellites/jumpgate
+model=colonial/jumpgate
 target=brogha:jumpgate_ghant
 location=716 -1024 24
 direction=90
 color=222 192 145
+
+;
+; ANTWERP JUMPGATE
+
+[jumpgate]
+label=jumpgate_antwerp
+name=Jumpgate Ghant -> Antwerp
+model=pirate/jumpgate
+target=antwerp:jumpgate_ghant
+location=1024 348 32
+direction=180
+color=222 192 145
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index 1859d6f..e9dba78 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -46,7 +46,7 @@ radius=72
 label=tsukhan_central
 name=Tsu-Khan Central
 location=-128 -64 12
-model=stations/tsukhan_central
+model=tsukhan/tsukhan_central
 
 [planet]
 label=tsukhan_generator
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 72f356f..9e3d4e9 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -50,9 +50,9 @@ radius=72
 ; LINDBLADE CENTRAL
 
 [station]
-label=linblade_central
+label=lindblade_central
 name=Lindblade Central
-model=stations/lindblade_central
+model=lindblade/lindblade_central
 location=500 672 18
 color=0.5 0.1 0.1
 direction=250
@@ -63,7 +63,7 @@ pitch=0
 [station]
 label=station15
 name=Station 15
-model=stations/station15
+model=lindblade/station15
 color=0.5 0.1 0.1
 location=-292 -68 8
 direction=315
@@ -84,7 +84,7 @@ location=-324 -768 12
 [jumpgate]
 label=jumpgate_dover
 name=Jumpgate Lindblade -> Dover
-model=satellites/jumpgate
+model=colonial/jumpgate
 target=dover:jumpgate_lindblade
 color=0.5 0.1 0.1
 location=-332 -768 16
diff --git a/base/ini/zones/lindblade/lindblade_central.ini b/base/ini/zones/lindblade/lindblade_central.ini
new file mode 100644
index 0000000..0d11373
--- /dev/null
+++ b/base/ini/zones/lindblade/lindblade_central.ini
@@ -0,0 +1,11 @@
+;
+; lindblade/lindblade_central.ini
+; Lindblade Central menus
+
+;
+; ship dealer
+
+[dealer]
+ship=halcyon
+ship=avatar
+
diff --git a/base/ini/zones/lindblade/station15.ini b/base/ini/zones/lindblade/station15.ini
new file mode 100644
index 0000000..b19e340
--- /dev/null
+++ b/base/ini/zones/lindblade/station15.ini
@@ -0,0 +1,11 @@
+;
+; lindblade/station15.ini
+; Station 15 menus
+
+;
+; ship dealer
+
+[dealer]
+ship=supertanker
+
+
diff --git a/base/ini/zones/whendune.ini b/base/ini/zones/whendune.ini
deleted file mode 100644
index 296eae4..0000000
--- a/base/ini/zones/whendune.ini
+++ /dev/null
@@ -1,61 +0,0 @@
-;
-; whendune.ini
-; world description for the Ghant system
-;
-
-; 
-; ZONE IDENTIFICATION
-
-[zone]
-; [string] zone name
-name=Whendune system
-; [string] sky texture
-sky=sky35
-
-;
-; STAR
-
-[star]
-; [string] entity label
-label=star
-; [string] entity name
-name=class D star
-location=-512 -512 0
-; [r g b] entity primary color, values in the 0-255 range
-color=248 248 255
-; [float] entity radius (10 game units == 1km ingame)
-radius=88
- 
-;
-; BROGHA JUMPGATE
-
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=0 504 -2
-
-[jumpgate]
-label=jumpgate_brogha
-name=Jumpgate Whendune -> Brogha
-model=satellites/jumpgate
-target=brogha:jumpgate_whendune
-location=0 512 0
-direction=270
-color=222 192 145
-
-;
-; EAST END JUMPGATE
-
-[navpoint]
-label=navpoint_north
-name=Navigation point North
-location=1024 -504 -2
-
-[jumpgate]
-label=jumpgate_eastend
-name=Jumpgate Whendune -> East End
-model=satellites/jumpgate
-target=eastend:jumpgate_whendune
-location=1024 -512 0
-direction=180
-color=222 192 145