13 files changed, 140 insertions, 158 deletions
diff --git a/base/ini/world.ini b/base/ini/world.ini
index d8d0110..7e4f051 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -4,17 +4,23 @@
 ;
 
 [world]
+
 ; borderworld colonies
 zone=ghant
 zone=brogha
-zone=race
+zone=whendune
+
+; neutral space
+zone=eastend
+
 ; lindblade space
 zone=lindblade
 zone=dover
 zone=burton
-; neutral space
-zone=eastend
+
 ; tsu-khan space
 zone=kiana
 
+; misc systems
+zone=race
 
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 69ecd78..4ad34de 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -1,6 +1,6 @@
 ;
-; ghant.ini
-; world description for the Ghant system
+; brogha.ini
+; world description for the Brogha system
 ;
 
 ; 
@@ -46,7 +46,7 @@ radius=64
 pitch=15
 ; [float] rotation speed, in degrees per second
 rotationspeed=1
-; this is a dockable entity
+; this is a dockable planet
 dock=yes
 
 [navpoint]
@@ -57,7 +57,7 @@ location=-242 0 16
 ;
 ; CANTOR STATION
 
-[entity]
+[station]
 label=cantor
 name=Cantor observatory
 location=-256 0 32
@@ -65,12 +65,15 @@ color=222 192 145
 colorsecond=.5 .4 .4
 direction=135
 model=stations/cantor
-; this is a dockable entity
-dock=yes
 
 ;
 ; GHANT JUMPGATE
 
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=-512 792 128
+
 [jumpgate]
 label=jumpgate_ghant
 name=Jumpgate Brogha -> Ghant
@@ -80,13 +83,20 @@ location=-512 824 128
 direction=270
 color=222 192 145
 
+;
+; WHENDUNE JUMPGATE
+
 [navpoint]
-label=navpoint_west
-name=Navigation point West
-location=-512 792 120
+label=navpoint_east
+name=Navigation point East
+location=256 -756 -2
+
+[jumpgate]
+label=jumpgate_whendune
+name=Jumpgate Brogha -> Whendune
+model=satellites/jumpgate
+target=whendune:jumpgate_brogha
+location=256 -768 0
+direction=90
+color=222 192 145
 
-[jumppoint]
-label=jumppoint_ghant
-name=Jumppoint Brogha -> Ghant
-location=-512 1024 0
-target=ghant:jumppoint_brogha
diff --git a/base/ini/zones/brogha/brogha.ini b/base/ini/zones/brogha/brogha.ini
new file mode 100644
index 0000000..0defa8f
--- /dev/null
+++ b/base/ini/zones/brogha/brogha.ini
@@ -0,0 +1,11 @@
+;
+; brogha/brogha.ini
+; Cantor observatory menus
+
+;
+; ship dealer
+
+[dealer]
+ship=vector
+ship=tensor
+ship=orion
diff --git a/base/ini/zones/brogha/cantor.ini b/base/ini/zones/brogha/cantor.ini
new file mode 100644
index 0000000..536500c
--- /dev/null
+++ b/base/ini/zones/brogha/cantor.ini
@@ -0,0 +1,12 @@
+;
+; brogha/cantor.ini
+; Cantor observatory menus
+
+;
+; ship dealer
+
+[dealer]
+ship=vector
+ship=tensor
+ship=pod
+
diff --git a/base/ini/zones/dover.ini b/base/ini/zones/dover.ini
index 8dabde6..10f2a4c 100644
--- a/base/ini/zones/dover.ini
+++ b/base/ini/zones/dover.ini
@@ -47,11 +47,6 @@ color=0.5 0.1 0.1
 location=512 0 0
 direction=180
 
-[jumppoint]
-label=jumppoint_lindblade
-location=512 0 -8
-target=lindblade:jumppoint_dover
-
 ;
 ; EAST END JUMPGATE
 
@@ -69,7 +64,3 @@ color=0.5 0.1 0.1
 location=0 -512 0
 direction=90
 
-[jumppoint]
-label=jumppoint_eastend
-location=0 -512 -8
-target=eastend:jumppoint_dover
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 8e4cb25..271ec50 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -16,8 +16,10 @@ label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
 
+;
 ; ENSOR STATION
-[entity]
+
+[station]
 label=ensor
 name=Ensor station
 color=0.7 0.7 0.9
@@ -27,7 +29,6 @@ direction=30
 model=stations/ensor
 ; this entity is the default zone view
 default = yes
-dock = yes
 
 ;
 ; DOVER JUMPGATE
@@ -47,7 +48,3 @@ colorsecond=0.7 0.8 0.95
 location=0 512 0
 direction=270
 
-[jumppoint]
-label=jumppoint_dover
-location=0 512 -8
-target=dover:jumppoint_eastend
diff --git a/base/ini/zones/eastend/ensor.ini b/base/ini/zones/eastend/ensor.ini
new file mode 100644
index 0000000..4e293cd
--- /dev/null
+++ b/base/ini/zones/eastend/ensor.ini
@@ -0,0 +1,12 @@
+;
+; eastend/ensor.ini
+; Ensor station menus
+
+;
+; 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 90fa2ed..57256d4 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -65,7 +65,7 @@ rotationspeed=1
 ;
 ; ALEXANDRIA OUTPOST
 
-[entity]
+[station]
 ; [string] entity label
 label=alexandria
 ; [string] entity name
@@ -79,10 +79,9 @@ color=222 192 145
 ; [float] axis direction, in degrees
 direction=45
 ; this is a dockable entity
-dock=yes
 default=yes
 
-[entity]
+[station]
 label=custodian
 name=battleship Custodian
 model=ships/custodian
@@ -90,7 +89,6 @@ location=-196 -694 32
 direction=310
 color=222 192 145
 ; this is a dockable entity
-dock=yes
 
 ;
 ; PLANET SEYMOUR
@@ -112,7 +110,7 @@ radius=68
 ;
 ; REGULA STATION
 
-[entity]
+[station]
 label=regula
 name=Regula station
 model=stations/regula
@@ -141,6 +139,14 @@ color=100 100 230
 direction=120
 pitch=15
 
+;
+; BROGHA JUMPGATE
+
+[navpoint]
+label=navpoint_east
+name=Navigation point East
+location=716 -1008 20
+
 [jumpgate]
 label=jumpgate_brogha
 name=Jumpgate Ghant -> Brogha
@@ -149,14 +155,3 @@ target=brogha:jumpgate_ghant
 location=716 -1024 24
 direction=90
 color=222 192 145
-
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=716 -1008 20
-
-[jumppoint]
-label=jumppoint_brogha
-name=Jumppoint Ghant -> Brogha
-location=715 -1024 0
-target=brogha:jumppoint_ghant
diff --git a/base/ini/zones/ghant/alexandria.ini b/base/ini/zones/ghant/alexandria.ini
index 59ea584..cdff8c4 100644
--- a/base/ini/zones/ghant/alexandria.ini
+++ b/base/ini/zones/ghant/alexandria.ini
@@ -1,47 +1,11 @@
 ;
-; ini/zones/ghant/alexandria.ini
+; ghant/alexandria.ini
 ; Alexandria outpost menus
 
 ;
-; main menu
-
-[menu]
-label=main
-text=Launch bay
-
-[button]
-text=Ship dealer
-command=menu view dealer
-
-[button]
-text=Launch
-command=launch
-
-;
 ; ship dealer
 
-[menu]
-label=dealer
-text=Ship Dealer 
-
-[button]
-text=buy Micron Vector
-command=buy vector
-model=ships/vector
-align=left
-
-[button]
-text=buy Micron Tensor
-command=buy tensor
-model=ships/tensor
-align=left
-
-[button]
-text=buy P.O.D.
-command=buy pod
-model=ships/pod
-align=left
-
-[button]
-text=Return
-command=menu view main
+[dealer]
+ship=vector
+ship=tensor
+ship=pod
diff --git a/base/ini/zones/ghant/custodian.ini b/base/ini/zones/ghant/custodian.ini
index fa18592..e23bad9 100644
--- a/base/ini/zones/ghant/custodian.ini
+++ b/base/ini/zones/ghant/custodian.ini
@@ -1,36 +1,9 @@
- 
 ;
-; ini/zones/ghant/custodian.ini
+; ghant/custodian.ini
 ; battleship Custodian menus
 
 ;
-; main menu
-
-[menu]
-label=main
-text=battleship Custodian
-
-[button]
-text=Ship dealer
-command=menu view dealer
-
-[button]
-text=Launch
-command=launch
-
-;
 ; ship dealer
 
-[menu]
-label=dealer
-text=Ship Dealer 
-
-[button]
-text=buy Sharkan
-command=buy sharkan
-model=ships/sharkan
-align=left
-
-[button]
-text=Return
-command=menu view main
+[dealer]
+ship=sharkan
diff --git a/base/ini/zones/ghant/regula.ini b/base/ini/zones/ghant/regula.ini
index 8596b9b..57f59de 100644
--- a/base/ini/zones/ghant/regula.ini
+++ b/base/ini/zones/ghant/regula.ini
@@ -1,37 +1,9 @@
- 
- 
 ;
-; ini/zones/ghant/regula.ini
+; ghant/regula.ini
 ; Regula station menus
 
 ;
-; main menu
-
-[menu]
-label=main
-text=Launch bay
-
-[button]
-text=Ship Dealer
-command=menu view dealer
-
-[button]
-text=Launch
-command=launch
-
-;
 ; ship dealer
 
-[menu]
-label=dealer
-text=Ship dealer 
-
-[button]
-text=buy Micron Vector
-command=buy vector
-model=ships/vector
-align=left
-
-[button]
-text=Return
-command=menu view main
+[dealer]
+ship=vector
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index e20e69d..72f356f 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -49,7 +49,7 @@ radius=72
 ;
 ; LINDBLADE CENTRAL
 
-[entity]
+[station]
 label=linblade_central
 name=Lindblade Central
 model=stations/lindblade_central
@@ -57,12 +57,10 @@ location=500 672 18
 color=0.5 0.1 0.1
 direction=250
 pitch=0
-; this is a dockable entity
-dock=yes
 
 ;
 ; STATION 15
-[entity]
+[station]
 label=station15
 name=Station 15
 model=stations/station15
@@ -92,7 +90,3 @@ color=0.5 0.1 0.1
 location=-332 -768 16
 direction=90
 
-[jumppoint]
-label=jumppoint_dover
-location=-332 -768 8
-target=dover:jumppoint_lindblade
diff --git a/base/ini/zones/whendune.ini b/base/ini/zones/whendune.ini
new file mode 100644
index 0000000..e9d9dff
--- /dev/null
+++ b/base/ini/zones/whendune.ini
@@ -0,0 +1,45 @@
+;
+; whendune.ini
+; world description for the Ghant system
+;
+
+; 
+; ZONE IDENTIFICATION
+
+[zone]
+; [string] zone name
+name=Whendune system
+; [string] sky texture
+;sky=
+
+;
+; 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
+