From 9f94cecb99a8cbf079ce252698d48ce098e23be4 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 7 Dec 2012 08:41:24 +0000
Subject: Renamed 'independent' faction to 'neutral', added 'rogue',
 'merchants' and 'mercenaries' factions, added zone files for Praetorian space
 and surrounding star systems, updated the Caledonia system.

---
 base/ini/factions.ini | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'base/ini/factions.ini')

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 9fe0a39..569fcda 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -20,6 +20,19 @@ name=Colonial Militia
 color=100 100 230
 colorsecond=192 192 40
 
+; used to indicate neutral space
+[faction]
+label=neutral
+name=Neutral
+color=0.7 0.7 0.9
+colorsecond=0.7 0.8 0.95
+
+; used to indicate rogue space
+[faction]
+label=rogue
+name=Rogue
+color=0.5 0.5 0.5
+
 [faction]
 ; faction label
 label=lindblade
@@ -35,6 +48,7 @@ colorsecond=0.75 0.35 0
 label=praetoria
 ; faction full name
 name=House Praetoria
+color=217 131 0
 
 [faction]
 label=miners
@@ -48,16 +62,14 @@ name=Central Research
 colorsecond=152 166 169
 color=106 95 87
 
-[faction]
-label=independent
-name=Independent
-color=0.7 0.7 0.9
-colorsecond=0.7 0.8 0.95
-
 [faction]
 label=mercenaries
 name=Mercenaries Guild
 
+[factiom]
+label=merchants
+name=Merchants Association
+
 [faction]
 label=pirates
 name=Pirates
-- 
cgit v1.2.3