2 files changed, 64 insertions, 113 deletions
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 147aadf..46504bf 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -3,16 +3,23 @@
 ; these are the ships that can be purchased with the 'buy' command
 
 [ship]
+; identification label
+label=vector
+; name of the ship model
 name=Micron Vector
+; name of the .map file
 model=vector
 ; engine acceleration
 acceleration=1.5
 ; maximum speed in game units per second
 maxspeed=3.0
+; rotation speed in rotations/second
 turnspeed=0.20
+; this is the default ship model
 default=yes
 
 [ship]
+label=tensor
 name=Micron Tensor
 model=tensor
 acceleration=1.25
@@ -20,6 +27,7 @@ maxspeed=3.0
 turnspeed=0.15
 
 [ship]
+label=matrix
 name=Micron Matrix
 model=matrix
 acceleration=1.0
@@ -28,6 +36,7 @@ turnspeed=0.10
 
 
 [ship]
+label=canasta
 name=Canasta
 model=canasta
 acceleration=1.25
@@ -35,6 +44,7 @@ maxspeed=3.0
 turnspeed=0.2
 
 [ship]
+label=sharkan
 name=Sharkan
 model=sharkan
 acceleration=2
@@ -42,6 +52,7 @@ maxspeed=4.0
 turnspeed=0.3
 
 [ship]
+label=orion
 name=Orion
 model=orion
 acceleration=1.5
@@ -56,6 +67,7 @@ maxspeed=3.725
 turnspeed=0.15
 
 [ship]
+label=custodian
 name=Custodian
 model=custodian
 acceleration=0.5
@@ -63,9 +75,9 @@ maxspeed=1.5
 turnspeed=0.08
 
 [ship]
+label=obsidian
 name=Obsidian
 model=obsidian
 acceleration=0.4
 maxspeed=1.5
 turnspeed=0.075
-
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 2fa0aec..51ceca7 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -4,44 +4,84 @@
 ; Note: the .ini parser isn't very robust
 
 ;
+; 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]
-name=star: Sabishi Hoshi
+label=star
+name=white dwarf
 location=128 -256 0
-; RGB color, values in the 0-255 range
+; [r g b] entity color, values in the 0-255 range
 color=255 255 255
 
 ;
 ; PLANET SEYMOUR
 
 [planet]
-name=planet: Seymour
+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]
-name=planet: Ghant
+label=ghant
+name=planet Ghant
 location=-154 -84 16
 color=0.82 0.50 .2
 texture=planets/ghant
 
 ;
-; ALEXANDRIA STATION
+; ALEXANDRIA OUTPOST
 
 [entity]
-name=station: Alexandria
+label=alexandria
+name=Alexandria outpost
 model=stations/alexandria
 location=-116 -68 16
 direction=315
 color=222 192 145
 
 [entity]
-name=battleship: Custodian
+label=custodian
+name=deep space carrier Custodian
 model=ships/custodian
 location=-118 -60 16
 direction=310
@@ -51,112 +91,11 @@ color=222 192 145
 ; IKARUS SATELLITE
 
 [entity]
-name=satellite: Ikarus
+label=ikarus
+name=Ikarus satellite
 model=satellites/ikarus
-location=-32 0 0
+location=32 0 0
 color=0.4 0.4 0.9
-direction=30
+direction=120
 pitch=15
 
-;
-; REGULA STATION
-
-[entity]
-name=station: Regula
-model=stations/regula
-location=0 32 0
-color=0.4 0.7 0
-
-;
-; SHIPYARD
-
-[entity]
-name=ship: Canasta
-model=ships/canasta
-location=16 20 0
-color=127 127 1
-direction=-90
-
-[entity]
-name=ship: Canasta
-model=ships/canasta
-location=16.5 20.5 0
-; RGB color, values in the 0-1 range
-color=0.7 0.7 1
-direction=90
-
-[entity]
-name=ship: Micron Vector
-model=ships/vector
-location=17 21 0
-color=1 0.5 0.5
-direction=-90
-
-[entity]
-name=ship: Micron Vector
-model=ships/vector
-location=17.5 21.5 0
-color=1 0.7 0.7
-direction=90
-
-[entity]
-name=ship: Orion
-model=ships/orion
-location=18 22 0
-color=0.5 0.5 1
-direction=-90
-
-[entity]
-name=ship: Orion
-model=ships/orion
-location=18.5 22.5 0
-color=1 0.4 0.7
-direction=90
-
-[entity]
-name=ship: Sharkan
-model=ships/sharkan
-location=18 18 0
-color=0.0 1 0.2
-direction=-90
-
-[entity]
-name=ship: Sharkan
-model=ships/sharkan
-location=18.5 18.5 0
-color=0.0 0.7 0.2
-direction=90
-
-;
-; ORIGIN
-
-[entity]
-name=axis: Galactic Origin
-shape=axis
-radius=1
-location=0 0 0
-color=1 1 0
-
-;
-; TEST
-
-;[entity]
-;name=cube: Borg Cube Green
-;shape=cube
-;radius=1
-;location=24 24 0
-;color=0 255 0
-
-;[entity]
-;name=cube: Borg Cube Red
-;shape=cube
-;radius=1
-;location=16 16 0
-;color=255 0 0
-
-;[entity]
-;name=sphere: The Yellow Sphere
-;shape=sphere
-;radius=1
-;location=0 40 0
-;color=0.8 0.8 0