8 files changed, 173 insertions, 94 deletions
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
new file mode 100644
index 0000000..865ecd7
--- /dev/null
+++ b/base/ini/zones/argos.ini
@@ -0,0 +1,31 @@
+;
+; argos.ini
+; world description for the Morrigan system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+name=Argos system
+;sky=
+; [x y z] galactic location
+location=629 451 0
+ambient=0.1 0.1 0.1
+
+info=The Argos system.
+
+[jumpgate]
+label=jumpgate_morrigan
+location=-348 740 0
+angles=0 290 0
+target=morrigan:jumpgate_argos
+faction=independent
+[jumpgate]
+label=jumpgate_hellas
+location=-952 -180 0
+
+[jumppoint]
+label=jumppoint_kor_minas
+location=1080 200 0
+angles=0 195 0
+target=kor_minas:jumppoint_argos
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index c73ae0d..57b19b0 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -2,9 +2,9 @@
 ; burton.ini
 ; world description for the Burton system
 ;
-
 ;
 ; ZONE IDENTIFICATION
+
 [zone]
 name=Burton system
 sky=sky14
@@ -12,40 +12,32 @@ sky=sky14
 location=525 487 0
 ; faction
 faction=lindblade
+
 ; zone information
 info=The Burton system.
-;
-; ORIGIN
 
-[navpoint]
-; [string] entity label
-label=navpoint_origin
-; [string] entity name
-name=Navigation point Origin
-; [x y x] entity location
-location=0 0 0
 ; [path] path to model
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; STAR
 
 [star]
 label=star
 name=class K star
-location=-256 0 0
-color=1 .9 .5
+location=-600 200 -8
 radius=84
+color=1 .9 .5
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; LINDBLADE SHIPYARD
 ;
 
 [station]
 label=shipyard
 name=Lindblade Shipyard
+location=-256 -128 -32
+showonmap=true
 faction=lindblade
 model=maps/lindblade/lindblade_dock
-location=128 128 0
 
 	[cargo]
 	label=carbosteel
@@ -56,18 +48,18 @@ location=128 128 0
 	label=water
 	price=12
 	amount=0
-	
-; ------------------------------------------------------------------ 
-; FINNMARK JUMPGATE
-
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=256 1024 16
 
 [jumpgate]
 label=jumpgate_lindblade
+location=192 1072 16
+angles=0 260 0
 target=lindblade:jumpgate_burton
 faction=lindblade
-location=384 1056 16
-yaw=275
+
+[jumpgate]
+label=jumpgate_kor_minas
+location=72 -944 -96
+angles=0 90 0
+target=kor_minas:jumpgate_burton
+faction=lindblade
+
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 24258d1..79c4398 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -9,7 +9,7 @@
 [zone]
 name=Finnmark system
 sky=sky07
-ambient=0 0 0
+ambient=.1 .1 .12
 ; [x y z] galactic location
 location=392 369 0
 ; faction
@@ -101,6 +101,9 @@ yaw=-90
 	label=water
 	price=10
 	amount=0
+	
+	[cargo]
+	label=liquor
 
 ; ------------------------------------------------------------------ 
 ; ANTWERP JUMPGATE
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 4bd735c..472feeb 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -122,7 +122,7 @@ default=yes
 info=Alexandria outpost serves as a commercial and entertainment centre for the Ghant system.
 info=Because of its remote location, it is also a popular transit zone for more shady operations,
 
-	; available ship types
+	; ship trade definitions
 	[ship]
 	label=vector
 
@@ -135,6 +135,13 @@ info=Because of its remote location, it is also a popular transit zone for more
 	; initial amount, -1 means unlimited supply
 	amount=-1
 
+	; weapon trade definitions
+	[weapon]
+	label=mine_dumb
+	price=50
+	amount=-1
+	
+	; cargo trade definitions
 	[cargo]
 	label=liquor
 	price=325
diff --git a/base/ini/zones/kor_minas.ini b/base/ini/zones/kor_minas.ini
new file mode 100644
index 0000000..105d806
--- /dev/null
+++ b/base/ini/zones/kor_minas.ini
@@ -0,0 +1,26 @@
+;
+; kor_minas.ini
+; world description for the Kor Telos system
+;
+
+[zone]
+name=Kor Minas system
+;sky=
+; [x y z] galactic location
+location=584 512 0
+ambient=0.1 0.1 0.1
+
+; zone information
+info=The Kor Minas system.
+
+[jumpgate]
+label=jumppoint_argos
+location=-952 -312 0
+angles=0 10 0
+target=argos:jumppoint_kor_minas
+[jumpgate]
+label=jumpgate_burton
+location=-208 720 0
+angles=0 280 0
+target=burton:jumpgate_kor_minas
+faction=independent
diff --git a/base/ini/zones/kor_telos.ini b/base/ini/zones/kor_telos.ini
index 7afca0a..2985e76 100644
--- a/base/ini/zones/kor_telos.ini
+++ b/base/ini/zones/kor_telos.ini
@@ -4,7 +4,7 @@
 ;
 
 [zone]
-name=Kor Telos
+name=Kor Telos system
 sky=sky09
 ; [x y z] galactic location
 location=518 551 0
@@ -19,16 +19,6 @@ color=255 255 255
 radius=9
 corona=default
 
-[entity]
-; note - needs to be moved to an uncharted system (southern rim?)
-label=ringworld
-name=???
-model=maps/derelict/ringworld
-faction=derelict
-location=4096 4096 0
-roll=45
-radius=100000000
-
 [planet]
 label=corthio
 name=planet Corthio
@@ -39,4 +29,12 @@ label=andros
 name=planet Andros
 location=789 -800 -96
 
-
+;[entity]
+; note - needs to be moved to an uncharted system (southern rim?)
+;label=ringworld
+;name=???
+;model=maps/derelict/ringworld
+;faction=derelict
+;location=4096 4096 0
+;roll=45
+;radius=100000000
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index d15f551..7b8be85 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -2,8 +2,7 @@
 ; lindblade.ini
 ; world description for the Lindblade system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -13,46 +12,44 @@ sky=sky10
 location=504 432 0
 ; faction
 faction=lindblade
+
 ; zone information
 info=The Lindblade system.
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; STAR
 
 [star]
 label=star
 name=class G star
 location=0 -512 0
-color=1 .9 .5
 radius=96
+color=1 .9 .5
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; PLANET LINDBLADE
 
 [planet]
 label=lindblade
 name=planet Lindblade
-texture=planets/lindblade
 location=362 780 16
-yaw=90
-pitch=-7.5
-rotationspeed=1.5
+angles=-7.5 90 0
 ;color=200 0 0
 radius=74
+texture=planets/lindblade
+rotationspeed=1.5
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; LINDBLADE CENTRAL
 
 [station]
 label=lindblade_central
 name=Lindblade Central
-model=maps/lindblade/lindblade_central
-faction=lindblade
 location=464 564 18
-yaw=250
-pitch=0
+angles=0 250 0
 radius=10
-
+model=maps/lindblade/lindblade_central
+faction=lindblade
 
 	[ship]
 	label=halcyon
@@ -80,17 +77,17 @@ radius=10
 	price=8
 	amount=0
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; STATION 15
 
 [station]
 label=station15
 name=Station 15
-model=maps/lindblade/station15
-faction=lindblade
 location=-548 -68 8
+angles=0 315 0
 radius=8
-yaw=315
+model=maps/lindblade/station15
+faction=lindblade
 
 	[ship]
 	label=supertanker
@@ -110,52 +107,30 @@ yaw=315
 	price=10
 	amount=0
 
-[navpoint]
-label=navpoint_15
-name=Navigation point 15
-location=-290 -60 6
-
-; ------------------------------------------------------------------ 
-; ALBION JUMPGATE
-
-[navpoint]
-label=navpoint_south
-name=Navigation point South
-location=-580 -768 12
-
 [jumpgate]
 label=jumpgate_albion
+location=-588 -768 16
+angles=0 75 0
 target=albion:jumpgate_lindblade
 faction=lindblade
-location=-588 -768 16
-yaw=90
-
-; ------------------------------------------------------------------ 
-; CALEDONIA JUMPGATE
-
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=752 1264 15
 
 [jumpgate]
 label=jumpgate_caledonia
+location=768 1280 16
+angles=0 250 0
 target=caledonia:jumpgate_lindblade
 faction=lindblade
-location=768 1280 16
-yaw=250
-
-; ------------------------------------------------------------------ 
-; BURTON JUMPGATE
-
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=1022 -248 14
 
 [jumpgate]
 label=jumpgate_burton
+location=1024 -256 16
+angles=0 110 0
 target=burton:jumpgate_lindblade
 faction=lindblade
-location=1024 -256 16
-yaw=110
+
+[jumpgate]
+label=jumpgate_morrigan
+location=576 -952 0
+angles=0 100 0
+target=morrigan:jumpgate_lindblade
+faction=lindblade
diff --git a/base/ini/zones/morrigan.ini b/base/ini/zones/morrigan.ini
new file mode 100644
index 0000000..8ee6520
--- /dev/null
+++ b/base/ini/zones/morrigan.ini
@@ -0,0 +1,47 @@
+;
+; morrigan.ini
+; world description for the Morrigan system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+name=Morrigan system
+;sky=
+; [x y z] galactic location
+location=573 420 0
+; faction
+faction=lindblade
+
+; zone information
+info=The Morrigan system.
+
+[star]
+label=star
+name=class M star
+location=1784 -648 0
+angles=0 135 0
+radius=160
+color=255 76 11
+[jumpgate]
+label=jumpgate_argos
+location=520 -1288 0
+angles=0 115 0
+target=argos:jumpgate_morrigan
+faction=lindblade
+[jumpgate]
+label=jumpgate_lindblade
+location=-120 1264 0
+angles=0 280 0
+target=lindblade:jumpgate_morrigan
+faction=lindblade
+
+[station]
+label=ulster
+name=Ulster station
+location=708 -1028 0
+angles=0 180 0
+radius=8
+model=maps/lindblade/station15
+faction=lindblade
+showonmap=true