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>2010-11-09 13:47:49 +0000
committerStijn Buys <ingar@osirion.org>2010-11-09 13:47:49 +0000
commit525363e1fc64dcfd616eb6e2fb854478faf834e0 (patch)
tree4e7de57d868fd2518582a07bb293345ce162cbd5 /base
parente0a1f7b9f41203cca6acf2186992cfc1fb84ebb9 (diff)
renamed the Albion system to Caledonia,
added Iron to Alexandria's cargo list
Diffstat (limited to 'base')
-rw-r--r--base/ini/world.ini2
-rw-r--r--base/ini/zones/albion.ini31
-rw-r--r--base/ini/zones/anara.ini11
-rw-r--r--base/ini/zones/caledonia.ini51
-rw-r--r--base/ini/zones/finnmark.ini2
-rw-r--r--base/ini/zones/ghant.ini16
-rw-r--r--base/ini/zones/karelia.ini26
7 files changed, 93 insertions, 46 deletions
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 5db9742..7cb218d 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -22,7 +22,7 @@ zone=anara
zone=lindblade
zone=dover
zone=burton
-zone=albion
+zone=caledonia
; tsu-khan space
zone=kiana
diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
deleted file mode 100644
index 0716560..0000000
--- a/base/ini/zones/albion.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-;
-; albion.ini
-; world description for the Albion system
-;
-
-; ------------------------------------------------------------------
-; ZONE IDENTIFICATION
-
-[zone]
-name=Albion system
-
-
-; ------------------------------------------------------------------
-; ANARA JUMPGATE
-
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=256 1024 16
-model=maps/static/navpoint
-color=0.5 0.1 0.1
-
-[jumpgate]
-label=jumpgate_anara
-name=Jumpgate Albion -> Anara
-model=maps/pirate/jumpgate
-target=anara:jumpgate_albion
-color=0.5 0.1 0.1
-location=384 1056 16
-direction=300
-info=Jumpgate to the Anara system. \ No newline at end of file
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index 60f6db3..61c7ed3 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -99,7 +99,7 @@ location=128 512 0
model=maps/static/navpoint
; ------------------------------------------------------------------
-; ALBION JUMPGATE
+; CALEDONIA JUMPGATE
[navpoint]
label=navpoint_east
@@ -108,15 +108,15 @@ location=128 -768 0
model=maps/static/navpoint
[jumpgate]
-label=jumpgate_albion
-name=Jumpgate Anara -> Albion
+label=jumpgate_caledonia
+name=Jumpgate Anara -> Caledonia
model=maps/colonial/jumpgate
-target=albion:jumpgate_anara
+target=caledonia:jumpgate_anara
color=106 95 87
colorsecond=152 166 169
location=120 -760 0
direction=95
-info=Jumpgate to the Albion system.
+info=Jumpgate to the Caledonia system.
; ------------------------------------------------------------------
; KARELIA JUMPPOINT
@@ -132,4 +132,5 @@ label=jumppoint_karelia
name=Jumppoint Anara -> Karelia
target=karelia:jumppoint_anara
location=-524 0 64
+direction=0
info=Jumppoint to the Karelia system.
diff --git a/base/ini/zones/caledonia.ini b/base/ini/zones/caledonia.ini
new file mode 100644
index 0000000..cc3c04a
--- /dev/null
+++ b/base/ini/zones/caledonia.ini
@@ -0,0 +1,51 @@
+;
+; caledonia.ini
+; world description for the Caledonia system
+;
+
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+
+[zone]
+name=Caledonia system
+
+
+; ------------------------------------------------------------------
+; ANARA JUMPGATE
+
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=256 1024 16
+model=maps/static/navpoint
+color=0.5 0.1 0.1
+
+[jumpgate]
+label=jumpgate_anara
+name=Jumpgate Caledonia -> Anara
+model=maps/pirate/jumpgate
+target=anara:jumpgate_caledonia
+color=0.5 0.1 0.1
+location=384 1056 16
+direction=300
+info=Jumpgate to the Anara system.
+
+; ------------------------------------------------------------------
+; KARELIA JUMPPOINT
+
+[navpoint]
+label=navpoint_south
+name=Navigation point South
+location=-512 0 32
+model=maps/static/navpoint
+color=0.5 0.1 0.1
+
+[jumpgate]
+label=jumppoint_karelia
+name=Jumpgate Caledonia -> Karelia
+model=maps/pirate/jumpgate
+target=karelia:jumppoint_caledonia
+color=0.5 0.1 0.1
+location=-524 0 32
+direction=0
+info=Jumppoint to the Karelia system.
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 2bbac9a..564e0a9 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -54,7 +54,7 @@ info=Nobody objected when the miners colonized this inhospitable frozen world an
[cargo]
label=iron
- price=50
+ price=75
[cargo]
label=liquor
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 049a9be..4c2bcf0 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -100,18 +100,26 @@ info=Alexandria outpost serves as a commercial and entertainment centre for the
label=crates
; price this base sells and busy the cargo at
price=25
- ; initial amount, -1 means limitless supply, 0 means this base only buys this cargo
+ ; initial amount, -1 means unlimited supply
amount=-1
[cargo]
+ label=liquor
+ price=325
+ ; limited initial supply
+ amount=50
+
+ [cargo]
label=niobium
price=200
+ ; no initial supply
amount=0
[cargo]
- label=liquor
- price=325
- amount=5
+ label=iron
+ price=100
+ ; no initial supply
+ amount=0
[entity]
label=alexandria_storage1
diff --git a/base/ini/zones/karelia.ini b/base/ini/zones/karelia.ini
index fa0b3fa..c692ba8 100644
--- a/base/ini/zones/karelia.ini
+++ b/base/ini/zones/karelia.ini
@@ -14,13 +14,14 @@ sky=sky09
label=navpoint_north
name=Navigation Point North
model=maps/static/navpoint
-location=512 0 -64
+location=752 0 -64
[jumppoint]
label=jumppoint_anara
name=Jumppoint Karelia -> Anara
target=anara:jumppoint_karelia
-location=524 0 64
+location=764 0 64
+direction=180
; ------------------------------------------------------------------
; FINNMARK JUMPPOINT
@@ -29,10 +30,27 @@ location=524 0 64
label=navpoint_south
name=Navigation Point South
model=maps/static/navpoint
-location=-512 0 -64
+location=-752 0 -64
[jumppoint]
label=jumppoint_finnmark
name=Jumppoint Karelia -> Finnmark
target=finnmark:jumppoint_karelia
-location=-524 0 64
+location=-764 0 64
+direction=0
+
+; ------------------------------------------------------------------
+; CALEDONIA JUMPPOINT
+
+[navpoint]
+label=navpoint_east
+name=Navigation Point East
+model=maps/static/navpoint
+location=-96 -500 12
+
+[jumppoint]
+label=jumppoint_caledonia
+name=Jumppoint Karelia -> Caledonia
+target=caledonia:jumppoint_karelia
+location=-96 -512 12
+direction=80