Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-03 23:37:42 +0000
committerStijn Buys <ingar@osirion.org>2013-11-03 23:37:42 +0000
commitcc18008d30a4e3b8cd83bb3c4732b5a8aee8d00d (patch)
tree92888d90974f0f113fd3f597d69bf4328a13e969
parentd6fd32bc9fc6dfda35a47860d81c704f9fd2c6f5 (diff)
Added Camorra Syndicate factionm
marked camorra and pirates factions as unlawfull.
-rw-r--r--base/ini/factions.ini17
-rw-r--r--base/ini/zones/camorra.ini4
-rw-r--r--base/ini/zones/ghant.ini24
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