Removed deprecated keys,

converted patrols to the new syntax,
added npc weapon types.

4 files changed, 101 insertions, 39 deletions

diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 7b58428..a0f3ff0 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -235,15 +235,18 @@ label=patrol_militia
 faction=militia
 profile=patrol
 
-	[ship]
-	label=tiger
-	amount=3
+	[npc]
+	name=Militia
+	ship=tiger
+	cannon=blaster1
+	amount=2
 	
-	[ship]
-	label=tiger
+	[npc]
+	name=Militia
+	ship=tiger
+	cannon=blaster1
 	amount=3
 	
-	
 	[waypoint]
 	target=helianthos
 	dock=yes
@@ -268,16 +271,21 @@ label=patrol_pirates
 faction=pirates
 profile=patrol
 
-	[ship]
-	label=raider
-	amount=2
+	[npc]
+	name=Pirate
+	ship=raider
+	cannon=laser2
 	
-	[ship]
-	label=raider
+	[npc]
+	name=Pirate
+	ship=raider
+	cannon=laser1
 	amount=2
 	
-	[ship]
-	label=raider
+	[npc]
+	name=Pirate
+	ship=raider
+	cannon=laser1
 	amount=2
 	
 	[waypoint]
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 09ce22b..4874f30 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -76,19 +76,41 @@ 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 mining operations
+name=Kvalsund
 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
 	
@@ -108,6 +130,18 @@ yaw=-90
 	label=liquor
 	price=260
 	amount=0
+	
+	[weapon]
+	label=laser1
+	
+	[weapon]
+	label=laser2
+	
+	[weapon]
+	label=turretlaser1
+	
+	[weapon]
+	label=blaster1
 
 ; ------------------------------------------------------------------ 
 ; ANTWERP JUMPGATE
@@ -141,16 +175,15 @@ location=624 512 8
 ; ------------------------------------------------------------------ 
 
 [entity]
-label=Jumpgate Finnmark -> Kronenbadeb
-name=Unfinished Jumpgate
+label=jumpgate_unfinished
+name=Jumpgate Finnmark -> Kronenbaden
+infoname=Jumpgate under construction
 location=-584 896 0
 model=maps/common/jumpgate_construction
 yaw=0
 faction=miners
 radius=5.4
 
-infoname=Jumpgate under construction
-
 [jumppoint]
 label=jumppoint_kronenbaden
 target=kronenbaden:jumppoint_finnmark
@@ -193,8 +226,11 @@ faction=neutral
 profile=convoy
 faction=miners
 
-	[ship]
-	label=miningfreighter
+	[npc]
+	name=JMA transport
+	ship=miningfreighter
+	cannon=laser2
+	turret=turretlaser2
 	amount=2
 	
 	[waypoint]
@@ -214,13 +250,17 @@ faction=miners
 profile=patrol
 faction=miners
 
-	[ship]
-	label=miningprotector
-	amount=2
+	[npc]
+	name=JMA defence force
+	ship=miningprotector
+	cannon=blaster2
+	amount=1
 	
-	[ship]
-	label=miningprotector
-	amount=2
+	[npc]
+	name=JMA defence force
+	ship=miningprotector
+	cannon=blaster1
+	amount=3
 	
 	[waypoint]
 	target=finnmark
@@ -240,4 +280,4 @@ faction=miners
 	target=jumpgate_construction
 	
 	[waypoint]
-	target=jumppoint_finnmark
+	target=jumppoint_karelia
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index bec3898..1c45e7b 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -387,9 +387,13 @@ label=convoy_merchants
 faction=merchants
 profile=convoy
 
-	[ship]
-	label=vector
-	; maximal amount of ships of this type
+	[npc]
+	name=Merchant
+	; ship model used by this NPC type
+	ship=vector
+	; the type of cannon this NPC type will use
+	cannon=laser1
+	; maximal amount of NPCs of this type to add
 	amount=3
 	
 	[waypoint]
@@ -412,13 +416,18 @@ label=patrol_militia
 faction=militia
 profile=patrol
 
-	[ship]
-	label=tiger
+	[npc]
+	name=Militia
+	ship=tiger
+	cannon=blaster1
 	
-	[ship]
-	label=tiger
+	[npc]
+	name=Militia
+	ship=tiger
+	cannon=blaster1
 	amount=3
 	
+	
 	[waypoint]
 	target=custodian
 	dock=yes
diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini
index a530cda..654aa40 100644
--- a/base/ini/zones/kronenbaden.ini
+++ b/base/ini/zones/kronenbaden.ini
@@ -138,12 +138,12 @@ faction=colonies
 [entity]
 label=jumpgate_unfinished
 name=Jumpgate Kronenbaden -> Finnmark
+infoname=Jumpgate under construction
 location=1380 356 8
 model=maps/common/jumpgate_construction
 yaw=180
 faction=colonies
 radius=5.4
-infoname=JUmpgate under construction
 
 [jumppoint]
 label=jumppoint_finnmark
@@ -178,11 +178,16 @@ label=convoy_merchants
 faction=merchants
 profile=convoy
 
-	[ship]
-	label=galaxy
+	[npc]
+	name=Merchant transport
+	ship=galaxy
+	cannon=laser1
+	turret=turretlaser1
 	
-	[ship]
-	label=vector
+	[npc]
+	name=Merchant
+	ship=vector
+	cannon=blaster1
 	; maximal amount of ships of this type
 	amount=2