Updated the Ghant system: added pirate depot, updated pirate and militia patrols,

moved merchants assosciation headquarters from planet Ghant to Alexandria.

1 files changed, 157 insertions, 27 deletions

diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 3c903df..8a5d1af 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -66,21 +66,18 @@ texture=planets/ghant
 ; [float] rotation speed, in degrees per second
 rotationspeed=1
 dock=yes
-faction=merchants
+faction=colonies
 ; reset faction colors
 color=255 255 255
 colorsecond=255 255 255
 ; info text
-infoname=Merchants Association headquarters
+infoname=Independent Colonies
 
 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
 info=arid climate into a more hospitable environment. This ongoing process requires regular imports of terraforming
 info=equipment and other related technologies.
-info=
-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
@@ -154,14 +151,19 @@ radius=8
 ; [string] entity model name
 model=maps/colonial/alexandria
 ; [string] faction this entity belongs to, sets faction colors
-faction=colonies
+faction=merchants
 ; this is the default base where new players are docked
 default=yes
 ; info text
-infoname=Merchant outpost
+infoname=Merchants Association headquarters
 
-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,
+info=The Merchants Association has located its headquarters in geosynchronous around planet Ghant,
+info=enjoying the favourable fiscal climate of the Independent Colonies. 
+info=
+info=While Alexandria outpost acts as a local hub for commerce and entertainment,
+info=it is also a popular transit zone for more shady operations,
+info=
+info=
 
 	; ship trade definitions
 	[ship]
@@ -215,7 +217,7 @@ label=alexandria_storage1
 name=Storage tanks
 location=-176 -720 32
 angles=0 45 0
-faction=colonies
+faction=merchants
 
 [entity]
 template=storagetanks
@@ -223,7 +225,7 @@ label=alexandria_storage2
 name=Storage tanks
 location=-172 -720 32
 angles=0 45 0
-faction=colonies
+faction=merchants
 
 ; ------------------------------------------------------------------
 ; BATTLESHIP CUSTODIAN
@@ -390,15 +392,14 @@ faction=colonies
 
 [station]
 label=kledden
-name=Kledden
+name=Kledden base
 location=1434 1265 -32
 angles=0 230 0
 radius=10
 model=maps/pirate/base_asteroid
 faction=pirates
 turret=turretlaser1
-infoname=Pirate base
-
+infoname=Pirate asteroid base
 
 	[ship]
 	label=raider
@@ -427,7 +428,7 @@ infoname=Pirate base
 
 [patrol]
 label=convoy_merchants
-location=1192 -912 0
+location=14 -887 0
 faction=merchants
 profile=convoy
 
@@ -457,11 +458,11 @@ profile=convoy
 
 [patrol]
 label=patrol_militia
-location=1160 -1144 0
+location=24 -736 0
 faction=militia
 profile=patrol
 
-	[npc]
+	 [npc]
 	name=Militia
 	ship=tiger
 	cannon=blaster1
@@ -477,26 +478,116 @@ profile=patrol
 	dock=yes
 
 	[waypoint]
-	target=jumpgate_brogha
+	target=jumpgate_kronenbaden
 
 	[waypoint]
-	target=jumpgate_antwerp
+	target=navpoint_origin
+
+	[waypoint]
+	target=jumpgate_warsaw
+
+	[waypoint]
+	target=navpoint_east
+
+; ------------------------------------------------------------------
+; PIRATE PATROL
+
+[patrol]
+label=patrol_pirates
+location=1444 1380 0
+faction=pirates
+profile=patrol
+
+	[npc]
+	name=Pirate
+	ship=raider
+	cannon=laser1
+
+	[npc]
+	name=Pirate
+	ship=raider
+	cannon=laser1
+	amount=2
+
+	[waypoint]
+	target=kledden
+	dock=yes
 
 	[waypoint]
 	target=jumpgate_kronenbaden
 
 	[waypoint]
-	target=navpoint_origin
+	target=navpoint_west
 
 	[waypoint]
 	target=jumpgate_warsaw
 
+	[waypoint]
+	target=navpoint_origin
+
+	[waypoint]
+	target=jumpgate_antwerp
+
+; ------------------------------------------------------------------
+; PIRATE BASE
+
+[station]
+label=wapperdam
+name=Wapperdam depot
+location=-1086 -711 -32
+angles=0 145 0
+radius=10
+model=maps/pirate/base_small
+faction=pirates
+turret=turretlaser1
+infoname=Pirate depot
+
+	[ship]
+	label=raider
+
+	[cargo]
+	label=liquor
+	price=415
+	amount=0
+
+	[cargo]
+	label=crates
+	price=50
+	amount=0
+
+	[cargo]
+	label=water
+	price=20
+	amount=0
+
+	[weapon]
+	label=laser1
+	amount=-1
+
+; ------------------------------------------------------------------
+; ORIGIN
+
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=-328 1600 0
+angles=0 270 0
+
+; ------------------------------------------------------------------
+; ORIGIN
+
+[navpoint]
+label=navpoint_east
+name=Navigation point East
+location=-324 -1536 0
+angles=0 90 0
+
 ; ------------------------------------------------------------------
 ; PIRATE PATROL
 
 [patrol]
 label=patrol_pirates
-location=1360 -1400 0
+location=-1100 -824 0
 faction=pirates
 profile=patrol
 
@@ -512,15 +603,54 @@ profile=patrol
 	amount=2
 
 	[waypoint]
-	target=kledden
+	target=wapperdam
 	dock=yes
-	
+
+	[waypoint]
+	target=navpoint_east
+
+	[waypoint]
+	target=jumpgate_brogha
+
 	[waypoint]
 	target=jumpgate_antwerp
-	
+
 	[waypoint]
-	target=kledden
+	target=jumpgate_warsaw
+
+; ------------------------------------------------------------------
+; MILITIA PATROL
+
+[patrol]
+label=patrol_militia
+location=28 -790 0
+faction=militia
+profile=patrol
+
+	 [npc]
+	name=Militia
+	ship=tiger
+	cannon=blaster1
+
+	[npc]
+	name=Militia
+	ship=tiger
+	cannon=blaster1
+	amount=3
+
+	[waypoint]
+	target=custodian
 	dock=yes
-	
+
 	[waypoint]
-	target=jumpgate_kronenbaden
+	target=jumpgate_brogha
+
+	[waypoint]
+	target=jumpgate_antwerp
+
+	[waypoint]
+	target=ikarus
+
+	[waypoint]
+	target=jumpgate_warsaw
+