Starsystem updates.

4 files changed, 140 insertions, 133 deletions

diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index d698220..db46326 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -2,8 +2,7 @@
 ; antwerp.ini
 ; world description for the Antwerp system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -12,10 +11,11 @@ sky=sky01
 location=457 343 0
 ; faction
 faction=colonies
+
 ; zone information
 info=The Antwerp system is the headquarters of the Colonial Militia.
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; STAR
 
 [star]
@@ -24,24 +24,25 @@ label=star
 ; [string] entity name
 name=class O star
 location=256 -1512 0
-; [r g b] entity primary color, values in the 0-255 range
-color=248 248 255
 ; [float] entity radius (10 game units == 1km ingame)
 radius=88
+; [r g b] entity primary color, values in the 0-255 range
+color=248 248 255
 corona=corona/plain
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; STARBASE HELIANTHOS
 
 [station]
 label=helianthos
 name=Starbase Helianthos
+location=548 -716 0
+angles=0 90 0
 infoname=Colonial starbase
 model=maps/colonial/helianthos
 faction=militia
 ; override faction secnodary color
 colorsecond=0 1 0
-location=512 -512 0
 
 	[ship]
 	label=tiger
@@ -58,7 +59,7 @@ location=512 -512 0
 	label=water
 	price=12
 	amount=0
-	
+
 	; weapon trade definitions
 	[weapon]
 	label=mine_dumb
@@ -67,32 +68,30 @@ location=512 -512 0
 	[weapon]
 	label=blaster1
 	amount=-1
-	
+
 	[weapon]
 	label=turretblaster1
 	amount=-1
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; PLANET ANTWERP
 
 [planet]
 label=antwerp
 name=planet Antwerp
+location=96 -64 32
+angles=5 45 0
+radius=72
 texture=planets/antwerp
 rings=planets/antwerp_rings
-location=-64 512 32
-yaw=45
-pitch=5
 rotationspeed=1.0
-radius=72
 dock=yes
-
 faction=militia
 ; reset faction colors
 color=255 255 255
 colorsecond=255 255 255
-
 infoname=Colonial Militia headquarters
+
 info=Planet Antwerp is the headquarters of the colonial militia.
 
 	; available cargo types
@@ -105,43 +104,43 @@ info=Planet Antwerp is the headquarters of the colonial militia.
 	label=liquor
 	price=350
 	amount=0
-	
+
 	[cargo]
 	label=medicines
 	price=215
 	amount=0
-	
+
 	; available ship types
 	[ship]
 	label=lancer
-	
+
 	[ship]
 	label=custodian
-	
+
 	; available weapon types
 	[weapon]
 	label=blaster1
 	amount=-1
-	
+
 	[weapon]
 	label=blaster2
 	amount=-1
-	
+
 	[weapon]
 	label=turretblaster1
 	amount=-1
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; BUCCANEERS' DEN
 
 [station]
 label=buccaneers
-model=maps/pirate/base_large
 name=Buccaneers Den
-faction=pirates
-location=-768 1512 -256
+location=-340 1372 -256
+angles=0 270 0
 radius=18
-
+model=maps/pirate/base_large
+faction=pirates
 infoname=Pirate base
 
 	[ship]
@@ -169,72 +168,74 @@ infoname=Pirate base
 	label=water
 	price=20
 	amount=0
-	
+
 	[weapon]
 	label=laser1
 	amount=-1
-	
+
 	[weapon]
 	label=laser2
 	amount=-1
-	
+
 	[weapon]
 	label=turretlaser1
 	amount=-1
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; GHANT JUMPGATE
 
 [navpoint]
 label=navpoint_south
 name=Navigation point South
-location=-932 -256 0
+location=-1288 -3 0
 
 [jumpgate]
 label=jumpgate_ghant
+location=-670 -992 8
+angles=0 50 0
 target=ghant:jumpgate_antwerp
 faction=colonies
-location=-950 -256 8
-yaw=0
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ALBION JUMPGATE
 
 [navpoint]
 label=navpoint_north
 name=Navigation point North
-location=1096 -256 0
+location=1344 -700 0
+angles=0 179 0
 
 [jumpgate]
 label=jumpgate_albion
+location=1124 -302 0
+angles=0 160 0
 target=albion:jumpgate_antwerp
 faction=colonies
-location=1124 -302 0
-yaw=-160
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; FINNMARK JUMPGATE
 
 [navpoint]
 label=navpoint_west
 name=Navigation point West
-location=420 1024 16
+location=692 1248 16
+angles=0 270 0
 
 [jumpgate]
 label=jumpgate_finnmark
+location=820 864 16
+angles=0 230 0
 target=finnmark:jumpgate_antwerp
 faction=colonies
-location=460 1056 16
-yaw=275
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; KRONENBADEN JUMPGATE
 
 [jumpgate]
 label=jumpgate_kronenbaden
+location=-920 548 -32
+angles=0 350 0
 target=kronenbaden:jumpgate_antwerp
-yaw=300
-location=-1024 900 32
 faction=colonies
 
 ; ------------------------------------------------------------------
@@ -242,6 +243,7 @@ faction=colonies
 
 [patrol]
 label=patrol_militia
+location=1232 -1408 0
 faction=militia
 profile=patrol
 
@@ -250,26 +252,26 @@ profile=patrol
 	ship=tiger
 	cannon=blaster1
 	amount=2
-	
+
 	[npc]
 	name=Militia
 	ship=tiger
 	cannon=blaster1
 	amount=3
-	
+
 	[waypoint]
 	target=helianthos
 	dock=yes
-	
+
 	[waypoint]
 	target=jumpgate_ghant
-	
+
 	[waypoint]
 	target=jumpgate_kronenbaden
-	
+
 	[waypoint]
 	target=jumpgate_finnmark
-	
+
 	[waypoint]
 	target=jumpgate_albion
 
@@ -278,6 +280,7 @@ profile=patrol
 
 [patrol]
 label=patrol_pirates
+location=1360 -1400 0
 faction=pirates
 profile=patrol
 
@@ -285,29 +288,30 @@ profile=patrol
 	name=Pirate
 	ship=raider
 	cannon=laser2
-	
+
 	[npc]
 	name=Pirate
 	ship=raider
 	cannon=laser1
 	amount=2
-	
+
 	[npc]
 	name=Pirate
 	ship=raider
 	cannon=laser1
 	amount=2
-	
+
 	[waypoint]
 	target=buccaneers
 	dock=yes
-	
+
 	[waypoint]
 	target=jumpgate_kronenbaden
-	
+
 	[waypoint]
 	target=buccaneers
 	dock=yes
-	
+
 	[waypoint]
 	target=jumpgate_finnmark
+
diff --git a/base/ini/zones/camorra.ini b/base/ini/zones/camorra.ini
index a82350e..c84628e 100644
--- a/base/ini/zones/camorra.ini
+++ b/base/ini/zones/camorra.ini
@@ -22,9 +22,11 @@ info=The Camorra system.
 
 [star]
 label=star
-location=1476 -1604 0
+name=class G star
+location=1700 -388 0
 angles=0 140 0
-color=1 0.2 0.2
+radius=102
+color=255 191 127
 
 [jumpgate]
 label=jumpgate_oran
@@ -36,8 +38,8 @@ faction=neutral
 [station]
 label=port_royal
 name=Port Royal
-location=1088 352 0
-angles=0 160 0
+location=-312 -432 0
+angles=0 60 0
 radius=12
 model=maps/pirate/port_royal
 faction=camorra
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 4874f30..60f5066 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -2,8 +2,7 @@
 ; finnmark.ini
 ; world description for the Finnmark system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -14,10 +13,11 @@ ambient=.1 .1 .12
 location=392 369 0
 ; faction
 faction=neutral
+
 ; zone information
 info=The Finnmark system.
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; STAR
 
 [star]
@@ -26,27 +26,28 @@ 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
+; [r g b] entity primary color, values in the 0-255 range
+color=221 224 255
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; PLANET FINNMARK
 
 [planet]
 label=finnmark
 name=planet Finnmark
+location=320 -60 0
+angles=0 130 0
+radius=70
 texture=planets/finnmark
 default=yes
 faction=miners
 ;override faction color
 color=1.0 1.0 1.0
-location=128 64 0
-radius=70
 dock=yes
+infoname=JMA headquarters
 
-infoname=Joint Miners Association headquarters
 info=As final act in a series of trade wars, the Headquarters of the Joint Miners Association was founded conveniently outside the jurisdiction and taxation of the colonies and the central planets.
 info=Nobody objected when the miners colonized this inhospitable frozen world and they tend to keep good relations with their customers. They're also prepared and capable to defend their interests when necessary.
 
@@ -76,44 +77,43 @@ info=Nobody objected when the miners colonized this inhospitable frozen world an
 	label=water
 	price=4
 	amount=-1
-	
-		
+
 	[weapon]
 	label=laser1
-	
+
 	[weapon]
 	label=laser2
-	
+
 	[weapon]
 	label=turretlaser1
-	
+
 	[weapon]
 	label=turretlaser2
-	
+
 	[weapon]
 	label=blaster1
-	
+
 	[weapon]
 	label=blaster2
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; KVALSUND MINING OPERATIONS
 
 [station]
 label=kvalsund
 name=Kvalsund
+location=-556 52 0
+angles=0 20 0
+radius=10
 model=maps/miners/kvalsund
 faction=miners
-location=-256 512 0
-radius=10
-yaw=-90
-
 infoname=Iron mining facility
+
 info=The Kvalsund mining asteroid.
 
 	[ship]
 	label=miningsurveyor
-	
+
 	[ship]
 	label=miningprotector
 
@@ -125,79 +125,79 @@ info=The Kvalsund mining asteroid.
 	label=water
 	price=10
 	amount=0
-	
+
 	[cargo]
 	label=liquor
 	price=260
 	amount=0
-	
+
 	[weapon]
 	label=laser1
-	
+
 	[weapon]
 	label=laser2
-	
+
 	[weapon]
 	label=turretlaser1
-	
+
 	[weapon]
 	label=blaster1
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ANTWERP JUMPGATE
 
 [navpoint]
 label=navpoint_east
 name=Navigation Point East
-location=-96 -560 0
+location=2 -644 0
+angles=0 90 0
 
 [jumpgate]
 label=jumpgate_antwerp
+location=-82 -725 4
+angles=0 95 0
 target=antwerp:jumpgate_finnmark
 faction=miners
-location=-96 -576 4
-yaw=95
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; KARELIA JUMPPOINT
 
 [navpoint]
 label=navpoint_north
 name=Navigation Point North
-location=616 512 0
+location=897 -1 0
 
 [jumppoint]
 label=jumppoint_karelia
+location=780 652 8
+angles=0 -135 0
 target=karelia:jumppoint_finnmark
-location=624 512 8
 
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 
 [entity]
 label=jumpgate_unfinished
 name=Jumpgate Finnmark -> Kronenbaden
-infoname=Jumpgate under construction
 location=-584 896 0
+radius=5.4
+infoname=Jumpgate under construction
 model=maps/common/jumpgate_construction
-yaw=0
 faction=miners
-radius=5.4
 
 [jumppoint]
 label=jumppoint_kronenbaden
-target=kronenbaden:jumppoint_finnmark
 location=-590 896 0
+target=kronenbaden:jumppoint_finnmark
 
 [station]
 label=jumpgate_construction
 name=Jumpgate Construction
+location=-572 902 0
+angles=0 -90 0
+radius=6
 infoname=Jumpgate construction site
 model=maps/colonial/outpost
-radius=6
 faction=miners
-location=-572 902 0
-yaw=-90
 
 	[cargo]
 	label=gateparts
@@ -209,20 +209,21 @@ yaw=-90
 	price=20
 	amount=0
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; CALEDONIA JUMPGATE
 
 [jumpgate]
 label=jumpgate_caledonia
+location=740 -824 -32
+angles=0 149 0
 target=caledonia:jumpgate_finnmark
-location=556 -960 -32
-yaw=120
 faction=neutral
 
 ; ------------------------------------------------------------------
 ; MINER TRADE ROUTE
 
 [patrol]
+location=964 -840 0
 profile=convoy
 faction=miners
 
@@ -232,7 +233,7 @@ faction=miners
 	cannon=laser2
 	turret=turretlaser2
 	amount=2
-	
+
 	[waypoint]
 	target=kvalsund
 	dock=yes
@@ -242,11 +243,12 @@ faction=miners
 	target=finnmark
 	dock=yes
 	cargo=water
-	
+
 ; ------------------------------------------------------------------
 ; MINER PATROL
 
 [patrol]
+location=968 -976 0
 profile=patrol
 faction=miners
 
@@ -255,29 +257,30 @@ faction=miners
 	ship=miningprotector
 	cannon=blaster2
 	amount=1
-	
+
 	[npc]
 	name=JMA defence force
 	ship=miningprotector
 	cannon=blaster1
 	amount=3
-	
+
 	[waypoint]
 	target=finnmark
 	dock=yes
 
 	[waypoint]
 	target=jumpgate_caledonia
-	
+
 	[waypoint]
 	target=jumpgate_antwerp
-	
+
 	[waypoint]
 	target=kvalsund
 	dock=yes
-	
+
 	[waypoint]
 	target=jumpgate_construction
-	
+
 	[waypoint]
 	target=jumppoint_karelia
+
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index e0acb76..dfcf5ed 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -66,14 +66,13 @@ texture=planets/ghant
 ; [float] rotation speed, in degrees per second
 rotationspeed=1
 dock=yes
-
 faction=merchants
 ; reset faction colors
 color=255 255 255
 colorsecond=255 255 255
-
 ; info text
 infoname=Merchants Association headquarters
+
 info=Despite its relatively unimportant strategic value, planet Ghant represents the political and economical
 info=heartland of the Independent Colonies. Most of this once mineral-rich world's natural resources have been
 info=depleted by intensive mining operations, but an extensive terraforming operation is slowly transforming the
@@ -158,9 +157,9 @@ model=maps/colonial/alexandria
 faction=colonies
 ; this is the default base where new players are docked
 default=yes
-
 ; info text
 infoname=Merchant outpost
+
 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,
 
@@ -246,7 +245,6 @@ faction=militia
 cannon=blaster1
 ; type of turrets
 turret=turretblaster1
-
 ; info text
 infoname=Colonial cruiser
 
@@ -299,8 +297,8 @@ location=-128 928 -32
 angles=0 225 0
 model=maps/colonial/regula
 color=0.4 0.7 0
-
 infoname=Niobium mining facility
+
 info=Regula station is the headquarters of the local niobium mining operation.
 
 	[ship]
@@ -331,8 +329,8 @@ template=storageunit
 label=regula_storage
 name=Storage unit
 location=-122 928 -32
-color=0.4 0.7 0
 angles=0 -90 0
+color=0.4 0.7 0
 
 ; ------------------------------------------------------------------
 ; KRONENBADEN JUMPGATE
@@ -351,7 +349,7 @@ faction=colonies
 [entity]
 label=ikarus
 name=Ikarus satellite
-location=64 -16 0
+location=320 -196 0
 angles=-15 120 0
 model=maps/colonial/ikarus
 faction=militia
@@ -387,12 +385,12 @@ angles=0 320 0
 target=warsaw:jumpgate_ghant
 faction=colonies
 
-
 ; ------------------------------------------------------------------
 ; MERCHANT TRADE ROUTE
 
 [patrol]
 label=convoy_merchants
+location=1192 -912 0
 faction=merchants
 profile=convoy
 
@@ -404,7 +402,7 @@ profile=convoy
 	cannon=laser1
 	; maximal amount of NPCs of this type to add
 	amount=3
-	
+
 	[waypoint]
 	target=alexandria
 	; dock at this waypoint
@@ -422,6 +420,7 @@ profile=convoy
 
 [patrol]
 label=patrol_militia
+location=1160 -1144 0
 faction=militia
 profile=patrol
 
@@ -429,30 +428,29 @@ profile=patrol
 	name=Militia
 	ship=tiger
 	cannon=blaster1
-	
+
 	[npc]
 	name=Militia
 	ship=tiger
 	cannon=blaster1
 	amount=3
-	
-	
+
 	[waypoint]
 	target=custodian
 	dock=yes
-	
+
 	[waypoint]
 	target=jumpgate_brogha
-	
+
 	[waypoint]
 	target=jumpgate_antwerp
-	
+
 	[waypoint]
 	target=jumpgate_kronenbaden
-		
+
 	[waypoint]
 	target=navpoint_origin
-	
+
 	[waypoint]
 	target=jumpgate_warsaw
-	
\ No newline at end of file
+