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-03 12:04:17 +0000
committerStijn Buys <ingar@osirion.org>2013-11-03 12:04:17 +0000
commit2c20ed2e64efe3fb50f753f7a1ee9bf18ce2dd7f (patch)
treeb36918f5cd6088848f0cc17dd1e686766bce7d41 /base
parent3d2c8486e5fb36c49a96857908e08563c60e2b73 (diff)
Added Rasheen system,
updated sky28 (Praetoria) added sky29 (Rasheen) and sky30 (Kor Glaven), added jumpgate between Rasheen and Cadiz.
Diffstat (limited to 'base')
-rw-r--r--base/ini/world.ini3
-rw-r--r--base/ini/zones/cadiz.ini11
-rw-r--r--base/ini/zones/hellas.ini23
-rw-r--r--base/ini/zones/kor_glaven.ini5
-rw-r--r--base/ini/zones/rasheen.ini24
-rw-r--r--base/textures/sky/sky28_back.pngbin1388894 -> 1659248 bytes
-rw-r--r--base/textures/sky/sky28_down.pngbin1700641 -> 1640880 bytes
-rw-r--r--base/textures/sky/sky28_front.pngbin1461955 -> 1476711 bytes
-rw-r--r--base/textures/sky/sky28_left.pngbin1556571 -> 1659377 bytes
-rw-r--r--base/textures/sky/sky28_right.pngbin1559215 -> 1375522 bytes
-rw-r--r--base/textures/sky/sky28_up.pngbin1346558 -> 1490345 bytes
-rw-r--r--base/textures/sky/sky29_back.pngbin0 -> 2204936 bytes
-rw-r--r--base/textures/sky/sky29_down.pngbin0 -> 2150827 bytes
-rw-r--r--base/textures/sky/sky29_front.pngbin0 -> 2222368 bytes
-rw-r--r--base/textures/sky/sky29_left.pngbin0 -> 2056337 bytes
-rw-r--r--base/textures/sky/sky29_right.pngbin0 -> 1964108 bytes
-rw-r--r--base/textures/sky/sky29_up.pngbin0 -> 2089177 bytes
-rw-r--r--base/textures/sky/sky30_back.pngbin0 -> 1956441 bytes
-rw-r--r--base/textures/sky/sky30_down.pngbin0 -> 1806578 bytes
-rw-r--r--base/textures/sky/sky30_front.pngbin0 -> 1640978 bytes
-rw-r--r--base/textures/sky/sky30_left.pngbin0 -> 1542222 bytes
-rw-r--r--base/textures/sky/sky30_right.pngbin0 -> 1722756 bytes
-rw-r--r--base/textures/sky/sky30_up.pngbin0 -> 1889192 bytes
23 files changed, 60 insertions, 6 deletions
diff --git a/base/ini/world.ini b/base/ini/world.ini
index c56f54c..beac29d 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -43,6 +43,9 @@ zone=carthagio
zone=praetoria
zone=phoenicia
+; dagon space
+zone=rasheen
+
; dragon eye nebula
zone=cadiz
zone=gibraltar
diff --git a/base/ini/zones/cadiz.ini b/base/ini/zones/cadiz.ini
index 321d600..bec3113 100644
--- a/base/ini/zones/cadiz.ini
+++ b/base/ini/zones/cadiz.ini
@@ -12,12 +12,13 @@ location=584 512 0
ambient=0.1 0.1 0.1
; faction
faction=neutral
+
; zone information
info=The Cadiz system.
[jumpgate]
label=jumpgate_burton
-location=-208 720 0
+location=-200 840 0
angles=0 280 0
target=burton:jumpgate_cadiz
faction=neutral
@@ -27,3 +28,11 @@ label=jumppoint_gibraltar
location=-952 -312 0
angles=0 10 0
target=gibraltar:jumppoint_cadiz
+
+[jumpgate]
+label=jumpgate_rasheen
+location=320 -1256 0
+angles=0 105 0
+target=rasheen:jumpgate_cadiz
+faction=neutral
+
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
index 98fb0a1..0a68d42 100644
--- a/base/ini/zones/hellas.ini
+++ b/base/ini/zones/hellas.ini
@@ -18,22 +18,37 @@ info=The Hellas system.
[jumpgate]
label=jumpgate_eastend
-location=-840 456 0
+location=-808 640 0
angles=0 -25 0
target=eastend:jumpgate_hellas
faction=praetoria
[jumpgate]
label=jumpgate_gibraltar
-location=960 -80 8
+location=1000 -112 8
angles=0 -180 0
target=gibraltar:jumpgate_hellas
faction=praetoria
[jumpgate]
label=jumpgate_praetoria
-location=76 -704 16
-angles=0 90 0
+location=156 -1000 16
+angles=0 115 0
target=praetoria:jumpgate_hellas
faction=praetoria
+[station]
+label=medusa
+name=Medusa gas mining facility
+location=-608 -532 0
+angles=0 50 0
+radius=16
+model=maps/common/border_station_03
+[star]
+label=star
+name=class M star
+location=0 -12 0
+angles=0 230 0
+radius=92
+color=255 76 11
+
diff --git a/base/ini/zones/kor_glaven.ini b/base/ini/zones/kor_glaven.ini
index c1b4cae..698fc11 100644
--- a/base/ini/zones/kor_glaven.ini
+++ b/base/ini/zones/kor_glaven.ini
@@ -7,6 +7,9 @@
name=Kor Glaven
; [x y z] galactic location
location=453 537 0
+; [string] skybox name
+sky=sky29
+; faction
faction=rogue
; zone information
-info=The Kor Glavensystem.
+info=The Kor Glaven system.
diff --git a/base/ini/zones/rasheen.ini b/base/ini/zones/rasheen.ini
new file mode 100644
index 0000000..0cda0c0
--- /dev/null
+++ b/base/ini/zones/rasheen.ini
@@ -0,0 +1,24 @@
+;
+; rasheen.ini
+; world description for the Rasheen system
+;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+;
+
+[zone]
+name=Rasheen system
+sky=sky30
+; [x y z] galactic location
+location=669 516 0
+ambient=0.1 0.1 0.1
+faction=dagon
+
+info=The Rasheen system.
+
+[jumpgate]
+label=jumpgate_cadiz
+location=-60 960 0
+angles=0 -75 0
+target=cadiz:jumpgate_rasheen
+faction=neutral
diff --git a/base/textures/sky/sky28_back.png b/base/textures/sky/sky28_back.png
index 66f38df..6f65f1d 100644
--- a/base/textures/sky/sky28_back.png
+++ b/base/textures/sky/sky28_back.png
Binary files differ
diff --git a/base/textures/sky/sky28_down.png b/base/textures/sky/sky28_down.png
index c959a02..8f78bb0 100644
--- a/base/textures/sky/sky28_down.png
+++ b/base/textures/sky/sky28_down.png
Binary files differ
diff --git a/base/textures/sky/sky28_front.png b/base/textures/sky/sky28_front.png
index ea00d3a..d69044b 100644
--- a/base/textures/sky/sky28_front.png
+++ b/base/textures/sky/sky28_front.png
Binary files differ
diff --git a/base/textures/sky/sky28_left.png b/base/textures/sky/sky28_left.png
index 664d3bd..87a600a 100644
--- a/base/textures/sky/sky28_left.png
+++ b/base/textures/sky/sky28_left.png
Binary files differ
diff --git a/base/textures/sky/sky28_right.png b/base/textures/sky/sky28_right.png
index acecdc2..e073623 100644
--- a/base/textures/sky/sky28_right.png
+++ b/base/textures/sky/sky28_right.png
Binary files differ
diff --git a/base/textures/sky/sky28_up.png b/base/textures/sky/sky28_up.png
index b0fe1c0..027e2aa 100644
--- a/base/textures/sky/sky28_up.png
+++ b/base/textures/sky/sky28_up.png
Binary files differ
diff --git a/base/textures/sky/sky29_back.png b/base/textures/sky/sky29_back.png
new file mode 100644
index 0000000..e034b16
--- /dev/null
+++ b/base/textures/sky/sky29_back.png
Binary files differ
diff --git a/base/textures/sky/sky29_down.png b/base/textures/sky/sky29_down.png
new file mode 100644
index 0000000..b314bc5
--- /dev/null
+++ b/base/textures/sky/sky29_down.png
Binary files differ
diff --git a/base/textures/sky/sky29_front.png b/base/textures/sky/sky29_front.png
new file mode 100644
index 0000000..587b529
--- /dev/null
+++ b/base/textures/sky/sky29_front.png
Binary files differ
diff --git a/base/textures/sky/sky29_left.png b/base/textures/sky/sky29_left.png
new file mode 100644
index 0000000..d94d577
--- /dev/null
+++ b/base/textures/sky/sky29_left.png
Binary files differ
diff --git a/base/textures/sky/sky29_right.png b/base/textures/sky/sky29_right.png
new file mode 100644
index 0000000..537bf28
--- /dev/null
+++ b/base/textures/sky/sky29_right.png
Binary files differ
diff --git a/base/textures/sky/sky29_up.png b/base/textures/sky/sky29_up.png
new file mode 100644
index 0000000..3de6970
--- /dev/null
+++ b/base/textures/sky/sky29_up.png
Binary files differ
diff --git a/base/textures/sky/sky30_back.png b/base/textures/sky/sky30_back.png
new file mode 100644
index 0000000..4f6afb1
--- /dev/null
+++ b/base/textures/sky/sky30_back.png
Binary files differ
diff --git a/base/textures/sky/sky30_down.png b/base/textures/sky/sky30_down.png
new file mode 100644
index 0000000..0274b81
--- /dev/null
+++ b/base/textures/sky/sky30_down.png
Binary files differ
diff --git a/base/textures/sky/sky30_front.png b/base/textures/sky/sky30_front.png
new file mode 100644
index 0000000..649a05d
--- /dev/null
+++ b/base/textures/sky/sky30_front.png
Binary files differ
diff --git a/base/textures/sky/sky30_left.png b/base/textures/sky/sky30_left.png
new file mode 100644
index 0000000..6352453
--- /dev/null
+++ b/base/textures/sky/sky30_left.png
Binary files differ
diff --git a/base/textures/sky/sky30_right.png b/base/textures/sky/sky30_right.png
new file mode 100644
index 0000000..9308a72
--- /dev/null
+++ b/base/textures/sky/sky30_right.png
Binary files differ
diff --git a/base/textures/sky/sky30_up.png b/base/textures/sky/sky30_up.png
new file mode 100644
index 0000000..77010cc
--- /dev/null
+++ b/base/textures/sky/sky30_up.png
Binary files differ