Renamed 'independent' faction to 'neutral',

added 'rogue', 'merchants' and 'mercenaries' factions,
added zone files for Praetorian space and surrounding star systems,
updated the Caledonia system.

1 files changed, 36 insertions, 37 deletions

diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index d5739e5..61e9f3a 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -2,39 +2,33 @@
 ; eastend.ini
 ; world description for the East End system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
-
 [zone]
 name=East End system
 sky=sky08
 ; [x y z] galactic location
 location=584 328 0
 ; faction
-faction=independent
+faction=neutral
+
 ; zone information
 info=The East End system.
 
-[navpoint]
-label=navpoint_origin
-name=Navigation point Origin
-location=0 0 0
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; TRIDENT CORE
 
 [station]
 label=trident
 name=Trident Core
-model=maps/independent/trident
-faction=independent
-location=-32 32 2
-yaw=30
+location=-426 -408 2
+angles=0 30 0
 radius=16
+model=maps/independent/trident
+faction=neutral
 ; this entity is the default zone view
-default = yes
+default=yes
 
 	[ship]
 	label=anansi
@@ -57,32 +51,37 @@ default = yes
 	price=12
 	amount=0
 
-; ------------------------------------------------------------------ 
-; ALBION JUMPGATE
-
-[navpoint]
-label=navpoint_north
-name=Navigation point North
-location=504 0 0
-
 [jumpgate]
 label=jumpgate_albion
+location=582 66 0
+angles=0 195 0
 target=albion:jumpgate_eastend
-faction=independent
-location=520 0 0
-yaw=270
-
-; ------------------------------------------------------------------ 
-; BROGHA JUMPGATE
-
-[navpoint]
-label=navpoint_south
-name=Navigation point South
-location=-504 0 0
+faction=neutral
 
 [jumpgate]
 label=jumpgate_brogha
+location=-676 392 0
+angles=5 -30 0
 target=brogha:jumpgate_eastend
-faction=independent
-location=-520 0 0
-yaw=0
+faction=neutral
+
+[jumpgate]
+label=jumpgate_hellas
+location=332 -956 0
+angles=0 140 0
+target=hellas:jumpgate_eastend
+faction=neutral
+
+[star]
+label=star
+name=class F star
+location=-620 -1016 0
+angles=0 45 0
+radius=86
+color=255 255 192
+
+[jumppoint]
+label=jumppoint_ground
+location=-1224 -968 0
+angles=0 25 0
+target=ground:jumppoint_eastend