From cc18008d30a4e3b8cd83bb3c4732b5a8aee8d00d Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 3 Nov 2013 23:37:42 +0000
Subject: Added Camorra Syndicate factionm marked camorra and pirates factions
 as unlawfull.

---
 base/ini/factions.ini      | 17 +++++++++++++----
 base/ini/zones/camorra.ini |  4 ++--
 base/ini/zones/ghant.ini   | 24 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index df93078..ab33bc4 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -50,6 +50,13 @@ label=praetoria
 name=House Praetoria
 color=217 131 0
 
+
+[faction]
+label=dagon
+name=House Dagon
+color=0.2 0.5 0.2
+colorsecond=0.2 0.8 0.2
+
 [faction]
 label=miners
 name=Joint Miners Asssociation
@@ -75,12 +82,14 @@ label=pirates
 name=Pirates
 color=0.6 0.5 0.1
 colorsecond=0.2 0.2 0.2
+lawfull=false
 
 [faction]
-label=dagon
-name=House Dagon
-color=0.2 0.5 0.2
-colorsecond=0.2 0.8 0.2
+label=camorra
+name=Camorra Syndicate
+color=0.6 0.5 0.1
+colorsecond=0.2 0.2 0.2
+lawfull=false
 
 ; tsu-khan factions
 [faction]
diff --git a/base/ini/zones/camorra.ini b/base/ini/zones/camorra.ini
index 93eae22..a82350e 100644
--- a/base/ini/zones/camorra.ini
+++ b/base/ini/zones/camorra.ini
@@ -31,7 +31,7 @@ label=jumpgate_oran
 location=192 896 0
 angles=0 -90 0
 target=oran:jumpgate_camorra
-faction=rogue
+faction=neutral
 
 [station]
 label=port_royal
@@ -40,5 +40,5 @@ location=1088 352 0
 angles=0 160 0
 radius=12
 model=maps/pirate/port_royal
-faction=pirate
+faction=camorra
 
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 0366c25..5907bab 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -372,3 +372,27 @@ angles=0 320 0
 target=warsaw:jumpgate_ghant
 faction=colonies
 
+
+; ------------------------------------------------------------------
+; CONVOY ALEXANDRIA <-> REGULA
+
+[patrol]
+label=convoy1
+faction=merchants
+profile=convoy
+
+	[ship]
+	label=vector
+	
+	[ship]
+	label=vector
+
+	[waypoint]
+	target=alexandria
+	dock=yes
+	buy=crates
+
+	[waypoint]
+	target=regula
+	dock=yes
+	buy=niobium
-- 
cgit v1.2.3