6 files changed, 91 insertions, 26 deletions
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 5ad5e36..581940b 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -15,6 +15,7 @@ zone=brogha
 zone=antwerp
 zone=kronenbaden
 zone=khorsand
+zone=warsaw
 
 ; neutral systems
 zone=eastend
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 56b213c..a84d08d 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -117,12 +117,8 @@ yaw=-45
 ; ------------------------------------------------------------------ 
 ; GHANT JUMPGATE
 
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=-440 840 128
-
 [jumpgate]
+; name and info are automaticly set for jumpgates
 label=jumpgate_ghant
 faction=colonies
 target=ghant:jumpgate_brogha
@@ -132,12 +128,6 @@ yaw=270
 ; ------------------------------------------------------------------ 
 ; EASTEND JUMPGATE
 
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=700 -992 -8
-model=maps/static/navpoint
-
 [jumpgate]
 label=jumpgate_eastend
 faction=colonies
@@ -145,10 +135,12 @@ target=eastend:jumpgate_brogha
 location=700 -1024 0
 yaw=180
 
+; ------------------------------------------------------------------
+; KHORSAND JUMPGATE
+
 [jumpgate]
-; name and info are automaticly set for jumpgates
 label=jumpgate_khorsand
 target=khorsand:jumpgate_brogha
 faction=colonies
 location=-256 -768 8
-yaw=180
+yaw=90
diff --git a/base/ini/zones/khorsand.ini b/base/ini/zones/khorsand.ini
index b7f4fc7..989a558 100644
--- a/base/ini/zones/khorsand.ini
+++ b/base/ini/zones/khorsand.ini
@@ -11,6 +11,9 @@ label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
 
+; ------------------------------------------------------------------
+; CLASS K STAR
+
 [star]
 ; [string] entity label
 label=star
@@ -22,14 +25,30 @@ color=255 214 120
 ; [float] entity radius (10 game units == 1km ingame)
 radius=130
 
+; ------------------------------------------------------------------
+; WARSAW JUMPGATE
+
+[jumpgate]
+; name and info are automaticly set for jumpgates
+label=jumpgate_warsaw
+target=warsaw:jumpgate_khorsand
+faction=colonies
+location=-256 600 -2
+yaw=90
+
+; ------------------------------------------------------------------
+; BROGHA JUMPGATE
 
 [jumpgate]
 ; name and info are automaticly set for jumpgates
 label=jumpgate_brogha
 target=brogha:jumpgate_khorsand
 faction=colonies
-location=768 -512 12
-yaw=0
+location=700 -500 12
+yaw=160
+
+; ------------------------------------------------------------------
+; KERMAN STATION
 
 [station]
 label=kerman
@@ -38,7 +57,7 @@ model=maps/colonial/regula
 location=-448 -96 -12
 color=0.7 0.7 0
 yaw=225
-info=Kerman station is the main niobium refinery in the border worlds.
+info=Kerman station is the largest niobium refinery of the Independent Colonies.
 
 	[ship]
 	label=vector
@@ -67,7 +86,7 @@ info=Kerman station is the main niobium refinery in the border worlds.
 	amount=-1
 
 [entity]
-label=kerman_storage
+label=kerman_storage1
 name=Storage tanks
 model=maps/colonial/regula_storage
 location=-448 -86 -12
diff --git a/base/ini/zones/kor_telos.ini b/base/ini/zones/kor_telos.ini
index df25b86..030578b 100644
--- a/base/ini/zones/kor_telos.ini
+++ b/base/ini/zones/kor_telos.ini
@@ -1,6 +1,6 @@
 ;
 ; kor_telos.ini
-; world description for Kor Telos
+; world description for the Kor Telos system
 ;
 
 [zone]
@@ -9,13 +9,14 @@ sky=sky09
 
 [star]
 label=star
-name=class A dwarf star
+name=class A star
 location=4096 4096 0
 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
diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini
index 1277f63..1aa492a 100644
--- a/base/ini/zones/kronenbaden.ini
+++ b/base/ini/zones/kronenbaden.ini
@@ -22,7 +22,7 @@ color=1.0 1.0 0.9
 [planet]
 label=Baden
 name=planet Baden
-location=1024 -512 -64
+location=786 -400 -64
 texture=planets/baden
 yaw=90
 faction=colonies
@@ -34,7 +34,7 @@ color=1.0 1.0 1.0
 [planet]
 label=krone
 name=planet Krone
-location=-768 840 128
+location=-512 256 -128
 texture=planets/krone
 yaw=210
 faction=colonies
@@ -46,7 +46,6 @@ color=1.0 1.0 1.0
 [jumpgate]
 label=jumpgate_antwerp
 target=antwerp:jumpgate_kronenbaden
-faction=lindblade
 location=256 -1280 -72
 yaw=120
 faction=colonies
@@ -57,12 +56,23 @@ faction=colonies
 [jumpgate]
 label=jumpgate_ghant
 target=ghant:jumpgate_kronenbaden
-faction=lindblade
-location=-300 -768 32
-yaw=30
+location=-400 -768 32
+yaw=40
+faction=colonies
+
+
+; ------------------------------------------------------------------ 
+; WARSAW JUMPGATE
+
+[jumpgate]
+label=jumpgate_warsaw
+target=warsaw:jumpgate_kronenbaden
+location=-1024 768 -64
+yaw=300
 faction=colonies
 
 ; ------------------------------------------------------------------ 
+; FINNMARK JUMPGATE CONSTRUCTION SITE
 
 [entity]
 label=jumpgate_finnmark
@@ -74,7 +84,7 @@ faction=colonies
 
 [station]
 label=jumpgate_construction
-name=Jumpgate Construction
+name=Jumpgate Construction Site
 model=maps/colonial/regula
 faction=colonies
 location=1372 350 8
diff --git a/base/ini/zones/warsaw.ini b/base/ini/zones/warsaw.ini
new file mode 100644
index 0000000..a051a87
--- /dev/null
+++ b/base/ini/zones/warsaw.ini
@@ -0,0 +1,42 @@
+;
+; warsaw.ini
+; world description for the Warsaw system
+;
+ 
+
+[zone]
+name=Warsaw system
+
+; ------------------------------------------------------------------
+; CLASS M STAR
+
+[star]
+; [string] entity label
+label=star
+; [string] entity name
+name=class K star
+location=1024 0 0
+; [r g b] entity primary color, values in the 0-255 range
+color=219 91 0
+; [float] entity radius (10 game units == 1km ingame)
+radius=64
+
+; ------------------------------------------------------------------ 
+; KRONENBADEN JUMPGATE
+
+[jumpgate]
+label=jumpgate_kronenbaden
+target=kronenbaden:jumpgate_warsaw
+location=768 600 -32
+yaw=180
+faction=colonies
+
+; ------------------------------------------------------------------
+; KHORSAND JUMPGATE
+
+[jumpgate]
+label=jumpgate_khorsand
+target=khorsand:jumpgate_warsaw
+location=-200 -400 0
+yaw=90
+faction=colonies