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, 35 insertions, 32 deletions

diff --git a/base/ini/zones/caledonia.ini b/base/ini/zones/caledonia.ini
index 4082ba1..9177b9f 100644
--- a/base/ini/zones/caledonia.ini
+++ b/base/ini/zones/caledonia.ini
@@ -2,8 +2,7 @@
 ; caledonia.ini
 ; world description for the Caledonia system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -13,63 +12,67 @@ sky=sky06
 location=441 433 0
 ; faction
 faction=lindblade
+
 ; zone information
 info=The Caledonia system.
 
-; ------------------------------------------------------------------ 
-; ANARA JUMPGATE
+; ------------------------------------------------------------------
+; STAR
 
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=364 1016 14
-color=0.5 0.1 0.1
+[star]
+label=star
+name=Standard Issue star
+location=1480 224 0
+angles=0 180 0
+
+; ------------------------------------------------------------------
+; ANARA JUMPGATE
 
 [jumpgate]
 label=jumpgate_anara
-model=maps/colonial/jumpgate
+location=480 1128 16
+angles=0 250 0
 target=anara:jumpgate_caledonia
 faction=lindblade
-location=376 1024 16
-yaw=250
 
-; ------------------------------------------------------------------ 
-; LINDBLADE JUMPGATE
 
-[navpoint]
-label=navpoint_east
-name=Navigation Point East
-location=128 -768 0
+; ------------------------------------------------------------------
+; LINDBLADE JUMPGATE
 
 [jumpgate]
 label=jumpgate_lindblade
+location=482 -1080 0
+angles=0 110 0
 target=lindblade:jumpgate_caledonia
 faction=lindblade
-location=120 -760 0
-yaw=95
 
-; ------------------------------------------------------------------ 
-; KARELIA JUMPPOINT
 
-[navpoint]
-label=navpoint_south
-name=Navigation point South
-location=-512 0 32
-color=0.5 0.1 0.1
+; ------------------------------------------------------------------
+; KARELIA JUMPPOINT
 
 [jumppoint]
 label=jumppoint_karelia
+location=-416 1000 32
 target=karelia:jumppoint_caledonia
 color=0.5 0.1 0.1
-location=-524 0 32
-yaw=0
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; FINNMARK JUMPGATE
 
 [jumpgate]
 label=jumpgate_finnmark
+location=-956 180 0
+angles=0 -15 0
 target=finnmark:jumpgate_caledonia
 faction=lindblade
-location=-612 532 0
-yaw=-30
+
+
+; ------------------------------------------------------------------
+; PLANET CALEDONIA
+
+[planet]
+label=caledonia
+name=planet Caledonia
+location=320 -40 0
+angles=8 180 0
+dock=yes