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-12 19:52:09 +0000
committerStijn Buys <ingar@osirion.org>2010-11-12 19:52:09 +0000
commitf618e2c52780d08db2c5e88257f56ef54724c57d (patch)
tree4335a821b23ffeaa2c42e4f98e2e4898e7c9bc5a /base
parentead4444b17fbe671ce47dce1aca85160bb91c392 (diff)
removed unnecessary jumpgate descritptions,
minor updates to factions and templates
Diffstat (limited to 'base')
-rw-r--r--base/ini/factions.ini7
-rw-r--r--base/ini/templates.ini6
-rw-r--r--base/ini/zones/antwerp.ini14
-rw-r--r--base/ini/zones/finnmark.ini7
-rw-r--r--base/ini/zones/ghant.ini10
5 files changed, 19 insertions, 25 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index fd63dcb..4d5df22 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -30,6 +30,12 @@ color=0.5 0.1 0.1
colorsecond=0.75 0.35 0
[faction]
+; faction label
+label=praetoria
+; faction full name
+name=House Praetoria
+
+[faction]
label=miners
name=Joint Miners Asssociation
color=106 95 87
@@ -40,4 +46,3 @@ label=pirates
name=Pirates
color=158 0 255
colorsecond=140 140 180
-
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index fb869be..f1d8f59 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -13,7 +13,7 @@ radius=0.25
[template]
label=cargopod
model=maps/cargo/pod
-radius=0.25
+radius=0.1
[template]
label=ship_small
@@ -28,9 +28,9 @@ label=ship_large
radius=1
[template]
-label=cruiser
+label=ship_cruiser
radius=2
[template]
-label=battleship
+label=ship_battleship
radius=2
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index b880405..4bbd9f0 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -79,12 +79,12 @@ faction=pirates
[navpoint]
label=navpoint_south
name=Navigation point South
-location=-1024 0 0
model=maps/static/navpoint
+location=-1024 0 0
+
[jumpgate]
label=jumpgate_ghant
-name=Jumpgate Antwerp -> Ghant
model=maps/pirate/jumpgate
target=ghant:jumpgate_antwerp
faction=pirates
@@ -97,18 +97,16 @@ direction=0
[navpoint]
label=navpoint_north
name=Navigation point North
-location=1096 -256 0
model=maps/static/navpoint
+location=1096 -256 0
[jumpgate]
label=jumpgate_dover
-name=Jumpgate Antwerp -> Dover
model=maps/colonial/jumpgate
target=dover:jumpgate_antwerp
+faction=colonies
location=1124 -302 0
direction=300
-faction=colonies
-info=Jumpgate to the Dover system.
; ------------------------------------------------------------------
; FINNMARK JUMPGATE
@@ -121,10 +119,8 @@ model=maps/static/navpoint
[jumpgate]
label=jumpgate_finnmark
-name=Jumpgate Antwerp -> Finnmark
model=maps/colonial/jumpgate
target=finnmark:jumpgate_antwerp
+faction=colonies
location=384 1056 16
direction=275
-faction=colonies
-info=Jumpgate to the Finnmark system.
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 41251ea..aa42d94 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -76,13 +76,11 @@ model=maps/static/navpoint
[jumpgate]
label=jumpgate_antwerp
-name=Jumpgate Finnmark -> Antwerp
model=maps/colonial/jumpgate
target=antwerp:jumpgate_finnmark
+faction=miners
location=-96 -576 4
direction=95
-faction=miners
-info=Jumpgate to the Antwerp system.
; ------------------------------------------------------------------
; KARELIA JUMPPOINT
@@ -96,7 +94,4 @@ model=maps/static/navpoint
[jumppoint]
label=jumppoint_karelia
target=karelia:jumppoint_finnmark
-name=Jumppoint Finnmark -> Karelia
location=624 512 8
-info=Jumppoint to the Karelia system.
-
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index beb6137..a563982 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -233,24 +233,22 @@ location=716 -1008 20
model=maps/static/navpoint
[jumpgate]
+; name and info are automaticly set for jumpgates
label=jumpgate_brogha
-name=Jumpgate Ghant -> Brogha
model=maps/colonial/jumpgate
target=brogha:jumpgate_ghant
+faction=colonies
location=716 -1024 24
direction=90
-faction=colonies
-info=Jumpgate to the Brogha system.
; ------------------------------------------------------------------
; ANTWERP JUMPGATE
[jumpgate]
label=jumpgate_antwerp
-name=Jumpgate Ghant -> Antwerp
model=maps/pirate/jumpgate
target=antwerp:jumpgate_ghant
+faction=pirates
location=1024 348 32
direction=180
-faction=pirates
-info=Jumpgate to the Antwerp system.
+