Updated info names fo a number of stations, added Militia patrol to the Antwerp system.

4 files changed, 62 insertions, 13 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index f76fce8..c4c3e76 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -198,7 +198,8 @@ info=and a beam cannon mount to fight frigates and other small capital ships.
 
 [ship]
 label=custodian
-name=Custodian
+name=Custodian-class colonial cruiser
+npcname=Colonial cruiser
 template=ship_cruiser
 model=maps/colonial/custodian
 jumpdrive=yes
@@ -222,7 +223,8 @@ info=this carrier can deploy several wings of fighters to wherever conflict requ
 
 [ship]
 label=goliath
-name=Goliath
+name=Goliath-class colonial battleship
+npcname=Colonial battleship
 template=ship_battleship
 model=maps/colonial/goliath
 jumpdrive=yes
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 9de193a..dbd932e 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -227,3 +227,40 @@ yaw=300
 location=-1024 900 32
 faction=colonies
 
+; ------------------------------------------------------------------
+; MILITIA PATROL
+
+[patrol]
+label=patrol1
+faction=militia
+profile=patrol
+
+	[ship]
+	label=lancer
+	amount=1
+	
+	[ship]
+	label=tiger
+	amount=3
+	
+	[ship]
+	label=tiger
+	amount=3
+	
+	
+	[waypoint]
+	target=helianthos
+	dock=yes
+	
+	[waypoint]
+	target=jumpgate_ghant
+	dock=yes
+		
+	[waypoint]
+	target=ghant:custodian
+	dock=yes
+	
+	[waypoint]
+	target=ghant:jumpgate_antwerp
+	dock=yes
+	
\ No newline at end of file
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 63903a4..e86d7da 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -154,6 +154,7 @@ faction=colonies
 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,
 
@@ -236,6 +237,9 @@ location=-204 -656 32
 angles=0 305 0
 faction=militia
 
+; info text
+infoname=Colonial cruiser
+
 	[ship]
 	label=tiger
 
@@ -280,12 +284,13 @@ texture=planets/seymour
 
 [station]
 label=regula
-name=Regula Station
+name=Regula station
 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]
@@ -374,7 +379,7 @@ faction=colonies
 
 
 ; ------------------------------------------------------------------
-; CONVOY ALEXANDRIA <-> REGULA
+; MERCHANT TRADE ROUTE
 
 [patrol]
 label=convoy1
@@ -383,19 +388,23 @@ profile=convoy
 
 	[ship]
 	label=vector
+	; maximal amount of ships of this type
+	amount=3
 	
-	[ship]
-	label=vector
-
 	[waypoint]
 	target=alexandria
+	; dock at this waypoint
 	dock=yes
-	buy=crates
+	; cargo to buy at this waypoint
+	cargo=crates
 
 	[waypoint]
 	target=regula
 	dock=yes
-	buy=niobium
+	cargo=niobium
+
+; ------------------------------------------------------------------
+; MILITIA PATROL
 
 [patrol]
 label=patrol1
@@ -407,9 +416,7 @@ profile=patrol
 	
 	[ship]
 	label=tiger
-	
-	[ship]
-	label=tiger
+	amount=3
 	
 	[waypoint]
 	target=custodian
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
index 322ce77..b7f96fd 100644
--- a/base/ini/zones/hellas.ini
+++ b/base/ini/zones/hellas.ini
@@ -39,11 +39,14 @@ faction=praetoria
 
 [station]
 label=medusa
-name=Medusa gas mining facility
+name=Medusa outpost
 location=-608 -532 0
 angles=0 50 0
 radius=16
 model=maps/common/border_station_03
+
+infoname=Gas mining facility
+
 [star]
 label=star
 name=class M star