docking, join menu

6 files changed, 50 insertions, 1 deletions

diff --git a/base/ini/menus/join.ini b/base/ini/menus/join.ini
new file mode 100644
index 0000000..93ba9d1
--- /dev/null
+++ b/base/ini/menus/join.ini
@@ -0,0 +1,30 @@
+;
+; join.ini
+; join menu
+;
+
+[menu]
+; background bitmap
+;background=banner
+; width of a menu element
+elementwidth=256
+; height of a menu element
+elementheight=48
+; margin between menu elements
+elementmargin=16
+
+[label]
+text=Project::OSiRiON
+
+[button]
+text=Join
+; note: we use comma as command seperator in .ini files.
+command=join, menu hide
+
+[button]
+text=Disconnect
+command=disconnect
+
+[button]
+text=Game menu
+command=menu game
diff --git a/base/ini/ui.ini b/base/ini/ui.ini
index c3458bf..9df2b74 100644
--- a/base/ini/ui.ini
+++ b/base/ini/ui.ini
@@ -10,6 +10,8 @@ menu=main
 menu=options
 ; game menu
 menu=game
+; join menu
+menu=join
 
 [colors]
 ; global foreground color rgb
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index b35c3b2..57cbde5 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -46,6 +46,8 @@ radius=64
 pitch=15
 ; [float] rotation speed, in degrees per second
 rotationspeed=1
+; this is a dockable entity
+dock=yes
 
 [navpoint]
 label=navpoint_solar
@@ -63,6 +65,8 @@ color=222 192 145
 colorsecond=.5 .4 .4
 direction=135
 model=stations/cantor
+; this is a dockable entity
+dock=yes
 
 ;
 ; GHANT JUMPGATE
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 67d5928..97c2777 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -25,6 +25,9 @@ colorsecond=0.7 0.8 0.95
 location=-32 0 2
 direction=30
 model=stations/ensor
+; this entity is the default zone view
+default = yes
+dock = yes
 
 ;
 ; DOVER JUMPGATE
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index d5d403d..1d51497 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -24,6 +24,8 @@ label=navpoint_origin
 name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
+; this entity is the default zone view
+;default = yes
 
 ;
 ; STAR
@@ -75,7 +77,9 @@ location=-192 -704 32
 ; [r g b] entity primary color, values in the 0-255 range
 color=222 192 145
 ; [float] axis direction, in degrees
-direction=315
+direction=45
+; this is a dockable entity
+dock=yes
 
 [entity]
 label=custodian
@@ -84,6 +88,8 @@ model=ships/custodian
 location=-196 -694 32
 direction=310
 color=222 192 145
+; this is a dockable entity
+dock=yes
 
 ;
 ; PLANET SEYMOUR
@@ -111,6 +117,8 @@ name=Regula station
 model=stations/regula
 location=-128 928 -32
 color=0.4 0.7 0
+; this is a dockable entity
+dock=yes
 
 [entity]
 label=regula_storage
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index d895d46..33e3004 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -57,6 +57,8 @@ location=500 672 18
 color=0.5 0.1 0.1
 direction=250
 pitch=0
+; this is a dockable entity
+dock=yes
 
 ;
 ; STATION 15