Renamed 'independent' faction to 'neutral',

added 'rogue', 'merchants' and 'mercenaries' factions,
added zone files for Praetorian space and surrounding star systems,
updated the Caledonia system.

26 files changed, 370 insertions, 135 deletions

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 9fe0a39..569fcda 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -20,6 +20,19 @@ name=Colonial Militia
 color=100 100 230
 colorsecond=192 192 40
 
+; used to indicate neutral space
+[faction]
+label=neutral
+name=Neutral
+color=0.7 0.7 0.9
+colorsecond=0.7 0.8 0.95
+
+; used to indicate rogue space
+[faction]
+label=rogue
+name=Rogue
+color=0.5 0.5 0.5
+
 [faction]
 ; faction label
 label=lindblade
@@ -35,6 +48,7 @@ colorsecond=0.75 0.35 0
 label=praetoria
 ; faction full name
 name=House Praetoria
+color=217 131 0
 
 [faction]
 label=miners
@@ -49,15 +63,13 @@ colorsecond=152 166 169
 color=106 95 87
 
 [faction]
-label=independent
-name=Independent
-color=0.7 0.7 0.9
-colorsecond=0.7 0.8 0.95
-
-[faction]
 label=mercenaries
 name=Mercenaries Guild
 
+[factiom]
+label=merchants
+name=Merchants Association
+
 [faction]
 label=pirates
 name=Pirates
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 8e1f33e..bfcc78e 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -18,8 +18,10 @@ zone=khorsand
 zone=warsaw
 
 ; neutral systems
-zone=eastend
 zone=finnmark
+zone=eastend
+zone=ground
+zone=yser
 
 ; borderworlds
 zone=karelia
@@ -35,10 +37,16 @@ zone=burton
 zone=caledonia
 zone=morrigan
 
+; praetorian space
+zone=hellas
+zone=carthagio
+zone=praetoria
+zone=phoenicia
+
 ; dragon eye nebula
 zone=argos
 zone=gibraltar
-zone=vasco 
+zone=colombus 
 
 ; tsu-khan space
 zone=kiana
diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
index 0c3a3a6..0415a31 100644
--- a/base/ini/zones/albion.ini
+++ b/base/ini/zones/albion.ini
@@ -13,14 +13,6 @@ faction=lindblade
 info=The Albion system.
 
 ; ------------------------------------------------------------------ 
-; ORIGIN
-
-[navpoint]
-label=navpoint_origin
-name=Navigation point Origin
-location=0 0 0
-
-; ------------------------------------------------------------------ 
 ; STAR
 
 [star]
@@ -66,6 +58,9 @@ yaw=140
 	price=2250
 	amount=0
 
+; ------------------------------------------------------------------
+; BRISBANE STATION
+
 [station]
 label=brisbane
 name=Brisbane station
@@ -88,11 +83,6 @@ yaw=30
 ; ------------------------------------------------------------------ 
 ; LINDBLADE JUMPGATE
 
-[navpoint]
-label=navpoint_north
-name=Navigation point North
-location=762 0 -2
-
 [jumpgate]
 label=jumpgate_lindblade
 target=lindblade:jumpgate_albion
@@ -103,11 +93,6 @@ yaw=180
 ; ------------------------------------------------------------------ 
 ; EAST END JUMPGATE
 
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=64 -706 -2
-
 [jumpgate]
 label=jumpgate_eastend
 target=eastend:jumpgate_albion
@@ -118,11 +103,6 @@ yaw=90
 ; ------------------------------------------------------------------ 
 ; ANTWERP JUMPGATE
 
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=-606 496 -2
-
 [jumpgate]
 label=jumpgate_antwerp
 target=antwerp:jumpgate_albion
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index 1a48137..c6e26d7 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -8,7 +8,7 @@ name=Anara system
 sky=sky11
 ambient=0.1 0.2 0.1
 location=410 487 0
-faction=research
+faction=neutral
 ; zone information
 info=The Anara system
 
@@ -20,7 +20,7 @@ label=navpoint_origin
 name=Navpoint Origin
 location=0 0 0
 
-;
+; ------------------------------------------------------------------ 
 ; GALILEO OUTPOST
 
 [station]
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index fa12b15..1c689e7 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -13,7 +13,7 @@ location=457 343 0
 ; faction
 faction=colonies
 ; zone information
-info=The Antwerp system.
+info=The Antwerp system is the headquarters of the Colonial Militia.
 
 ; ------------------------------------------------------------------ 
 ; STAR
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
index c689874..17bb935 100644
--- a/base/ini/zones/argos.ini
+++ b/base/ini/zones/argos.ini
@@ -13,6 +13,7 @@ sky=sky19
 location=629 451 0
 ambient=0.1 0.1 0.1
 info=The Argos system.
+faction=neutral
 
 ; ------------------------------------------------------------------
 ; MORRIGAN JUMPGATE
@@ -22,7 +23,7 @@ label=jumpgate_morrigan
 location=-348 740 0
 angles=0 290 0
 target=morrigan:jumpgate_argos
-faction=independent
+faction=neutral
 
 ; ------------------------------------------------------------------
 ; HELLAS JUMPGATE
diff --git a/base/ini/zones/caledonia.ini b/base/ini/zones/caledonia.ini
index 4082ba1..9177b9f 100644
--- a/base/ini/zones/caledonia.ini
+++ b/base/ini/zones/caledonia.ini
@@ -2,8 +2,7 @@
 ; caledonia.ini
 ; world description for the Caledonia system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -13,63 +12,67 @@ sky=sky06
 location=441 433 0
 ; faction
 faction=lindblade
+
 ; zone information
 info=The Caledonia system.
 
-; ------------------------------------------------------------------ 
-; ANARA JUMPGATE
+; ------------------------------------------------------------------
+; STAR
 
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=364 1016 14
-color=0.5 0.1 0.1
+[star]
+label=star
+name=Standard Issue star
+location=1480 224 0
+angles=0 180 0
+
+; ------------------------------------------------------------------
+; ANARA JUMPGATE
 
 [jumpgate]
 label=jumpgate_anara
-model=maps/colonial/jumpgate
+location=480 1128 16
+angles=0 250 0
 target=anara:jumpgate_caledonia
 faction=lindblade
-location=376 1024 16
-yaw=250
 
-; ------------------------------------------------------------------ 
-; LINDBLADE JUMPGATE
 
-[navpoint]
-label=navpoint_east
-name=Navigation Point East
-location=128 -768 0
+; ------------------------------------------------------------------
+; LINDBLADE JUMPGATE
 
 [jumpgate]
 label=jumpgate_lindblade
+location=482 -1080 0
+angles=0 110 0
 target=lindblade:jumpgate_caledonia
 faction=lindblade
-location=120 -760 0
-yaw=95
 
-; ------------------------------------------------------------------ 
-; KARELIA JUMPPOINT
 
-[navpoint]
-label=navpoint_south
-name=Navigation point South
-location=-512 0 32
-color=0.5 0.1 0.1
+; ------------------------------------------------------------------
+; KARELIA JUMPPOINT
 
 [jumppoint]
 label=jumppoint_karelia
+location=-416 1000 32
 target=karelia:jumppoint_caledonia
 color=0.5 0.1 0.1
-location=-524 0 32
-yaw=0
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; FINNMARK JUMPGATE
 
 [jumpgate]
 label=jumpgate_finnmark
+location=-956 180 0
+angles=0 -15 0
 target=finnmark:jumpgate_caledonia
 faction=lindblade
-location=-612 532 0
-yaw=-30
+
+
+; ------------------------------------------------------------------
+; PLANET CALEDONIA
+
+[planet]
+label=caledonia
+name=planet Caledonia
+location=320 -40 0
+angles=8 180 0
+dock=yes
diff --git a/base/ini/zones/carthagio.ini b/base/ini/zones/carthagio.ini
new file mode 100644
index 0000000..ae0bc5d
--- /dev/null
+++ b/base/ini/zones/carthagio.ini
@@ -0,0 +1,27 @@
+;
+; carthagio.ini
+; world description for the Carthagio system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+; zone name
+name=Carthagio system
+; ambient color
+ambient=.1 .1 .1
+; [x y z] galactic location
+location=698 280 0
+; faction
+faction=praetoria
+
+; zone information
+info=The Carthagio system.
+
+[jumpgate]
+label=jumpgate_ground
+location=-592 1040 0
+angles=0 -50 0
+target=ground:jumpgate_carthagio
+faction=praetoria
+
diff --git a/base/ini/zones/vasco.ini b/base/ini/zones/colombus.ini
index c9ac44d..c8c06c8 100644
--- a/base/ini/zones/vasco.ini
+++ b/base/ini/zones/colombus.ini
@@ -1,16 +1,16 @@
 ;
-; vasco.ini
-; world description for the Vasco system
+; colombus.ini
+; world description for the Colombus system
 ;
 
 ; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 ;
 [zone]
-name=Vasco system
+name=Colombus system
 sky=sky20
 ; [x y z] galactic location
 location=709 442 0
 ambient=0.1 0.1 0.1
-info=The Vasco system.
-
+info=The Colombus system.
+faction=neutral
\ No newline at end of file
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index d5739e5..61e9f3a 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -2,39 +2,33 @@
 ; eastend.ini
 ; world description for the East End system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
-
 [zone]
 name=East End system
 sky=sky08
 ; [x y z] galactic location
 location=584 328 0
 ; faction
-faction=independent
+faction=neutral
+
 ; zone information
 info=The East End system.
 
-[navpoint]
-label=navpoint_origin
-name=Navigation point Origin
-location=0 0 0
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; TRIDENT CORE
 
 [station]
 label=trident
 name=Trident Core
-model=maps/independent/trident
-faction=independent
-location=-32 32 2
-yaw=30
+location=-426 -408 2
+angles=0 30 0
 radius=16
+model=maps/independent/trident
+faction=neutral
 ; this entity is the default zone view
-default = yes
+default=yes
 
 	[ship]
 	label=anansi
@@ -57,32 +51,37 @@ default = yes
 	price=12
 	amount=0
 
-; ------------------------------------------------------------------ 
-; ALBION JUMPGATE
-
-[navpoint]
-label=navpoint_north
-name=Navigation point North
-location=504 0 0
-
 [jumpgate]
 label=jumpgate_albion
+location=582 66 0
+angles=0 195 0
 target=albion:jumpgate_eastend
-faction=independent
-location=520 0 0
-yaw=270
-
-; ------------------------------------------------------------------ 
-; BROGHA JUMPGATE
-
-[navpoint]
-label=navpoint_south
-name=Navigation point South
-location=-504 0 0
+faction=neutral
 
 [jumpgate]
 label=jumpgate_brogha
+location=-676 392 0
+angles=5 -30 0
 target=brogha:jumpgate_eastend
-faction=independent
-location=-520 0 0
-yaw=0
+faction=neutral
+
+[jumpgate]
+label=jumpgate_hellas
+location=332 -956 0
+angles=0 140 0
+target=hellas:jumpgate_eastend
+faction=neutral
+
+[star]
+label=star
+name=class F star
+location=-620 -1016 0
+angles=0 45 0
+radius=86
+color=255 255 192
+
+[jumppoint]
+label=jumppoint_ground
+location=-1224 -968 0
+angles=0 25 0
+target=ground:jumppoint_eastend
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 691507e..7840ab6 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -13,7 +13,7 @@ ambient=.1 .1 .12
 ; [x y z] galactic location
 location=392 369 0
 ; faction
-faction=miners
+faction=neutral
 ; zone information
 info=The Finnmark system.
 
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 4cf96f5..8949cab 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -17,7 +17,7 @@ location=466 278 0
 ; faction
 faction=colonies
 ; zone information
-info=The Ghant system.
+info=The Ghant system is the headquarters of the Merchants Association.
 
 ; ------------------------------------------------------------------
 ; ORIGIN
@@ -72,6 +72,8 @@ info=heartland of the Independent Colonies. Most of this once mineral-rich world
 info=depleted by intensive mining operations, but an extensive terraforming operation is slowly transforming the
 info=arid climate into a more hospitable environment. This ongoing process requires regular imports of terraforming
 info=equipment and other related technologies.
+info=The Merchants Association has placed its headquarters strategicly on planet Ghant, enjoying the favourable
+info=fiscal climate of the Independent Colonies.
 
 	[cargo]
 	label=terraformingequipment
diff --git a/base/ini/zones/gibraltar.ini b/base/ini/zones/gibraltar.ini
index b2d4a47..c492b04 100644
--- a/base/ini/zones/gibraltar.ini
+++ b/base/ini/zones/gibraltar.ini
@@ -9,7 +9,8 @@ sky=sky18
 ; [x y z] galactic location
 location=584 512 0
 ambient=0.1 0.1 0.1
-
+; faction
+faction=neutral
 ; zone information
 info=The Gibraltar system.
 
@@ -24,4 +25,4 @@ label=jumpgate_burton
 location=-208 720 0
 angles=0 280 0
 target=burton:jumpgate_gibraltar
-faction=independent
+faction=neutral
diff --git a/base/ini/zones/ground.ini b/base/ini/zones/ground.ini
new file mode 100644
index 0000000..e1d5f92
--- /dev/null
+++ b/base/ini/zones/ground.ini
@@ -0,0 +1,39 @@
+;
+; ground.ini
+; world description for the Ground system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+; zone name
+name=Ground system
+; ambient color
+ambient=.1 .1 .1
+; [x y z] galactic location
+location=637 251 0
+; faction
+faction=neutral
+
+; zone information
+info=The Ground system.
+
+[jumppoint]
+label=jumppoint_eastend
+location=976 1240 0
+angles=0 245 0
+target=eastend:jumppoint_ground
+
+[jumpgate]
+label=jumpgate_carthagio
+location=968 -208 0
+angles=0 165 0
+target=carthagio:jumpgate_ground
+faction=neutral
+
+[jumpgate]
+label=jumpgate_yser
+location=-976 -72 0
+angles=0 15 0
+target=yser:jumpgate_ground
+faction=neutral
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
new file mode 100644
index 0000000..bdc77cd
--- /dev/null
+++ b/base/ini/zones/hellas.ini
@@ -0,0 +1,24 @@
+;
+; hellas.ini
+; world description for the Hellas system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+;
+
+[zone]
+name=Hellas system
+; [x y z] galactic location
+location=635 376 0
+ambient=0.1 0.1 0.1
+faction=praetoria
+
+info=The Hellas system.
+
+[jumpgate]
+label=jumpgate_eastend
+location=-840 456 0
+angles=0 -25 0
+target=eastend:jumpgate_hellas
+faction=praetoria
+
diff --git a/base/ini/zones/karelia.ini b/base/ini/zones/karelia.ini
index 674c8dc..6ea9a4b 100644
--- a/base/ini/zones/karelia.ini
+++ b/base/ini/zones/karelia.ini
@@ -9,6 +9,7 @@ sky=sky09
 ambient=0 0 0
 ; [x y z] galactic location
 location=374 430 0
+faction=rogue
 ; zone information
 info=The Karelia system.
 
diff --git a/base/ini/zones/khorsand.ini b/base/ini/zones/khorsand.ini
index 5e82220..e4fa363 100644
--- a/base/ini/zones/khorsand.ini
+++ b/base/ini/zones/khorsand.ini
@@ -10,6 +10,7 @@ sky=sky15
 location=496 210 0
 ; faction
 faction=colonies
+
 ; zone information
 info=The Khorsand system is dominated by mining operations and industrial installations.
 
@@ -27,10 +28,10 @@ label=star
 ; [string] entity name
 name=class K star
 location=256 512 0
-; [r g b] entity primary color, values in the 0-255 range
-color=255 214 120
 ; [float] entity radius (10 game units == 1km ingame)
 radius=130
+; [r g b] entity primary color, values in the 0-255 range
+color=255 214 120
 
 ; ------------------------------------------------------------------
 ; WARSAW JUMPGATE
@@ -38,10 +39,10 @@ radius=130
 [jumpgate]
 ; name and info are automaticly set for jumpgates
 label=jumpgate_warsaw
+location=-256 600 -2
+angles=0 270 0
 target=warsaw:jumpgate_khorsand
 faction=colonies
-location=-256 600 -2
-yaw=270
 
 ; ------------------------------------------------------------------
 ; BROGHA JUMPGATE
@@ -49,10 +50,10 @@ yaw=270
 [jumpgate]
 ; name and info are automaticly set for jumpgates
 label=jumpgate_brogha
+location=700 -500 12
+angles=0 160 0
 target=brogha:jumpgate_khorsand
 faction=colonies
-location=700 -500 12
-yaw=160
 
 ; ------------------------------------------------------------------
 ; KERMAN REFINERY
@@ -60,11 +61,12 @@ yaw=160
 [station]
 label=kerman
 name=Kerman refinery
-model=maps/colonial/factory
 location=-448 -96 -12
-color=0.7 0.7 0
-yaw=225
+angles=0 225 0
 radius=5
+model=maps/colonial/factory
+color=0.7 0.7 0
+
 info=Kerman refinery is the largest niobium processing facility in the Independent Colonies.
 
 	[ship]
@@ -77,7 +79,7 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 	label=crates
 	price=45
 	amount=0
-	
+
 	[cargo]
 	label=liquor
 	price=350
@@ -92,7 +94,7 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 	label=water
 	price=20
 	amount=0
-	
+
 	[cargo]
 	label=superconductors
 	price=250
@@ -101,14 +103,25 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 [entity]
 label=kerman_storage1
 name=Storage tanks
-model=maps/colonial/regula_storage
 location=-448 -86 -12
+model=maps/colonial/regula_storage
 color=0.9 0.9 0.1
 
 [entity]
 label=kerman_storage2
 name=Storage tanks
-model=maps/colonial/regula_storage
 location=-448 -106 -12
-yaw=180
+angles=0 180 0
+model=maps/colonial/regula_storage
 color=0.9 0.9 0.1
+
+; ------------------------------------------------------------------
+; BROGHA JUMPGATE
+
+[jumpgate]
+label=jumpgate_yser
+location=-316 -1096 14
+angles=0 90 0
+target=yser:jumpgate_khorsand
+faction=colonies
+
diff --git a/base/ini/zones/kor_glaven.ini b/base/ini/zones/kor_glaven.ini
index 4fac915..c1b4cae 100644
--- a/base/ini/zones/kor_glaven.ini
+++ b/base/ini/zones/kor_glaven.ini
@@ -7,5 +7,6 @@
 name=Kor Glaven
 ; [x y z] galactic location
 location=453 537 0
+faction=rogue
 ; zone information
-info=The Kor Glaven system.
+info=The Kor Glavensystem.
diff --git a/base/ini/zones/kor_minas.ini b/base/ini/zones/kor_minas.ini
index 356ceb1..7d21bd0 100644
--- a/base/ini/zones/kor_minas.ini
+++ b/base/ini/zones/kor_minas.ini
@@ -9,4 +9,5 @@ name=Kor Minas system
 ; [x y z] galactic location
 location=591 577 0
 ambient=0.1 0.1 0.1
+faction=rogue
 info=The Kor Minas system.
diff --git a/base/ini/zones/kor_telos.ini b/base/ini/zones/kor_telos.ini
index 2985e76..cc66262 100644
--- a/base/ini/zones/kor_telos.ini
+++ b/base/ini/zones/kor_telos.ini
@@ -8,6 +8,7 @@ name=Kor Telos system
 sky=sky09
 ; [x y z] galactic location
 location=518 551 0
+faction=rogue
 ; zone information
 info=The Kor Telos system.
 
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index ec183b6..8ba4d63 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -14,7 +14,7 @@ location=504 432 0
 faction=lindblade
 
 ; zone information
-info=The Lindblade system.
+info=The Lindblade system is the capital system of House Lindblade.
 
 ; ------------------------------------------------------------------
 ; STAR
diff --git a/base/ini/zones/phoenicia.ini b/base/ini/zones/phoenicia.ini
new file mode 100644
index 0000000..1d843cf
--- /dev/null
+++ b/base/ini/zones/phoenicia.ini
@@ -0,0 +1,19 @@
+;
+; phoenicia.ini
+; world description for the Phoenicia system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+; zone name
+name=Phoenicia system
+; ambient color
+ambient=.1 .1 .1
+; [x y z] galactic location
+location=752 376 0
+; faction
+faction=praetoria
+
+; zone information
+info=The Phoenicia system.
diff --git a/base/ini/zones/praetoria.ini b/base/ini/zones/praetoria.ini
new file mode 100644
index 0000000..bf984d8
--- /dev/null
+++ b/base/ini/zones/praetoria.ini
@@ -0,0 +1,26 @@
+;
+; praetoria.ini
+; world description for the Praetoria system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+; zone name
+name=Praetoria system
+; ambient color
+ambient=.1 .1 .1
+; [x y z] galactic location
+location=694 342 0
+; faction
+faction=praetoria
+
+info=The Praetoria system is the capital system of House Praetoria.
+
+[star]
+label=star
+name=class G star
+location=0 0 0
+radius=96
+color=1 .9 .5
+
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 059a249..8379202 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -20,17 +20,17 @@ model=maps/static/navpoint
 [entity]
 ship=vector
 location=4 -8 0
-faction=independent
+faction=neutral
 
 [entity]
 ship=scalar
 location=4 0  0
-faction=independent
+faction=neutral
 
 [entity]
 ship=matrix
 location=4 8 0
-faction=independent
+faction=neutral
 
 [entity]
 ship=hades
@@ -64,5 +64,5 @@ name=Trident
 model=maps/independent/trident
 location=32 -64 0
 yaw=90
-faction=independent
+faction=neutral
 
diff --git a/base/ini/zones/warsaw.ini b/base/ini/zones/warsaw.ini
index cd82938..76b5a50 100644
--- a/base/ini/zones/warsaw.ini
+++ b/base/ini/zones/warsaw.ini
@@ -11,7 +11,7 @@ location=411 213 0
 ; faction
 faction=colonies
 ; zone information
-info=The Warsaw system.
+info=The Warsaw system is the headquarters of Micron Corporation.
 
 ; ------------------------------------------------------------------
 ; CLASS M STAR
@@ -47,6 +47,9 @@ angles=0 75 0
 target=khorsand:jumpgate_warsaw
 faction=colonies
 
+; ------------------------------------------------------------------
+; GHANT JUMPGATE
+
 [jumpgate]
 label=jumpgate_ghant
 location=704 -580 64
@@ -54,6 +57,9 @@ angles=0 135 0
 target=ghant:jumpgate_warsaw
 faction=colonies
 
+; ------------------------------------------------------------------
+; PLANET WARSAW
+
 [planet]
 label=warsaw
 name=planet Warsaw
@@ -68,6 +74,11 @@ texture=planets/warsaw
 	label=gold
 	price=1250
 	amount=0
+	
+	[cargo]
+	label=superconductors
+	price=350
+	amount=0
 
 	; available ship types
 	[ship]
@@ -77,4 +88,4 @@ texture=planets/warsaw
 	label=scalar
 
 	[ship]
-	label=pod
+	label=matrix
diff --git a/base/ini/zones/yser.ini b/base/ini/zones/yser.ini
new file mode 100644
index 0000000..c7e3cb2
--- /dev/null
+++ b/base/ini/zones/yser.ini
@@ -0,0 +1,66 @@
+;
+; yser.ini
+; world description for the Yser system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+; zone name
+name=Yser system
+; ambient color
+ambient=.15 .15 .2
+; [x y z] galactic location
+location=584 184 0
+; faction
+faction=neutral
+
+; zone information
+info=The Yser system is the headquarters of the Mercenaries Guild.
+
+; ------------------------------------------------------------------
+; CLASS O STAR
+
+[star]
+label=star
+name=O class star
+location=-1968 -568 24
+angles=0 15 0
+corona=default
+color=.9 .9 1
+
+; ------------------------------------------------------------------
+; YSERLONE FORTRESS
+
+[station]
+label=yserlone
+name=Yserlone Fortress
+location=-672 104 16
+angles=0 45 0
+radius=4
+; placeholder
+shape=sphere
+faction=mercenaries
+
+info=Yserlone Fortress is the headquarters of the Mercenaries Guild. It is considered inpenetrable by hostile forces.
+
+; ------------------------------------------------------------------
+; GROUND JUMPGATE
+
+[jumpgate]
+label=jumpgate_ground
+location=896 -432 2
+angles=0 160 0
+target=ground:jumpgate_yser
+faction=mercenaries
+
+; ------------------------------------------------------------------
+; GROUND JUMPGATE
+
+[jumpgate]
+label=jumpgate_khorsand
+location=-776 1600 -4
+angles=0 -70 0
+target=khorsand:jumpgate_yser
+faction=mercenaries
+