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>2012-10-27 20:59:41 +0000
committerStijn Buys <ingar@osirion.org>2012-10-27 20:59:41 +0000
commit24306f24a859583fbdf6b1858331d25ef1272b0b (patch)
tree5ec626c03fd598e1c0b29a216b41daf1d7b1ae75
parentb2a4af1d5b6616ddc6860bfdaf2948483be63b30 (diff)
Added the Gibraltar system, added a sky to the Morrigan system.
-rw-r--r--base/ini/weapons.ini2
-rw-r--r--base/ini/world.ini1
-rw-r--r--base/ini/zones/argos.ini5
-rw-r--r--base/ini/zones/burton.ini4
-rw-r--r--base/ini/zones/gibraltar.ini26
-rw-r--r--base/ini/zones/kor_minas.ini16
-rw-r--r--base/ini/zones/morrigan.ini2
-rw-r--r--base/textures/sky/sky17_back.pngbin0 -> 1223960 bytes
-rw-r--r--base/textures/sky/sky17_down.pngbin0 -> 1172473 bytes
-rw-r--r--base/textures/sky/sky17_front.pngbin0 -> 1259681 bytes
-rw-r--r--base/textures/sky/sky17_left.pngbin0 -> 1220867 bytes
-rw-r--r--base/textures/sky/sky17_right.pngbin0 -> 1152248 bytes
-rw-r--r--base/textures/sky/sky17_up.pngbin0 -> 1215324 bytes
13 files changed, 36 insertions, 20 deletions
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 34a67b4..a30f506 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -41,9 +41,11 @@ level=15
[turret]
label=defenselaser1
name=Defense laser
+price=25000
level=5
[turret]
label=defenselaser2
name=Advanced Defense laser
+price=50000
level=15
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 476e780..1179924 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -37,6 +37,7 @@ zone=morrigan
; dragon eye nebula
zone=argos
+zone=gibraltar
; tsu-khan space
zone=kiana
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
index 865ecd7..0d20727 100644
--- a/base/ini/zones/argos.ini
+++ b/base/ini/zones/argos.ini
@@ -25,7 +25,8 @@ label=jumpgate_hellas
location=-952 -180 0
[jumppoint]
-label=jumppoint_kor_minas
+label=jumppoint_gibraltar
location=1080 200 0
angles=0 195 0
-target=kor_minas:jumppoint_argos
+target=gibraltar:jumppoint_argos
+
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index 57b19b0..7c8cb91 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -57,9 +57,9 @@ target=lindblade:jumpgate_burton
faction=lindblade
[jumpgate]
-label=jumpgate_kor_minas
+label=jumpgate_gibraltar
location=72 -944 -96
angles=0 90 0
-target=kor_minas:jumpgate_burton
+target=gibraltar:jumpgate_burton
faction=lindblade
diff --git a/base/ini/zones/gibraltar.ini b/base/ini/zones/gibraltar.ini
new file mode 100644
index 0000000..99cc06a
--- /dev/null
+++ b/base/ini/zones/gibraltar.ini
@@ -0,0 +1,26 @@
+;
+; gibraltar.ini
+; world description for the Kor Telos system
+;
+
+[zone]
+name=Gibraltar system
+;sky=
+; [x y z] galactic location
+location=584 512 0
+ambient=0.1 0.1 0.1
+
+; zone information
+info=The Gibraltar system.
+
+[jumpgate]
+label=jumppoint_argos
+location=-952 -312 0
+angles=0 10 0
+target=argos:jumppoint_gibraltar
+[jumpgate]
+label=jumpgate_burton
+location=-208 720 0
+angles=0 280 0
+target=burton:jumpgate_gibraltar
+faction=independent
diff --git a/base/ini/zones/kor_minas.ini b/base/ini/zones/kor_minas.ini
index 105d806..261f6e8 100644
--- a/base/ini/zones/kor_minas.ini
+++ b/base/ini/zones/kor_minas.ini
@@ -7,20 +7,6 @@
name=Kor Minas system
;sky=
; [x y z] galactic location
-location=584 512 0
+location=591 577 0
ambient=0.1 0.1 0.1
-; zone information
-info=The Kor Minas system.
-
-[jumpgate]
-label=jumppoint_argos
-location=-952 -312 0
-angles=0 10 0
-target=argos:jumppoint_kor_minas
-[jumpgate]
-label=jumpgate_burton
-location=-208 720 0
-angles=0 280 0
-target=burton:jumpgate_kor_minas
-faction=independent
diff --git a/base/ini/zones/morrigan.ini b/base/ini/zones/morrigan.ini
index 8ee6520..3bc22e7 100644
--- a/base/ini/zones/morrigan.ini
+++ b/base/ini/zones/morrigan.ini
@@ -7,7 +7,7 @@
[zone]
name=Morrigan system
-;sky=
+sky=sky17
; [x y z] galactic location
location=573 420 0
; faction
diff --git a/base/textures/sky/sky17_back.png b/base/textures/sky/sky17_back.png
new file mode 100644
index 0000000..64bcc5a
--- /dev/null
+++ b/base/textures/sky/sky17_back.png
Binary files differ
diff --git a/base/textures/sky/sky17_down.png b/base/textures/sky/sky17_down.png
new file mode 100644
index 0000000..c2f16bd
--- /dev/null
+++ b/base/textures/sky/sky17_down.png
Binary files differ
diff --git a/base/textures/sky/sky17_front.png b/base/textures/sky/sky17_front.png
new file mode 100644
index 0000000..5c6d901
--- /dev/null
+++ b/base/textures/sky/sky17_front.png
Binary files differ
diff --git a/base/textures/sky/sky17_left.png b/base/textures/sky/sky17_left.png
new file mode 100644
index 0000000..a6d6ebf
--- /dev/null
+++ b/base/textures/sky/sky17_left.png
Binary files differ
diff --git a/base/textures/sky/sky17_right.png b/base/textures/sky/sky17_right.png
new file mode 100644
index 0000000..587b641
--- /dev/null
+++ b/base/textures/sky/sky17_right.png
Binary files differ
diff --git a/base/textures/sky/sky17_up.png b/base/textures/sky/sky17_up.png
new file mode 100644
index 0000000..47d2fe9
--- /dev/null
+++ b/base/textures/sky/sky17_up.png
Binary files differ