10 files changed, 90 insertions, 36 deletions

diff --git a/base/ini/zones/anara/galileo_outpost.ini b/base/ini/zones/anara/galileo_outpost.ini
new file mode 100644
index 0000000..89d7cd7
--- /dev/null
+++ b/base/ini/zones/anara/galileo_outpost.ini
@@ -0,0 +1,10 @@
+;
+; anara/galileo_outpost.ini
+; Galileo Outpost menus
+
+;
+; ship dealer
+
+[dealer]
+ship=shootingstar
+ship=jupiter
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 0cc45fd..d7dc1bf 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -41,6 +41,7 @@ color=158 0 255
 label=navpoint_south
 name=Navigation point South
 location=-1024 256 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_ghant
@@ -58,6 +59,7 @@ direction=0
 label=navpoint_north
 name=Navigation point North
 location=996 -256 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_dover
@@ -75,10 +77,12 @@ direction=300
 label=navpoint_west
 name=Navigation point West
 location=256 1024 16
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_anara
 name=Jumpgate Antwerp -> Anara
+model=pirate/jumpgate
 target=anara:jumpgate_antwerp
 color=158 0 255
 location=384 1056 16
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 0d1883a..1e666eb 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -56,6 +56,7 @@ dock=yes
 label=navpoint_solar
 name=Navigation point Solar
 location=-242 0 16
+model=static/navpoint
 
 ;
 ; CANTOR STATION
@@ -76,6 +77,7 @@ model=colonial/cantor
 label=navpoint_west
 name=Navigation point West
 location=-512 792 128
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_ghant
@@ -93,6 +95,7 @@ color=222 192 145
 label=navpoint_east
 name=Navigation point East
 location=768 -256 -8
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_eastend
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index 8f2289b..6734478 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -19,6 +19,8 @@ label=navpoint_origin
 name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
+; [path] path to model
+model=static/navpoint
 
 ;
 ; STAR
diff --git a/base/ini/zones/dover.ini b/base/ini/zones/dover.ini
index 4c7a50a..ef66edd 100644
--- a/base/ini/zones/dover.ini
+++ b/base/ini/zones/dover.ini
@@ -19,6 +19,8 @@ label=navpoint_origin
 name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
+; [path] path to model
+model=static/navpoint
 
 ;
 ; STAR
@@ -37,6 +39,7 @@ radius=112
 label=navpoint_north
 name=Navigation point North
 location=504 0 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_lindblade
@@ -54,6 +57,7 @@ direction=180
 label=navpoint_east
 name=Navigation point East
 location=0 -504 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_eastend
@@ -71,6 +75,7 @@ direction=90
 label=navpoint_west
 name=Navigation point West
 location=-32 496 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_antwerp
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 92996df..3337111 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -15,6 +15,7 @@ sky=sky31
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
+model=static/navpoint
 
 ;
 ; ENSOR STATION
@@ -37,6 +38,7 @@ default = yes
 label=navpoint_north
 name=Navigation point North
 location=504 0 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_dover
@@ -55,6 +57,7 @@ direction=270
 label=navpoint_south
 name=Navigation point South
 location=-504 0 0
+model=static/navpoint
 
 [jumpgate]
 label=jumpgate_brogha
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index e4a6aac..f12bfdc 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -17,6 +17,7 @@ sky=sky36
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
+model=static/navpoint
 
 ; 
 ; STAR
diff --git a/base/ini/zones/race.ini b/base/ini/zones/race.ini
index cae5ed7..1861ea4 100644
--- a/base/ini/zones/race.ini
+++ b/base/ini/zones/race.ini
@@ -5,6 +5,7 @@ name=Race Track system
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
+model=static/navpoint
 
 [racetrack]
 label=racetrack
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 7131760..dfa0abf 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -5,6 +5,7 @@ name=Unknown system
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
+model=static/navpoint
 
 [entity]
 label=vector
diff --git a/base/maps/static/navpoint.map b/base/maps/static/navpoint.map
index 936eee2..9b935fc 100644
--- a/base/maps/static/navpoint.map
+++ b/base/maps/static/navpoint.map
@@ -22,11 +22,11 @@
 }
 // brush 2
 {
-( 8 -48 -16 ) ( -8 -48 16 ) ( 8 -48 16 ) colors/red 0 0 0 1 1 0 1 0
-( 64 -16 8 ) ( -64 -48 4 ) ( -64 -16 8 ) colors/red 0 0 0 1 1 0 1 0
-( 64 -48 -4 ) ( -64 -16 -8 ) ( -64 -48 -4 ) colors/red 0 0 0 1 1 0 1 0
-( 4 -48 64 ) ( 8 -16 -64 ) ( 4 -48 -64 ) colors/red 0 0 0 1 1 0 1 0
-( -8 -16 64 ) ( -4 -48 -64 ) ( -8 -16 -64 ) colors/red 0 0 0 1 1 0 1 0
+( 8 -48 -16 ) ( -8 -48 16 ) ( 8 -48 16 ) colors/white 0 0 0 1 1 0 1 0
+( 64 -16 8 ) ( -64 -48 4 ) ( -64 -16 8 ) colors/white 0 0 0 1 1 0 1 0
+( 64 -48 -4 ) ( -64 -16 -8 ) ( -64 -48 -4 ) colors/white 0 0 0 1 1 0 1 0
+( 4 -48 64 ) ( 8 -16 -64 ) ( 4 -48 -64 ) colors/white 0 0 0 1 1 0 1 0
+( -8 -16 64 ) ( -4 -48 -64 ) ( -8 -16 -64 ) colors/white 0 0 0 1 1 0 1 0
 ( -64 -40 4 ) ( -64 -40 -2 ) ( 64 -40 4 ) common/caulk 0 0 0 1 1
 }
 // brush 3
@@ -41,23 +41,23 @@
 // brush 4
 {
 ( 2 -16 -114 ) ( -2 -16 -114 ) ( 2 16 -114 ) common/caulk 0 0 0 1 1
-( 2 -16 -114 ) ( 2 16 -114 ) ( 2 -16 -118 ) colors/red 0 0 0 1 1 0 1 0
-( 64 2 -118 ) ( 64 2 -116 ) ( -64 2 -118 ) colors/red 0 0 0 1 1 0 1 0
-( 64 1 -117 ) ( 64 2 -116 ) ( -64 1 -117 ) colors/red 0 0 0 1 1 0 1 0
-( 64 -1 -117 ) ( 64 1 -117 ) ( -64 -1 -117 ) colors/red 0 0 0 1 1 0 1 0
-( 2 1 64 ) ( 1 2 64 ) ( 2 1 -64 ) colors/red 0 0 0 1 1 0 1 0
-( 2 64 -116 ) ( 1 64 -117 ) ( 2 -64 -116 ) colors/red 0 0 0 1 1 0 1 0
-( 2 1 -116 ) ( 1 2 -116 ) ( 1 1 -117 ) colors/red 0 0 0 1 1 0 1 0
-( -2 -16 -118 ) ( -2 16 -114 ) ( -2 -16 -114 ) colors/red 0 0 0 1 1 0 1 0
-( -2 1 -64 ) ( -1 2 64 ) ( -2 1 64 ) colors/red 0 0 0 1 1 0 1 0
-( -2 -64 -116 ) ( -1 64 -117 ) ( -2 64 -116 ) colors/red 0 0 0 1 1 0 1 0
-( -1 1 -117 ) ( -1 2 -116 ) ( -2 1 -116 ) colors/red 0 0 0 1 1 0 1 0
-( -64 -2 -118 ) ( 64 -2 -116 ) ( 64 -2 -118 ) colors/red 0 0 0 1 1 0 1 0
-( -64 -1 -117 ) ( 64 -2 -116 ) ( 64 -1 -117 ) colors/red 0 0 0 1 1 0 1 0
-( 2 -1 -64 ) ( 1 -2 64 ) ( 2 -1 64 ) colors/red 0 0 0 1 1 0 1 0
-( 1 -1 -117 ) ( 1 -2 -116 ) ( 2 -1 -116 ) colors/red 0 0 0 1 1 0 1 0
-( -2 -1 64 ) ( -1 -2 64 ) ( -2 -1 -64 ) colors/red 0 0 0 1 1 0 1 0
-( -2 -1 -116 ) ( -1 -2 -116 ) ( -1 -1 -117 ) colors/red 0 0 0 1 1 0 1 0
+( 2 -16 -114 ) ( 2 16 -114 ) ( 2 -16 -118 ) colors/green 0 0 0 1 1 0 1 0
+( 64 2 -118 ) ( 64 2 -116 ) ( -64 2 -118 ) colors/green 0 0 0 1 1 0 1 0
+( 64 1 -117 ) ( 64 2 -116 ) ( -64 1 -117 ) colors/green 0 0 0 1 1 0 1 0
+( 64 -1 -117 ) ( 64 1 -117 ) ( -64 -1 -117 ) colors/green 0 0 0 1 1 0 1 0
+( 2 1 64 ) ( 1 2 64 ) ( 2 1 -64 ) colors/green 0 0 0 1 1 0 1 0
+( 2 64 -116 ) ( 1 64 -117 ) ( 2 -64 -116 ) colors/green 0 0 0 1 1 0 1 0
+( 2 1 -116 ) ( 1 2 -116 ) ( 1 1 -117 ) colors/green 0 0 0 1 1 0 1 0
+( -2 -16 -118 ) ( -2 16 -114 ) ( -2 -16 -114 ) colors/green 0 0 0 1 1 0 1 0
+( -2 1 -64 ) ( -1 2 64 ) ( -2 1 64 ) colors/green 0 0 0 1 1 0 1 0
+( -2 -64 -116 ) ( -1 64 -117 ) ( -2 64 -116 ) colors/green 0 0 0 1 1 0 1 0
+( -1 1 -117 ) ( -1 2 -116 ) ( -2 1 -116 ) colors/green 0 0 0 1 1 0 1 0
+( -64 -2 -118 ) ( 64 -2 -116 ) ( 64 -2 -118 ) colors/green 0 0 0 1 1 0 1 0
+( -64 -1 -117 ) ( 64 -2 -116 ) ( 64 -1 -117 ) colors/green 0 0 0 1 1 0 1 0
+( 2 -1 -64 ) ( 1 -2 64 ) ( 2 -1 64 ) colors/green 0 0 0 1 1 0 1 0
+( 1 -1 -117 ) ( 1 -2 -116 ) ( 2 -1 -116 ) colors/green 0 0 0 1 1 0 1 0
+( -2 -1 64 ) ( -1 -2 64 ) ( -2 -1 -64 ) colors/green 0 0 0 1 1 0 1 0
+( -2 -1 -116 ) ( -1 -2 -116 ) ( -1 -1 -117 ) colors/green 0 0 0 1 1 0 1 0
 }
 // brush 5
 {
@@ -120,20 +120,20 @@
 }
 // brush 8
 {
-( 48 -8 16 ) ( 48 8 16 ) ( 48 -8 -16 ) colors/red 0 0 0 1 1 0 1 0
-( 16 64 8 ) ( 48 64 4 ) ( 16 -64 8 ) colors/red 0 0 0 1 1 0 1 0
-( 48 64 -4 ) ( 16 64 -8 ) ( 48 -64 -4 ) colors/red 0 0 0 1 1 0 1 0
-( 48 -4 -64 ) ( 16 -8 -64 ) ( 48 -4 64 ) colors/red 0 0 0 1 1 0 1 0
-( 16 8 -64 ) ( 48 4 -64 ) ( 16 8 64 ) colors/red 0 0 0 1 1 0 1 0
+( 48 -8 16 ) ( 48 8 16 ) ( 48 -8 -16 ) colors/green 0 0 0 1 1 0 1 0
+( 16 64 8 ) ( 48 64 4 ) ( 16 -64 8 ) colors/green 0 0 0 1 1 0 1 0
+( 48 64 -4 ) ( 16 64 -8 ) ( 48 -64 -4 ) colors/green 0 0 0 1 1 0 1 0
+( 48 -4 -64 ) ( 16 -8 -64 ) ( 48 -4 64 ) colors/green 0 0 0 1 1 0 1 0
+( 16 8 -64 ) ( 48 4 -64 ) ( 16 8 64 ) colors/green 0 0 0 1 1 0 1 0
 ( 40 -64 6 ) ( 40 64 2 ) ( 40 64 6 ) common/caulk 0 0 0 1 1
 }
 // brush 9
 {
-( 8 48 16 ) ( -8 48 16 ) ( 8 48 -16 ) colors/red 0 0 0 1 1 0 1 0
-( -64 16 8 ) ( -64 48 4 ) ( 64 16 8 ) colors/red 0 0 0 1 1 0 1 0
-( -64 48 -4 ) ( -64 16 -8 ) ( 64 48 -4 ) colors/red 0 0 0 1 1 0 1 0
-( 4 48 -64 ) ( 8 16 -64 ) ( 4 48 64 ) colors/red 0 0 0 1 1 0 1 0
-( -8 16 -64 ) ( -4 48 -64 ) ( -8 16 64 ) colors/red 0 0 0 1 1 0 1 0
+( 8 48 16 ) ( -8 48 16 ) ( 8 48 -16 ) colors/white 0 0 0 1 1 0 1 0
+( -64 16 8 ) ( -64 48 4 ) ( 64 16 8 ) colors/white 0 0 0 1 1 0 1 0
+( -64 48 -4 ) ( -64 16 -8 ) ( 64 48 -4 ) colors/white 0 0 0 1 1 0 1 0
+( 4 48 -64 ) ( 8 16 -64 ) ( 4 48 64 ) colors/white 0 0 0 1 1 0 1 0
+( -8 16 -64 ) ( -4 48 -64 ) ( -8 16 64 ) colors/white 0 0 0 1 1 0 1 0
 ( 64 40 6 ) ( -64 40 2 ) ( -64 40 6 ) common/caulk 0 0 0 1 1
 }
 // brush 10
@@ -151,21 +151,33 @@
 "classname" "light"
 "origin" "0.000000 -44.000000 0.000000"
 "light" "50"
-"_color" "1 0 0"
+"_color" "1 1 1"
+"spawnflags" "1"
+"offset" "0.25"
+"frequency" "1"
+"time" "0.25"
 }
 // entity 2
 {
 "classname" "light"
 "origin" "0.000000 0.000000 -116.000000"
 "light" "25"
-"_color" "1 0 0"
+"_color" "0 1 0"
+"spawnflags" "1"
+"offset" "0.50"
+"frequency" "1"
+"time" "0.50"
 }
 // entity 3
 {
 "classname" "light"
 "origin" "44.000000 0.000000 0.000000"
 "light" "50"
-"_color" "1 0 0"
+"_color" "0 1 0"
+"spawnflags" "1"
+"offset" "0"
+"frequency" "1"
+"time" "0.25"
 }
 // entity 4
 {
@@ -173,13 +185,21 @@
 "origin" "-44.000000 0.000000 0.000000"
 "light" "50"
 "_color" "1 0 0"
+"spawnflags" "1"
+"offset" "0.50"
+"frequency" "1"
+"time" "0.25"
 }
 // entity 5
 {
 "classname" "light"
 "origin" "0.000000 44.000000 0.000000"
 "light" "50"
-"_color" "1 0 0"
+"_color" "1 1 1"
+"spawnflags" "1"
+"offset" "0.25"
+"frequency" "1"
+"time" "0.25"
 }
 // entity 6
 {
@@ -187,4 +207,8 @@
 "origin" "0.000000 0.000000 116.000000"
 "light" "25"
 "_color" "1 0 0"
+"spawnflags" "1"
+"offset" "0"
+"frequency" "1"
+"time" "0.50"
 }