World upadtes, renamed systems in the Dragon Eye Nedula.

10 files changed, 97 insertions, 92 deletions

diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index ea8ea90..d52620c 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -1,4 +1,4 @@
- ;
+;
 ; weapons.ini
 ;
 ; global weapon type definitions
@@ -94,8 +94,8 @@ level=1
 ; store/inventory model
 model=models/weapons/laser/laser1
 ; info text
-info=Laser cannon is probably one of the largest misnomers of recent history.
-info=The photo-magnetic generators used in these kinds of cannons do produce
+info=Laser cannon is probably one of the largest misnomers in recent history.
+info=The photo-magnetic generators used in this kind of cannons do produce
 info=light flashes similar to the ancient laser technology,
 info=but the impact of a projectile has far more dramatic results.
 
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 21e5d3b..c56f54c 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -44,9 +44,9 @@ zone=praetoria
 zone=phoenicia
 
 ; dragon eye nebula
-zone=argos
+zone=cadiz
 zone=gibraltar
-zone=colombus
+zone=oran
 zone=camorra
 
 ; tsu-khan space
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
deleted file mode 100644
index 4f331a7..0000000
--- a/base/ini/zones/argos.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-;
-; argos.ini
-; world description for the Argos system
-;
-; ------------------------------------------------------------------
-; ZONE IDENTIFICATION
-;
-
-[zone]
-name=Argos system
-sky=sky19
-; [x y z] galactic location
-location=629 451 0
-ambient=0.1 0.1 0.1
-faction=neutral
-
-info=The Argos system.
-
-; ------------------------------------------------------------------
-; MORRIGAN JUMPGATE
-;
-
-[jumpgate]
-label=jumpgate_morrigan
-location=-348 740 0
-angles=0 290 0
-target=morrigan:jumpgate_argos
-faction=neutral
-
-; ------------------------------------------------------------------
-; HELLAS JUMPGATE
-;
-
-[jumpgate]
-label=jumpgate_hellas
-location=-952 -180 0
-target=hellas:jumpgate_argos
-faction=neutral
-; ------------------------------------------------------------------
-; GIBRALTAR JUMPPOINT
-;
-
-[jumppoint]
-label=jumppoint_gibraltar
-location=1080 200 0
-angles=0 195 0
-target=gibraltar:jumppoint_argos
-
-; ------------------------------------------------------------------
-; MORRIGAN JUMPGATE
-;
-
-[jumpgate]
-label=jumpgate_colombus
-location=188 -1228 0
-angles=0 95 0
-target=colombus:jumpgate_argos
-faction=neutral
-
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index cde31b7..6441521 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -63,9 +63,9 @@ target=lindblade:jumpgate_burton
 faction=lindblade
 
 [jumpgate]
-label=jumpgate_gibraltar
+label=jumpgate_cadiz
 location=72 -944 -96
 angles=0 90 0
-target=gibraltar:jumpgate_burton
+target=cadiz:jumpgate_burton
 faction=lindblade
 
diff --git a/base/ini/zones/cadiz.ini b/base/ini/zones/cadiz.ini
new file mode 100644
index 0000000..321d600
--- /dev/null
+++ b/base/ini/zones/cadiz.ini
@@ -0,0 +1,29 @@
+;
+; cadiz.ini
+; world description for the Cadiz system
+;
+
+[zone]
+name=Cadiz system
+sky=sky18
+; [x y z] galactic location
+location=584 512 0
+; [r g b] ambient light color
+ambient=0.1 0.1 0.1
+; faction
+faction=neutral
+; zone information
+info=The Cadiz system.
+
+[jumpgate]
+label=jumpgate_burton
+location=-208 720 0
+angles=0 280 0
+target=burton:jumpgate_cadiz
+faction=neutral
+
+[jumppoint]
+label=jumppoint_gibraltar
+location=-952 -312 0
+angles=0 10 0
+target=gibraltar:jumppoint_cadiz
diff --git a/base/ini/zones/camorra.ini b/base/ini/zones/camorra.ini
index df642cb..6577103 100644
--- a/base/ini/zones/camorra.ini
+++ b/base/ini/zones/camorra.ini
@@ -27,8 +27,8 @@ angles=0 140 0
 color=1 0.2 0.2
 
 [jumpgate]
-label=jumpgate_colombus
+label=jumpgate_oran
 location=192 896 0
 angles=0 -90 0
-target=colombus:jumpgate_camorra
+target=oran:jumpgate_camorra
 faction=rogue
diff --git a/base/ini/zones/gibraltar.ini b/base/ini/zones/gibraltar.ini
index c492b04..e798cd3 100644
--- a/base/ini/zones/gibraltar.ini
+++ b/base/ini/zones/gibraltar.ini
@@ -2,27 +2,59 @@
 ; gibraltar.ini
 ; world description for the Gibraltar system
 ;
+; ------------------------------------------------------------------
+; ZONE IDENTIFICATION
+;
 
 [zone]
 name=Gibraltar system
-sky=sky18
+sky=sky19
 ; [x y z] galactic location
-location=584 512 0
+location=629 451 0
 ambient=0.1 0.1 0.1
-; faction
 faction=neutral
-; zone information
+
 info=The Gibraltar system.
 
+; ------------------------------------------------------------------
+; MORRIGAN JUMPGATE
+;
+
+[jumpgate]
+label=jumpgate_morrigan
+location=-348 740 0
+angles=0 290 0
+target=morrigan:jumpgate_gibraltar
+faction=neutral
+
+; ------------------------------------------------------------------
+; HELLAS JUMPGATE
+;
+
 [jumpgate]
-label=jumppoint_argos
-location=-952 -312 0
-angles=0 10 0
-target=argos:jumppoint_gibraltar
+label=jumpgate_hellas
+location=-952 -180 0
+target=hellas:jumpgate_gibraltar
+faction=neutral
+
+; ------------------------------------------------------------------
+; CADIZ JUMPPOINT
+;
+
+[jumppoint]
+label=jumppoint_cadiz
+location=1080 200 0
+angles=0 195 0
+target=cadiz:jumppoint_gibraltar
+
+; ------------------------------------------------------------------
+; MORRIGAN JUMPGATE
+;
 
 [jumpgate]
-label=jumpgate_burton
-location=-208 720 0
-angles=0 280 0
-target=burton:jumpgate_gibraltar
+label=jumpgate_oran
+location=188 -1228 0
+angles=0 95 0
+target=oran:jumpgate_gibraltar
 faction=neutral
+
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
index 2fba175..a5e15ae 100644
--- a/base/ini/zones/hellas.ini
+++ b/base/ini/zones/hellas.ini
@@ -24,9 +24,9 @@ target=eastend:jumpgate_hellas
 faction=praetoria
 
 [jumpgate]
-label=jumpgate_argos
+label=jumpgate_gibraltar
 location=960 -80 8
 angles=0 -180 0
-target=argos:jumpgate_hellas
+target=gibraltar:jumpgate_hellas
 faction=praetoria
 
diff --git a/base/ini/zones/morrigan.ini b/base/ini/zones/morrigan.ini
index 35e740a..58b66dd 100644
--- a/base/ini/zones/morrigan.ini
+++ b/base/ini/zones/morrigan.ini
@@ -23,12 +23,14 @@ location=1784 -648 0
 angles=0 135 0
 radius=160
 color=255 76 11
+
 [jumpgate]
-label=jumpgate_argos
+label=jumpgate_gibraltar
 location=520 -1288 0
 angles=0 115 0
-target=argos:jumpgate_morrigan
+target=gibraltar:jumpgate_morrigan
 faction=lindblade
+
 [jumpgate]
 label=jumpgate_lindblade
 location=-120 1264 0
diff --git a/base/ini/zones/colombus.ini b/base/ini/zones/oran.ini
index d7fcd54..045ac2a 100644
--- a/base/ini/zones/colombus.ini
+++ b/base/ini/zones/oran.ini
@@ -1,30 +1,31 @@
 ;
-; colombus.ini
-; world description for the Colombus system
+; oran.ini
+; world description for the Oran system
 ;
 ; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 ;
 
 [zone]
-name=Colombus system
+name=Oran system
 sky=sky20
 ; [x y z] galactic location
 location=709 442 0
 ambient=0.1 0.1 0.1
 faction=neutral
 
-info=The Colombus system.
+info=The Oran system.
 
 [jumpgate]
-label=jumpgate_argos
+label=jumpgate_gibraltar
 location=-56 1080 -8
 angles=0 -80 0
-target=argos:jumpgate_colombus
+target=gibraltar:jumpgate_oran
 faction=neutral
+
 [jumpgate]
 label=jumpgate_camorra
 location=320 -1200 -8
 angles=0 100 0
-target=camorra:jumpgate_colombus
-faction=neutral
+target=camorra:jumpgate_oran
+faction=neutral
\ No newline at end of file