added finnmark, karelia and albion systems.

9 files changed, 219 insertions, 35 deletions

diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
new file mode 100644
index 0000000..0716560
--- /dev/null
+++ b/base/ini/zones/albion.ini
@@ -0,0 +1,31 @@
+;
+; albion.ini
+; world description for the Albion system
+;
+
+; ------------------------------------------------------------------ 
+; ZONE IDENTIFICATION
+
+[zone]
+name=Albion system
+
+
+; ------------------------------------------------------------------ 
+; ANARA JUMPGATE
+
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=256 1024 16
+model=maps/static/navpoint
+color=0.5 0.1 0.1
+
+[jumpgate]
+label=jumpgate_anara
+name=Jumpgate Albion -> Anara
+model=maps/pirate/jumpgate
+target=anara:jumpgate_albion
+color=0.5 0.1 0.1
+location=384 1056 16
+direction=300
+info=Jumpgate to the Anara system.
\ No newline at end of file
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index 04f6d11..300aeae 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -98,21 +98,38 @@ name=Safety Buoy
 location=128 512 0
 model=maps/static/navpoint
 
-;
-; ANTWERP JUMPGATE
+; ------------------------------------------------------------------ 
+; ALBION JUMPGATE
 
 [navpoint]
-label=navpoint_south
-name=Navigation Point South
+label=navpoint_east
+name=Navigation Point East
 location=128 -768 0
 model=maps/static/navpoint
 
 [jumpgate]
-label=jumpgate_antwerp
-name=Jumpgate Anara -> Antwerp
+label=jumpgate_albion
+name=Jumpgate Anara -> Albion
 model=maps/colonial/jumpgate
-target=antwerp:jumpgate_anara
+target=albion:jumpgate_anara
 color=106 95 87
 colorsecond=152 166 169
 location=120 -760 0
 direction=95
+info=Jumpgate to the Albion system.
+
+; ------------------------------------------------------------------ 
+; KARELIA JUMPPOINT
+
+[navpoint]
+label=navpoint_south
+name=Navigation Point South
+location=-512 0 -64
+model=maps/static/navpoint
+
+[jumppoint]
+label=jumppoint_karelia
+name=Jumppoint Anara -> Karelia
+target=karelia:jumppoint_anara
+location=-524 0 64
+info=Jumppoint to the Karelia system.
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index bef5f06..5872a53 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -17,7 +17,7 @@ sky=sky35
 ; [string] entity label
 label=star
 ; [string] entity name
-name=class D star
+name=class O star
 location=256 -1512 0
 ; [r g b] entity primary color, values in the 0-255 range
 color=248 248 255
@@ -43,7 +43,7 @@ colorsecond=0 1 0
 
 	[cargo]
 	label=liquor
-	price=450
+	price=425
 	amount=0
 
 ; ------------------------------------------------------------------ 
@@ -86,7 +86,8 @@ label=jumpgate_ghant
 name=Jumpgate Antwerp -> Ghant
 model=maps/pirate/jumpgate
 target=ghant:jumpgate_antwerp
-color=158 0 255
+color=222 192 145
+colorsecond=160 160 160
 location=-1048 256 8
 direction=0
 
@@ -104,12 +105,13 @@ label=jumpgate_dover
 name=Jumpgate Antwerp -> Dover
 model=maps/pirate/jumpgate
 target=dover:jumpgate_antwerp
-color=158 0 255
+color=222 192 145
+colorsecond=160 160 160
 location=1024 -302 0
 direction=300
 
 ; ------------------------------------------------------------------ 
-; ANARA JUMPGATE
+; FINNMARK JUMPGATE
 
 [navpoint]
 label=navpoint_west
@@ -118,10 +120,11 @@ location=256 1024 16
 model=maps/static/navpoint
 
 [jumpgate]
-label=jumpgate_anara
-name=Jumpgate Antwerp -> Anara
+label=jumpgate_finnmark
+name=Jumpgate Antwerp -> Finnmark
 model=maps/pirate/jumpgate
-target=anara:jumpgate_antwerp
-color=158 0 255
+target=finnmark:jumpgate_antwerp
+color=222 192 145
+colorsecond=160 160 160
 location=384 1056 16
-direction=300
+direction=275
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index db5e3e9..77bf02d 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -19,7 +19,7 @@ sky=sky21
 ; [string] entity label
 label=star
 ; [string] entity name
-name=class D star
+name=class F star
 location=-1024 -512 0
 ; [r g b] entity primary color, values in the 0-255 range
 color=255 255 255
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 482f5d9..451e3bd 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -37,6 +37,11 @@ default = yes
 	[ship]
 	label=horizon
 
+	[cargo]
+	label=liquor
+	price=350
+	amount=5
+
 ; ------------------------------------------------------------------ 
 ; DOVER JUMPGATE
 
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
new file mode 100644
index 0000000..ca4684b
--- /dev/null
+++ b/base/ini/zones/finnmark.ini
@@ -0,0 +1,90 @@
+;
+; finnmark.ini
+; world description for the Finnmark system
+;
+
+; ------------------------------------------------------------------ 
+; ZONE IDENTIFICATION
+
+[zone]
+name=Finnmark system
+
+; ------------------------------------------------------------------ 
+; STAR
+
+[star]
+; [string] entity label
+label=star
+; [string] entity name
+name=class B star
+location=256 1012 64
+; [r g b] entity primary color, values in the 0-255 range
+color=221 224 255
+; [float] entity radius (10 game units == 1km ingame)
+radius=90
+
+; ------------------------------------------------------------------ 
+; PLANET FINNMARK
+
+[planet]
+label=finnmark
+name=planet Finnmark
+default=yes
+color=192 88 -64
+location=128 64 0
+radius=70
+dock=yes
+
+	[ship]
+	label=talon
+
+	[ship]
+	label=enforcer
+
+	[ship]
+	label=betelgeuse
+
+	[cargo]
+	label=liquor
+	price=500
+	amount=0
+
+	[cargo]
+	label=gold
+	price=1250
+
+; ------------------------------------------------------------------ 
+; ANTWERP JUMPGATE
+
+[navpoint]
+label=navpoint_east
+name=Navigation Point East
+location=-68 -500 0
+model=maps/static/navpoint
+
+[jumpgate]
+label=jumpgate_antwerp
+name=Jumpgate Finnmark -> Antwerp
+model=maps/colonial/jumpgate
+target=antwerp:jumpgate_finnmark
+location=-96 -524 0
+direction=95
+color=106 95 87
+colorsecond=152 166 169
+info=Jumpgate to the Antwerp system.
+
+; ------------------------------------------------------------------ 
+; KARELIA JUMPPOINT
+
+[navpoint]
+label=navpoint_north
+name=Navigation Point North
+location=-68 -500 0
+model=maps/static/navpoint
+
+[jumppoint]
+label=jumppoint_karelia
+target=karelia:jumppoint_finnmark
+name=Jumppoint Finnmark -> Karelia
+info=Jumppoint to the Karelia system.
+location=512 512 0
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 27a0ce1..167c3ba 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -34,7 +34,7 @@ model=maps/static/navpoint
 ; [string] entity label
 label=star
 ; [string] entity name
-name=class D star
+name=class A star
 location=512 -512 0
 ; [r g b] entity primary color, values in the 0-255 range
 color=255 255 255
@@ -110,7 +110,7 @@ info=Alexandria outpost serves as a commercial and entertainment centre for the
 
 	[cargo]
 	label=liquor
-	price=400
+	price=325
 	amount=5
 
 [entity]
@@ -149,7 +149,7 @@ colorsecond=160 160 160
 
 	[cargo]
 	label=liquor
-	price=425
+	price=350
 	amount=0
 
 ; ------------------------------------------------------------------
@@ -246,5 +246,6 @@ model=maps/pirate/jumpgate
 target=antwerp:jumpgate_ghant
 location=1024 348 32
 direction=180
-color=158 0 255
+color=222 192 145
+colorsecond=160 160 160
 info=Jumpgate to the Antwerp system.
diff --git a/base/ini/zones/karelia.ini b/base/ini/zones/karelia.ini
new file mode 100644
index 0000000..c727d9c
--- /dev/null
+++ b/base/ini/zones/karelia.ini
@@ -0,0 +1,37 @@
+;
+; karelia.ini
+; world description for the Karelia system
+;
+
+[zone]
+name=Karelia system
+ 
+; ------------------------------------------------------------------ 
+; ANARA JUMPPOINT
+
+[navpoint]
+label=navpoint_north
+name=Navigation Point North
+model=maps/static/navpoint
+location=512 0 -64
+
+[jumppoint]
+label=jumppoint_anara
+name=Jumppoint Karelia -> Anara
+target=anara:jumppoint_karelia
+location=524 0 64
+
+; ------------------------------------------------------------------ 
+; FINNMARK JUMPPOINT
+
+[navpoint]
+label=navpoint_south
+name=Navigation Point South
+model=maps/static/navpoint
+location=-512 0 -64
+
+[jumppoint]
+label=jumppoint_finnmark
+name=Jumppoint Karelia -> Finnmark
+target=finnmark:jumppoint_karelia
+location=-524 0 64
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 25db9f1..2864277 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -3,15 +3,15 @@
 ; world description for the Lindblade system
 ;
 
-;
+; ------------------------------------------------------------------ 
 ; ZONE IDENTIFICATION
 
 [zone]
 name=Lindblade system
 sky=sky17
 
-;
-; ORIGIN
+; ------------------------------------------------------------------ 
+; NAVPOINT ORIGIN
 
 [navpoint]
 ; [string] entity label
@@ -21,38 +21,38 @@ name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
 
-;
+; ------------------------------------------------------------------ 
 ; STAR
 
 [star]
 label=star
-name=class K star
+name=class G star
 location=256 -512 0
 color=1 .9 .5
 radius=96
 
-;
+; ------------------------------------------------------------------ 
 ; PLANET LINDBLADE
 
 [planet]
 label=lindblade
 name=planet Lindblade
 texture=planets/lindblade
-location=518 780 16
+location=618 780 16
 direction=90
 pitch=7.5
 rotationspeed=1.5
 color=200 0 0
-radius=72
+radius=74
 
-;
+; ------------------------------------------------------------------ 
 ; LINDBLADE CENTRAL
 
 [station]
 label=lindblade_central
 name=Lindblade Central
 model=maps/lindblade/lindblade_central
-location=500 672 18
+location=500 720 18
 color=0.5 0.1 0.1
 direction=250
 pitch=0
@@ -68,9 +68,9 @@ pitch=0
 	price=1500
 	amount=0
 
-
-;
+; ------------------------------------------------------------------ 
 ; STATION 15
+
 [station]
 label=station15
 name=Station 15
@@ -87,7 +87,7 @@ label=navpoint_15
 name=Navigation point 15
 location=-290 -60 6
 
-;
+; ------------------------------------------------------------------ 
 ; DOVER JUMPGATE
 
 [navpoint]