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-09-29 08:52:03 +0000
committerStijn Buys <ingar@osirion.org>2013-09-29 08:52:03 +0000
commit3b70888bce3a7282bd06f6e006b3f5fd1cd2bb37 (patch)
treee2365dcc4ef54a08545809489b1016415518fa7d /base
parent088858f46b82c36d747c4d42b026c21a846399c1 (diff)
Moves jumpgate and navpoint models from maps/static to maps/common.
Diffstat (limited to 'base')
-rw-r--r--base/ini/templates.ini28
-rw-r--r--base/ini/zones/finnmark.ini2
-rw-r--r--base/ini/zones/race.ini1
-rw-r--r--base/ini/zones/unknown.ini1
-rw-r--r--base/maps/common/jumpgate.map (renamed from base/maps/static/jumpgate.map)0
-rw-r--r--base/maps/common/jumpgate_construction.map (renamed from base/maps/static/jumpgate_construction.map)0
-rw-r--r--base/maps/common/navpoint.map (renamed from base/maps/static/navpoint.map)0
7 files changed, 15 insertions, 17 deletions
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index 13ce670..1d39ac4 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -26,9 +26,21 @@ model=maps/common/storageunit
; the navpoint template is used by the game code
[template]
label=navpoint
-model=maps/static/navpoint
+model=maps/common/navpoint
radius=0.20
+; the jumppoint template is used by the game code
+[template]
+label=jumppoint
+color=0.0 0.8 0.8
+colorsecond=0.6 0.6 0.6
+
+; the jumpgate template is used by the game code
+[template]
+label=jumpgate
+model=maps/common/jumpgate
+radius=8
+
; the cargopod template is used by the game code
[template]
label=cargopod
@@ -40,16 +52,4 @@ radius=0.1
label=spacemine
; default mine model
model=maps/static/spacemine
-radius=0.1
-
-; the jumppoint template is used by the game code
-[template]
-label=jumppoint
-color=0.0 0.8 0.8
-colorsecond=0.6 0.6 0.6
-
-; the jumpgate template is used by the game code
-[template]
-label=jumpgate
-model=maps/static/jumpgate
-radius=8 \ No newline at end of file
+radius=0.1 \ No newline at end of file
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 7840ab6..d2a61b6 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -140,7 +140,7 @@ location=624 512 8
label=jumpgate_unfinished
name=Unfinished Jumpgate
location=-584 896 0
-model=maps/static/jumpgate_construction
+model=maps/common/jumpgate_construction
yaw=0
faction=miners
radius=5.4
diff --git a/base/ini/zones/race.ini b/base/ini/zones/race.ini
index 73853a1..5143edb 100644
--- a/base/ini/zones/race.ini
+++ b/base/ini/zones/race.ini
@@ -6,7 +6,6 @@ showonmap=false
label=navpoint_origin
name=Navigation point Origin
location=0 0 0
-model=maps/static/navpoint
[racetrack]
label=racetrack
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 8379202..e49e6db 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -15,7 +15,6 @@ info=The Unkown system is a test area for various engine features.
label=navpoint_origin
name=Navigation point Origin
location=0 0 0
-model=maps/static/navpoint
[entity]
ship=vector
diff --git a/base/maps/static/jumpgate.map b/base/maps/common/jumpgate.map
index fec2c7c..fec2c7c 100644
--- a/base/maps/static/jumpgate.map
+++ b/base/maps/common/jumpgate.map
diff --git a/base/maps/static/jumpgate_construction.map b/base/maps/common/jumpgate_construction.map
index 35e0b64..35e0b64 100644
--- a/base/maps/static/jumpgate_construction.map
+++ b/base/maps/common/jumpgate_construction.map
diff --git a/base/maps/static/navpoint.map b/base/maps/common/navpoint.map
index e6ac171..e6ac171 100644
--- a/base/maps/static/navpoint.map
+++ b/base/maps/common/navpoint.map