2 files changed, 71 insertions, 35 deletions

diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 1d7497d..12919a0 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -11,58 +11,71 @@
 name=Ghant system
 ; [string] sky texture
 sky=sky12
-; this is the default system
+; [bool] this is the default system
 default=yes
 
 ;
 ; ORIGIN
 
-[entity]
-; [string] identification label
-label=origin
+[navpoint]
+; [string] entity label
+label=navpoint_origin
 ; [string] entity name
-name=Galactic origin
-; [string] entity shape (ignored if the entity has a model)
-shape=axis
-; entity radius
-radius=1
-; [x y z] entity location
+name=Navigation point Origin
+; [x y x] entity location
 location=0 0 0
-; [r g b] entity color, values in the 0-1 range
-color=1 1 0
 
 ;
 ; STAR
 
 [star]
+; [string] entity label
 label=star
+; [string] entity name
 name=white dwarf
 location=512 -512 0
-; [r g b] entity color, values in the 0-255 range
+; [r g b] entity primary color, values in the 0-255 range
 color=255 255 255
-radius=96
+; [float] entity radius (10 game units == 1km ingame)
+radius=90
 
 ;
 ; PLANET GHANT
 
 [planet]
+; [string] entity label
 label=ghant
+; [string] entity name
 name=planet Ghant
+; [x y x] entity location
 location=-256 -768 32
+; [r g b] entity primary color, values in the 0-1 range
 color=0.82 0.50 .2
+; [string] globe texture name
 texture=planets/ghant
+; [float] entity radius (10 game units == 1km ingame)
 radius=64
+; [float] axis pitch, in degrees
+pitch=15
+; [float] rotation speed, in degrees per second
+rotationspeed=1
 
 ;
 ; ALEXANDRIA OUTPOST
 
 [entity]
+; [string] entity label
 label=alexandria
+; [string] entity name
 name=Alexandria outpost
+; [string] entity model name
 model=stations/alexandria
+; [x y x] entity location
 location=-192 -704 32
-direction=315
+; [r g b] entity primary color, values in the 0-255 range
 color=222 192 145
+; [float] axis direction, in degrees
+direction=315
 
 [entity]
 label=custodian
@@ -76,12 +89,17 @@ color=222 192 145
 ; PLANET SEYMOUR
 
 [planet]
+; [string] entity label
 label=seymour
+; [string] entity name
 name=planet Seymour
+; [x y x] entity location
 location=-128 1024 -32
 ; [r g b] entity color, values in the 0-1 range
 color=1 .9 .5
+; [string] globe texture name
 texture=planets/seymour
+; [float] entity radius (10 game units == 1km ingame)
 radius=68
 
 ;
@@ -117,7 +135,12 @@ pitch=15
 label=inactive_jumpgate
 name=Jumpgate (inactive)
 model=satellites/jumpgate
-location=768 -1024 0
+location=780 -1024 24
 direction=180
 color=100 100 230
 colorsecond=1 0 0
+
+[navpoint]
+label=navpoint_east
+name=Navigation point East
+location=780 -1024 20
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index bcf331e..546e632 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -14,19 +14,16 @@ sky=sky17
 ;
 ; ORIGIN
 
-[entity]
-; [string] identification label
-label=origin
+;
+; ORIGIN
+
+[navpoint]
+; [string] entity label
+label=navpoint_origin
 ; [string] entity name
-name=Galactic origin
-; [string] entity shape (ignored if the entity has a model)
-shape=axis
-; entity radius
-radius=1
-; [x y z] entity location
+name=Navigation point Origin
+; [x y x] entity location
 location=0 0 0
-; [r g b] entity color, values in the 0-1 range
-color=1 1 0
 
 ;
 ; STAR
@@ -34,9 +31,9 @@ color=1 1 0
 [star]
 label=star
 name=yellow star
-location=128 -256 0
+location=256 -512 0
 color=1 .9 .5
-radius=52
+radius=96
 
 ;
 ; PLANET LINDBLADE
@@ -45,9 +42,12 @@ radius=52
 label=lindblade
 name=planet Lindblade
 texture=planets/lindblade
-location=128 324 0
+location=518 780 16
+direction=90
+pitch=7.5
+rotationspeed=1.5
 color=200 0 0
-radius=48
+radius=72
 
 ;
 ; LINDBLADE CENTRAL
@@ -56,7 +56,7 @@ radius=48
 label=linblade_central
 name=Lindblade Central
 model=stations/lindblade_central
-location=148 256 8
+location=500 672 18
 color=0.5 0.1 0.1
 direction=250
 pitch=0
@@ -68,13 +68,26 @@ label=station15
 name=Station 15
 model=stations/station15
 color=0.5 0.1 0.1
-location=-116 -68 8
+location=-292 -68 8
 direction=315
 
-; jumpgate
+[navpoint]
+label=navpoint_15
+name=Navigation point 15
+location=-290 -60 6
+
+;
+; JUMPGATE
+
 [entity]
 label=jumpgate
 name=Jumpgate (inactive)
 model=satellites/jumpgate
 color=0.5 0.1 0.1
-location=-116 -100 16
+location=-332 -768 16
+direction=90
+
+[navpoint]
+label=navpoint_south
+name=Navigation point South
+location=-324 -768 12