Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-07 13:41:29 +0000
committerStijn Buys <ingar@osirion.org>2013-11-07 13:41:29 +0000
commit9928db16c3e0889f9268a296469b0b28765b5bbd (patch)
tree527d106acc73865abc5bbb9d1dde414fafc9de66 /base
parent36a4d8ec16bbce6ba1e553db7597fd62d2f6f271 (diff)
Added pirate patrol to the Antwerp system, reverted militia patrol to a local one,
added faction reputation for testing purposes.
Diffstat (limited to 'base')
-rw-r--r--base/ini/factions.ini16
-rw-r--r--base/ini/ships.ini2
-rw-r--r--base/ini/zones/antwerp.ini49
-rw-r--r--base/ini/zones/ghant.ini4
4 files changed, 59 insertions, 12 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index f3c48a1..619a2a3 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -20,6 +20,14 @@ name=Colonial Militia
color=100 100 230
colorsecond=192 192 40
+ [reputation]
+ faction=default
+ reputation=100
+
+ [reputation]
+ faction=pirates
+ reputation=-100
+
; used to indicate neutral space
[faction]
label=neutral
@@ -33,6 +41,10 @@ label=rogue
name=Rogue
color=0.5 0.5 0.5
+ [reputation]
+ faction=default
+ reputation=-100
+
[faction]
; faction label
label=lindblade
@@ -86,6 +98,10 @@ color=0.6 0.5 0.1
colorsecond=0.2 0.2 0.2
lawfull=false
+ [reputation]
+ faction=default
+ reputation=-100
+
[faction]
label=camorra
name=Camorra Syndicate
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index c4c3e76..8348b72 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -940,6 +940,7 @@ info=It is based upon the original heavy cruiser design that was used to win the
[ship]
label=raider
name=Raider
+npcname=Pirate
template=ship_medium
model=maps/pirate/raider
jumpdrive=no
@@ -958,6 +959,7 @@ info=Many pirate factions cover the surfaces of their Raiders with spikes for mo
[ship]
label=jaguar
name=Jaguar
+npcname=Pirate
template=ship_large
model=maps/pirate/jaguar
jumpdrive=no
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index dbd932e..7b58428 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -231,15 +231,11 @@ faction=colonies
; MILITIA PATROL
[patrol]
-label=patrol1
+label=patrol_militia
faction=militia
profile=patrol
[ship]
- label=lancer
- amount=1
-
- [ship]
label=tiger
amount=3
@@ -254,13 +250,46 @@ profile=patrol
[waypoint]
target=jumpgate_ghant
- dock=yes
-
+
+ [waypoint]
+ target=jumpgate_kronenbaden
+
+ [waypoint]
+ target=jumpgate_finnmark
+
+ [waypoint]
+ target=jumpgate_albion
+
+; ------------------------------------------------------------------
+; PIRATE PATROL
+
+[patrol]
+label=patrol_pirates
+faction=pirates
+profile=patrol
+
+ [ship]
+ label=raider
+ amount=2
+
+ [ship]
+ label=raider
+ amount=2
+
+ [ship]
+ label=raider
+ amount=2
+
[waypoint]
- target=ghant:custodian
+ target=buccaneers
dock=yes
[waypoint]
- target=ghant:jumpgate_antwerp
+ target=jumpgate_kronenbaden
+
+ [waypoint]
+ target=buccaneers
dock=yes
- \ No newline at end of file
+
+ [waypoint]
+ target=jumpgate_finnmark
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index e86d7da..4c532b2 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -382,7 +382,7 @@ faction=colonies
; MERCHANT TRADE ROUTE
[patrol]
-label=convoy1
+label=convoy_merchants
faction=merchants
profile=convoy
@@ -407,7 +407,7 @@ profile=convoy
; MILITIA PATROL
[patrol]
-label=patrol1
+label=patrol_militia
faction=militia
profile=patrol