Starsystem updates.

1 files changed, 61 insertions, 57 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
+