From 76e3413a1ce7f4da8e0e7d3ae5ee4e0014ee8844 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 24 Aug 2014 22:22:29 +0000
Subject: Faction reputation updates, renamed JMA to Miners Union.

---
 base/ini/factions.ini       | 10 +++++++++-
 base/ini/zones/finnmark.ini | 10 +++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'base/ini')

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 0e2ca28..28895bc 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -81,6 +81,10 @@ colorsecond=255 238 58
 	[reputation]
 	faction=default
 	reputation=25
+
+	[reputation]
+	faction=pirates
+	reputation=-100
 	
 ; ------------------------------------------------------------------
 ; HOUSE LINDBLADE
@@ -183,7 +187,7 @@ colorsecond=0.2 0.8 0.2
 	
 [faction]
 label=miners
-name=JMA
+name=Miners Union
 color=106 95 87
 colorsecond=152 166 169
 
@@ -228,6 +232,10 @@ info=Pirates are bad guys who want to steal your cargo.
 	faction=courier
 	reputation=-100
 
+	[reputation]
+	faction=merchants
+	reputation=-100
+
 [faction]
 label=camorra
 name=Camorra Syndicate
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index d405792..9df8b8f 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -46,9 +46,9 @@ faction=miners
 ;override faction color
 color=1.0 1.0 1.0
 dock=yes
-infoname=JMA headquarters
+infoname=Miners Union 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=As final act in a series of trade wars, the headquarters of the Miners Union 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]
@@ -228,7 +228,7 @@ profile=convoy
 faction=miners
 
 	[npc]
-	name=JMA transport
+	name=Miners Union transport
 	ship=miningfreighter
 	cannon=laser2
 	turret=turretlaser2
@@ -253,13 +253,13 @@ profile=patrol
 faction=miners
 
 	[npc]
-	name=JMA defence force
+	name=Miners Union scout
 	ship=miningprotector
 	cannon=blaster2
 	amount=1
 
 	[npc]
-	name=JMA defence force
+	name=Miners Union scout
 	ship=miningprotector
 	cannon=blaster1
 	amount=3
-- 
cgit v1.2.3