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-07 22:51:08 +0000
committerStijn Buys <ingar@osirion.org>2013-11-07 22:51:08 +0000
commit190a53eda5773fa431233726fab06ab8b135576b (patch)
tree31280a2e1de91ed4bc06047f954376c71690dae7
parentcbd0cad9e37a1285a8da4a01702dcf7923c2ecc0 (diff)
Updated NPC names for the Galaxy and the Wagon,
updated the Kronenbaden system.
-rw-r--r--base/ini/ships.ini2
-rw-r--r--base/ini/zones/kronenbaden.ini59
2 files changed, 53 insertions, 8 deletions
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 8348b72..7fb71f4 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -274,6 +274,7 @@ info=
[ship]
label=galaxy
name=Galaxy
+npcname=Merchant transport
template=ship_large
model=maps/independent/galaxy
jumpdrive=yes
@@ -294,6 +295,7 @@ roll = 50
[ship]
label=wagon
name=Wagon
+npcname=Merchant transport
template=ship_large
model=maps/colonial/wagon
jumpdrive=yes
diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini
index d2e8ce1..65fee33 100644
--- a/base/ini/zones/kronenbaden.ini
+++ b/base/ini/zones/kronenbaden.ini
@@ -48,7 +48,7 @@ info=Baden is an agricultural planet.
amount=-1
[ship]
- label=wagon
+ label=galaxy
; ------------------------------------------------------------------
; PLANET KRONE
@@ -65,19 +65,30 @@ color=1.0 1.0 1.0
dock=yes
[cargo]
+ label=gateparts
+ price=1245
+ amount=-1
+
+ [cargo]
+ label=water
+ price=12
+ amount=-1
+
+ [cargo]
label=diamonds
amount=0
[cargo]
+ label=liquor
+ price=255
+ amount=-1
+
+
+ [cargo]
label=gold
price=1275
amount=0
-
- [cargo]
- label=water
- price=8
- amount=-1
-
+
; ------------------------------------------------------------------
; ANTWERP JUMPGATE
@@ -127,7 +138,7 @@ location=1365 356 8
[station]
label=jumpgate_construction
-name=Jumpgate Construction Site
+name=Jumpgate construction site
model=maps/colonial/outpost
radius=6
faction=colonies
@@ -144,3 +155,35 @@ yaw=90
price=25
amount=0
+; ------------------------------------------------------------------
+; MERCHANT TRADE ROUTE
+
+[patrol]
+label=convoy_merchants
+faction=merchants
+profile=convoy
+
+ [ship]
+ label=galaxy
+
+ [ship]
+ label=vector
+ ; maximal amount of ships of this type
+ amount=2
+
+ [waypoint]
+ target=baden
+ ; dock at this waypoint
+ dock=yes
+ ; cargo to buy at this waypoint
+ cargo=liquor
+
+ [waypoint]
+ target=krone
+ dock=yes
+ cargo=gateparts
+
+ [waypoint]
+ target=jumpgate_construction
+ dock=yes
+ cargo=water