From 347d13b9b58cc01a8dc6f543ee38bc61115a0322 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 15 Sep 2013 15:27:00 +0000
Subject: Adds a jumpgate between the Praetoria and the Carthagio systems,
 updates a number of stars across the galaxy.

---
 base/ini/zones/burton.ini    |  9 +++++----
 base/ini/zones/carthagio.ini | 18 +++++++++++++++++-
 base/ini/zones/khorsand.ini  |  4 ++--
 base/ini/zones/praetoria.ini | 12 +++++++++++-
 base/ini/zones/warsaw.ini    | 16 +++++++++-------
 base/ini/zones/yser.ini      |  3 ++-
 6 files changed, 46 insertions(+), 16 deletions(-)

(limited to 'base/ini/zones')

diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index 6441521..0f5164c 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -24,8 +24,9 @@ info=The Burton system.
 label=star
 name=class K star
 location=-600 200 -8
-radius=84
-color=1 .9 .5
+radius=72
+; [r g b] entity primary color, values in the 0-255 range
+color=219 91 0
 
 ; ------------------------------------------------------------------
 ; LINDBLADE SHIPYARD
@@ -41,10 +42,10 @@ model=maps/lindblade/lindblade_drydock
 
 	[ship]
 	label=winsor
-	
+
 	[ship]
 	label=halcyon
-	
+
 	[cargo]
 	label=carbosteel
 	price=750
diff --git a/base/ini/zones/carthagio.ini b/base/ini/zones/carthagio.ini
index 0e373fc..091a970 100644
--- a/base/ini/zones/carthagio.ini
+++ b/base/ini/zones/carthagio.ini
@@ -21,8 +21,24 @@ info=The Carthagio system.
 
 [jumpgate]
 label=jumpgate_ground
-location=-592 1040 0
+location=-580 980 0
 angles=0 -50 0
 target=ground:jumpgate_carthagio
 faction=praetoria
 
+[jumpgate]
+label=jumpgate_praetoria
+location=954 98 0
+angles=0 -180 0
+target=praetoria:jumpgate_carthagio
+faction=praetoria
+
+[star]
+label=star
+name=class K star
+location=-304 -460 0
+angles=0 60 0
+radius=72
+; [r g b] entity primary color, values in the 0-255 range
+color=219 91 0
+
diff --git a/base/ini/zones/khorsand.ini b/base/ini/zones/khorsand.ini
index b4f81a6..00ca938 100644
--- a/base/ini/zones/khorsand.ini
+++ b/base/ini/zones/khorsand.ini
@@ -26,7 +26,7 @@ location=0 0 0
 ; [string] entity label
 label=star
 ; [string] entity name
-name=class K star
+name=class F star
 location=256 512 0
 ; [float] entity radius (10 game units == 1km ingame)
 radius=130
@@ -96,7 +96,7 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 	label=superconductors
 	price=250
 	amount=-1
-	
+
 	[weapon]
 	label=laser1
 	amount=-1
diff --git a/base/ini/zones/praetoria.ini b/base/ini/zones/praetoria.ini
index 21855e5..16ba3a3 100644
--- a/base/ini/zones/praetoria.ini
+++ b/base/ini/zones/praetoria.ini
@@ -24,7 +24,7 @@ name=class G star
 location=444 200 24
 angles=0 -180 0
 radius=96
-color=1 .9 .5
+color=255 250 150
 
 [jumpgate]
 label=jumpgate_hellas
@@ -43,6 +43,7 @@ radius=68
 texture=planets/praetoria
 rotationspeed=0.5
 dock=yes
+
 [planet]
 label=caesar
 name=planet Caesar
@@ -51,3 +52,12 @@ angles=0 -15 0
 radius=50
 texture=planets/caesar
 rotationspeed=0.25
+
+[jumpgate]
+label=jumpgate_carthagio
+name=class G star
+location=-1344 200 -8
+angles=0 -10 0
+target=carthagio:jumpgate_praetoria
+faction=praetoria
+
diff --git a/base/ini/zones/warsaw.ini b/base/ini/zones/warsaw.ini
index 6286a8e..765b8a9 100644
--- a/base/ini/zones/warsaw.ini
+++ b/base/ini/zones/warsaw.ini
@@ -10,6 +10,7 @@ sky=sky16
 location=411 213 0
 ; faction
 faction=colonies
+
 ; zone information
 info=The Warsaw system is the headquarters of Micron Corporation.
 
@@ -76,7 +77,7 @@ info=As the corporate headquarters of Micron Corporation, spaceship components a
 	label=water
 	price=5
 	amount=-1
-	
+
 	[cargo]
 	label=crates
 	price=30
@@ -86,12 +87,12 @@ info=As the corporate headquarters of Micron Corporation, spaceship components a
 	label=superconductors
 	price=310
 	amount=0
-	
+
 	[cargo]
 	label=optronics
 	price=500
 	amount=0
-	
+
 	[cargo]
 	label=carbosteel
 	price=325
@@ -106,16 +107,17 @@ info=As the corporate headquarters of Micron Corporation, spaceship components a
 
 	[ship]
 	label=matrix
-	
-		; weapon trade definitions
+
+	; weapon trade definitions
 	[weapon]
 	label=mine_dumb
 	amount=-1
-	
+
 	[weapon]
 	label=laser1
 	amount=-1
-	
+
 	[weapon]
 	label=laser2
 	amount=-1
+
diff --git a/base/ini/zones/yser.ini b/base/ini/zones/yser.ini
index 9698faa..8260cfd 100644
--- a/base/ini/zones/yser.ini
+++ b/base/ini/zones/yser.ini
@@ -24,9 +24,10 @@ info=The Yser system is the headquarters of the Mercenaries Guild.
 
 [star]
 label=star
-name=O class star
+name=class O star
 location=-1968 -568 24
 angles=0 15 0
+radius=132
 corona=corona/default
 color=.9 .9 1
 
-- 
cgit v1.2.3