data updates zone support

4 files changed, 209 insertions, 123 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 81523df..a6e6173 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -33,6 +33,7 @@ model=matrix
 acceleration=1.0
 maxspeed=2.8
 turnspeed=0.10
+jumpdrive=yes
 
 [ship]
 label=horizon
@@ -65,6 +66,7 @@ model=custodian
 acceleration=0.6
 maxspeed=2.5
 turnspeed=0.08
+jumpdrive=yes
 
 [ship]
 label=obsidian
@@ -73,6 +75,7 @@ model=obsidian
 acceleration=0.5
 maxspeed=2.5
 turnspeed=0.075
+jumpdrive=yes
 
 [ship]
 label=nebulon
@@ -92,6 +95,7 @@ model=avatar
 acceleration=1.2
 maxspeed=3.25
 turnspeed=0.10
+jumpdrive=yes
 
 [ship]
 label=bumblebee
@@ -116,6 +120,7 @@ model=halcyon
 acceleration=0.6
 maxspeed=2.5
 turnspeed=0.08
+jumpdrive=yes
 
 ;
 ; Odin's ships
@@ -127,4 +132,4 @@ model=heavycruiser
 acceleration=0.65
 maxspeed=2.5
 turnspeed=0.075
-
+jumpdrive=yes
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 3bd5442..297c249 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -1,126 +1,8 @@
 ;
 ; world.ini
-; describes the entities in the game world
+; list of zones in the world
 ;
 
-;
-; ORIGIN
-
-[entity]
-; [string] identification label
-label=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
-location=0 0 0
-; [r g b] entity color, values in the 0-1 range
-color=1 1 0
-
-;
-; STAR
-
-[star]
-label=star
-name=white dwarf
-location=128 -256 0
-; [r g b] entity color, values in the 0-255 range
-color=255 255 255
-
-;
-; PLANET SEYMOUR
-
-[planet]
-label=seymour
-name=planet Seymour
-location=-128 144 8
-; [r g b] entity color, values in the 0-1 range
-color=1 .9 .5
-texture=planets/seymour
-
-;
-; REGULA STATION
-
-[entity]
-label=regula
-name=Regula station
-model=stations/regula
-location=-112 108 8
-color=0.4 0.7 0
-
-[entity]
-label=regula_storage
-name=storage tanks
-model=stations/regula_storage
-location=-106 108 8
-color=0.4 0.7 0
-
-;
-; PLANET GHANT
-
-[planet]
-label=ghant
-name=planet Ghant
-location=-154 -84 16
-color=0.82 0.50 .2
-texture=planets/ghant
-
-;
-; ALEXANDRIA OUTPOST
-
-[entity]
-label=alexandria
-name=Alexandria outpost
-model=stations/alexandria
-location=-116 -68 16
-direction=315
-color=222 192 145
-
-[entity]
-label=custodian
-name=battleship Custodian
-model=ships/custodian
-location=-118 -60 16
-direction=310
-color=222 192 145
-
-;
-; PLANET LINDBLADE
-
-[planet]
-label=lindblade
-name=planet Lindblade
-texture=planets/lindblade
-location=180 92 0
-color=200 0 0
-radius=48
-
-
-;
-; STATION 15
-
-[entity]
-
-label=station15
-name=Station 15
-model=stations/station15
-location=180 32 8
-color=0.5 0.1 0.1
-direction=250
-pitch=0
-
-;
-; IKARUS SATELLITE
-
-[entity]
-label=ikarus
-name=Ikarus satellite
-model=satellites/ikarus
-location=32 0 0
-color=0.4 0.4 0.9
-direction=120
-pitch=15
-
+[world]
+zone=ghant
+zone=lindblade
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
new file mode 100644
index 0000000..7f0b0b4
--- /dev/null
+++ b/base/ini/zones/ghant.ini
@@ -0,0 +1,120 @@
+;
+; ghant.ini
+; world description for the Ghant system
+;
+
+; 
+; ZONE IDENTIFICATION
+
+[zone]
+; [string] zone name
+name=Ghant system
+; [string] sky texture
+sky=sky12
+; this is the default system
+default=yes
+
+;
+; ORIGIN
+
+[entity]
+; [string] identification label
+label=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
+location=0 0 0
+; [r g b] entity color, values in the 0-1 range
+color=1 1 0
+
+;
+; STAR
+
+[star]
+label=star
+name=white dwarf
+location=128 -256 0
+; [r g b] entity color, values in the 0-255 range
+color=255 255 255
+
+;
+; PLANET SEYMOUR
+
+[planet]
+label=seymour
+name=planet Seymour
+location=-128 256 8
+; [r g b] entity color, values in the 0-1 range
+color=1 .9 .5
+texture=planets/seymour
+
+;
+; REGULA STATION
+
+[entity]
+label=regula
+name=Regula station
+model=stations/regula
+location=-112 220 8
+color=0.4 0.7 0
+
+[entity]
+label=regula_storage
+name=storage tanks
+model=stations/regula_storage
+location=-106 220 8
+color=0.4 0.7 0
+
+;
+; PLANET GHANT
+
+[planet]
+label=ghant
+name=planet Ghant
+location=-154 -84 16
+color=0.82 0.50 .2
+texture=planets/ghant
+
+;
+; ALEXANDRIA OUTPOST
+
+[entity]
+label=alexandria
+name=Alexandria outpost
+model=stations/alexandria
+location=-116 -68 16
+direction=315
+color=222 192 145
+
+[entity]
+label=custodian
+name=battleship Custodian
+model=ships/custodian
+location=-118 -60 16
+direction=310
+color=222 192 145
+
+;
+; IKARUS SATELLITE
+
+[entity]
+label=ikarus
+name=Ikarus satellite
+model=satellites/ikarus
+location=32 0 0
+color=0.4 0.4 0.9
+direction=120
+pitch=15
+
+[entity]
+label=inactive_jumpgate
+name=Jumpgate (inactive)
+model=satellites/jumpgate
+location=180 92 0
+direction=180
+color=222 192 145
+colorsecond=1 0 0
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
new file mode 100644
index 0000000..81399f2
--- /dev/null
+++ b/base/ini/zones/lindblade.ini
@@ -0,0 +1,79 @@
+;
+; lindblade.ini
+; world description for the Lindblade system
+;
+
+;
+; ZONE IDENTIFICATION
+
+[zone]
+name=Lindblade system
+;default=no
+
+;
+; ORIGIN
+
+[entity]
+; [string] identification label
+label=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
+location=0 0 0
+; [r g b] entity color, values in the 0-1 range
+color=1 1 0
+
+;
+; STAR
+
+[star]
+label=star
+name=yellow star
+location=128 -256 0
+color=1 .9 .5
+radius=52
+
+;
+; PLANET LINDBLADE
+
+[planet]
+label=lindblade
+name=planet Lindblade
+texture=planets/lindblade
+location=128 324 0
+color=200 0 0
+radius=48
+
+;
+; LINDBLADE CENTRAL
+
+[entity]
+label=linblade_central
+name=Lindblade Central
+model=stations/lindblade_central
+location=148 256 8
+color=0.5 0.1 0.1
+direction=250
+pitch=0
+
+;
+; STATION 15
+[entity]
+label=station15
+name=Station 15
+model=stations/station15
+color=0.5 0.1 0.1
+location=-116 -68 8
+direction=315
+
+; jumpgate
+[entity]
+label=jumpgate
+name=Jumpgate (inactive)
+model=satellites/jumpgate
+color=0.5 0.1 0.1
+location=-116 -100 16