Updated the FInnmark system, JMA ship updates.

5 files changed, 207 insertions, 98 deletions

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 619a2a3..9dd54f1 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -20,6 +20,8 @@ name=Colonial Militia
 color=100 100 230
 colorsecond=192 192 40
 
+info=The Colonial Militia protects the Independent Colonies.
+
 	[reputation]
 	faction=default
 	reputation=100
@@ -85,12 +87,20 @@ color=106 95 87
 label=mercenaries
 name=Mercenaries Guild
 
+	[reputation]
+	faction=default
+	reputation=0
+
 [faction]
 label=merchants
 name=Merchants Association
 color=24 132 8
 colorsecond=255 238 58
 
+	[reputation]
+	faction=default
+	reputation=0
+	
 [faction]
 label=pirates
 name=Pirates
@@ -98,6 +108,8 @@ color=0.6 0.5 0.1
 colorsecond=0.2 0.2 0.2
 lawfull=false
 
+info=Pirates are bad guys who want to steal your cargo.
+
 	[reputation]
 	faction=default
 	reputation=-100
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 7fb71f4..4c6499c 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -98,6 +98,7 @@ info=capable of outrunning many larger ships.
 [ship]
 label=scalar
 name=Micron Scalar
+npcname=Merchant
 template=ship_small
 model=maps/merchant/scalar
 jumpdrive=no
@@ -319,7 +320,8 @@ roll    = 55
 ; TODO move ship to 'research' faction
 ;
 label=tyson
-name=Tyson
+name=Tyson Deep-Space Explorer
+npcname=Explorer
 template=ship_frigate
 model=maps/colonial/tyson
 jumpdrive=yes
@@ -343,25 +345,20 @@ info=The Tyson-class science vessel is on the forefront of Colonial scientific r
 ; 		JOINT MINERS ASSOCIATION
 ; ------------------------------------------------------------------ ;
 
-[ship]
-label=miningsurveyer
-name=Mining Surveyer
-template=ship_small
-model=maps/miners/surveyor
-jumpdrive=no
+;<@megatog> miningsurveyor: fly around and 'scan' asteroids
 
-price	= 11500
-cargo	= 25
+;<@megatog> miningfreighter: actually delivers and trades ore/gas commodities
 
-thrust  = 1.9
-impulse = 10
-strafe  = 0.2
-turn    = 4
-roll    = 1.4
+;<@megatog> miningprotector: more mobile miningdefender; can engage in dogfights and usually flies alongside miningsurveyor
+;<@megatog> miningdefender: launches when hostiles detected around miningcruiser, takes position around mining operation and shoots enemies without moving
+;<@megatog> miningcruiser: miners mothership
+
+; ---- FREIGHTER --------------------------------------------------- ;
 
 [ship]
 label=miningfreighter
-name=Mining Freighter
+name=JMA Mining Freighter
+npcname=JMA transport
 template=ship_large
 model=maps/miners/freighter
 jumpdrive=no
@@ -375,72 +372,50 @@ strafe  = 1
 turn    = 150
 roll    = 14
 
-[ship]
-label=miningcruiser
-name=Mining Cruiser
-template=ship_cruiser
-model=maps/miners/cruiser
-jumpdrive=yes
-dock=yes
-
-price	= 1000000
-
-cargo	= 500
-armor	= 1500
-
-thrust  = 40
-impulse = 200
-strafe  = 2
-turn    = 14000
-roll    = 1400
+; ---- SURVEYOR ---------------------------------------------------- ;
 
 [ship]
-label=archer
-name=Archer
+label=miningsurveyor
+npcname=JMA Mining Surveyor
+npcname=JMA scout
 template=ship_small
-model=maps/mercenary/archer
+model=maps/miners/surveyor
 jumpdrive=no
 
-price=20000
-
-cargo	= 15
-armor	= 125
+price	= 11500
+cargo	= 25
 
-thrust	= 2.1
-impulse	= 10
-strafe	= 0.15
-turn	= 16
-roll	= 12
+thrust  = 1.9
+impulse = 10
+strafe  = 0.2
+turn    = 4
+roll    = 1.4
 
-info=The Archer was considered to be leap in technology by the Joint Miners Association, allowing for rapid exploration of mineral deposits. Featuring high maneuverability the Archer was capable of outrunning any threat, while having enough cargo-space to return with mineral samples.
-info=Unfortunately, the design revealed several sensor blind spots and as a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the sensor range since.
-info=The Archer is no longer mass-produced. Nearly all models have been retrofitted with entirely different sensor equipment based on the newer Longbow scout fighter. The old sensors are integral to the design of the Archer and thus cannot be easily switched out, so newer equipment has been simply crammed into the empty spaces of the hull.
+; ---- PROTECTOR --------------------------------------------------- ;
 
 [ship]
-label=longbow
-name=Longbow
+label=miningprotector
+name=Mining Protector
+npcname=JMA defence force
 template=ship_medium
-model=maps/mercenary/longbow
+model=maps/miners/protector
 jumpdrive=no
 
-price	= 45000
-
-cargo	= 30
-armor	= 250
-
-thrust=4.2
-impulse=25
-strafe=0.4
-turn=72
-roll=92
+price=14000
+cargo=15
 
-info=The replacement for the Archer scout ship. After the first costly mistake, the Joint Miners Association decided to outsource development to a trusted third-party contractor. As a result, the flaws in the ship design were corrected.
+thrust  = 3.9
+impulse = 20
+strafe  = 0.7
+turn    = 106
+roll    = 98
 
+; ---- DEFENDER ---------------------------------------------------- ;
 
 [ship]
-; TODO to be retired ?
 label=miningdefender
-name=Mining Defender
+name=JMA Mining Defender
+npcname=JMA defence force
 template=ship_small
 model=maps/miners/defender
 jumpdrive=no
@@ -454,22 +429,27 @@ strafe  = 0.2
 turn    = 18
 roll    = 8
 
+; ---- CRUISER ----------------------------------------------------- ;
+
 [ship]
-; TODO to be retired ?
-label=miningprotector
-name=Mining Protector
-template=ship_medium
-model=maps/miners/protector
-jumpdrive=no
+label=miningcruiser
+name=JMA Mining cruiser
+npcname=JMA cruiser
+template=ship_cruiser
+model=maps/miners/cruiser
+jumpdrive=yes
+dock=yes
 
-price=14000
-cargo=15
+price	= 1000000
 
-thrust  = 3.9
-impulse = 20
-strafe  = 0.7
-turn    = 106
-roll    = 98
+cargo	= 500
+armor	= 1500
+
+thrust  = 40
+impulse = 200
+strafe  = 2
+turn    = 14000
+roll    = 1400
 
 ; ------------------------------------------------------------------ ;
 ;		MERCENARY
@@ -538,6 +518,44 @@ info=The Enforcer is a classic space combat vessel originally mass-produced by t
 info=The design was copied shortly after mass production by pirates, but most of the resulting knockoff ships lacked the unique engine that the Enforcer was known for. Eventually the blueprints were recovered from a military raid on a pirate convoy.
 info=At first glance, the Enforcer has little distinctive features compared to most recent ship designs. However, one feature it has that other ships do not is its innovative engine design. The Enforcer's twin fusion engines are actually fully-fledged impulse drives, which can sustain a nuclear reaction when thrust is lowered significantly. This allows the engine to be used for conventional thrust as well as impulse cruise speed. Unfortunately, this design is not allowed on newer ships because it tends to explode extremely violently when shot down in combat, or otherwise in the event of a failure if extreme caution is not used during running maintenance.
 
+[ship]
+label=archer
+name=Archer
+template=ship_small
+model=maps/mercenary/archer
+jumpdrive=no
+
+price=20000
+
+cargo	= 15
+armor	= 125
+
+thrust	= 2.1
+impulse	= 10
+strafe	= 0.15
+turn	= 16
+roll	= 12
+
+
+[ship]
+label=longbow
+name=Longbow
+template=ship_medium
+model=maps/mercenary/longbow
+jumpdrive=no
+
+price	= 45000
+
+cargo	= 30
+armor	= 250
+
+thrust=4.2
+impulse=25
+strafe=0.4
+turn=72
+roll=92
+
+
 ; ------------------------------------------------------------------ ;
 ;		INDEPENDENT
 ; ------------------------------------------------------------------ ;
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index d2a61b6..09ce22b 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -45,21 +45,20 @@ color=1.0 1.0 1.0
 location=128 64 0
 radius=70
 dock=yes
-info=As final act in a series of trade wars, the Headquarters of the Joint Miners Asssociation was founded conveniently outside the jurisdiction and taxation of the colonies and the central planets.
+
+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.
 
 	[ship]
-	label=archer
+	label=miningfreighter
 
 	[ship]
-	label=longbow
+	label=miningdefender
 
 	[ship]
 	label=miningcruiser
 
-	[ship]
-	label=miningfreighter
-
 	[cargo]
 	label=iron
 	price=75
@@ -91,7 +90,10 @@ radius=10
 yaw=-90
 
 	[ship]
-	label=miningsurveyer
+	label=miningsurveyor
+	
+	[ship]
+	label=miningprotector
 
 	[cargo]
 	label=iron
@@ -104,6 +106,8 @@ yaw=-90
 	
 	[cargo]
 	label=liquor
+	price=260
+	amount=0
 
 ; ------------------------------------------------------------------ 
 ; ANTWERP JUMPGATE
@@ -137,7 +141,7 @@ location=624 512 8
 ; ------------------------------------------------------------------ 
 
 [entity]
-label=jumpgate_unfinished
+label=Jumpgate Finnmark -> Kronenbadeb
 name=Unfinished Jumpgate
 location=-584 896 0
 model=maps/common/jumpgate_construction
@@ -145,6 +149,8 @@ yaw=0
 faction=miners
 radius=5.4
 
+infoname=Jumpgate under construction
+
 [jumppoint]
 label=jumppoint_kronenbaden
 target=kronenbaden:jumppoint_finnmark
@@ -153,6 +159,7 @@ location=-590 896 0
 [station]
 label=jumpgate_construction
 name=Jumpgate Construction
+infoname=Jumpgate construction site
 model=maps/colonial/outpost
 radius=6
 faction=miners
@@ -177,4 +184,60 @@ label=jumpgate_caledonia
 target=caledonia:jumpgate_finnmark
 location=556 -960 -32
 yaw=120
+faction=neutral
+
+; ------------------------------------------------------------------
+; MINER TRADE ROUTE
+
+[patrol]
+profile=convoy
 faction=miners
+
+	[ship]
+	label=miningfreighter
+	amount=2
+	
+	[waypoint]
+	target=kvalsund
+	dock=yes
+	cargo=iron
+
+	[waypoint]
+	target=finnmark
+	dock=yes
+	cargo=water
+	
+; ------------------------------------------------------------------
+; MINER PATROL
+
+[patrol]
+profile=patrol
+faction=miners
+
+	[ship]
+	label=miningprotector
+	amount=2
+	
+	[ship]
+	label=miningprotector
+	amount=2
+	
+	[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_finnmark
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 4c532b2..bec3898 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -68,6 +68,7 @@ rotationspeed=1
 dock=yes
 
 ; 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
diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini
index 65fee33..a530cda 100644
--- a/base/ini/zones/kronenbaden.ini
+++ b/base/ini/zones/kronenbaden.ini
@@ -35,7 +35,7 @@ faction=colonies
 ; set color to white, otherwise faction color will be used
 color=1.0 1.0 1.0
 dock=yes
-info=Baden is an agricultural planet.
+info=Planet Baden is a lush agricultural planet.
 
 	[cargo]
 	label=liquor
@@ -44,7 +44,7 @@ info=Baden is an agricultural planet.
 
 	[cargo]
 	label=water
-	price=8
+	price=5
 	amount=-1
 	
 	[ship]
@@ -63,6 +63,7 @@ faction=colonies
 ; set color to white
 color=1.0 1.0 1.0
 dock=yes
+info=Planet Krone is an industrial planet with a harsh climate.
 
 	[cargo]
 	label=gateparts
@@ -70,25 +71,36 @@ dock=yes
 	amount=-1
 	
 	[cargo]
-	label=water
-	price=12
-	amount=-1
+	label=liquor
+	price=255
+	amount=0
 
 	[cargo]
-	label=diamonds
+	label=iron
+	price=125
 	amount=0
 	
 	[cargo]
-	label=liquor
-	price=255
-	amount=-1
-
+	label=niobium
+	price=215
+	amount=0
 	
 	[cargo]
 	label=gold
 	price=1275
 	amount=0
 	
+	[cargo]
+	label=water
+	price=12
+	amount=0
+
+	[ship]
+	label=vector
+	
+	[ship]
+	label=scalar
+
 ; ------------------------------------------------------------------ 
 ; ANTWERP JUMPGATE
 
@@ -124,12 +136,14 @@ faction=colonies
 ; FINNMARK JUMPGATE CONSTRUCTION SITE
 
 [entity]
-label=jumpgate_finnmark
+label=jumpgate_unfinished
 name=Jumpgate Kronenbaden -> Finnmark
 location=1380 356 8
-model=maps/colonial/jumpgate
+model=maps/common/jumpgate_construction
 yaw=180
 faction=colonies
+radius=5.4
+infoname=JUmpgate under construction
 
 [jumppoint]
 label=jumppoint_finnmark
@@ -138,7 +152,8 @@ location=1365 356 8
 
 [station]
 label=jumpgate_construction
-name=Jumpgate construction site
+name=Jumpgate construction
+infoname=Jumpgate construction site
 model=maps/colonial/outpost
 radius=6
 faction=colonies