Added jumpgate between Ghant and Warsaw.

2 files changed, 96 insertions, 70 deletions

diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 5f34784..609fab3 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -2,8 +2,7 @@
 ; ghant.ini
 ; world description for the Ghant system
 ;
-
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -24,6 +23,7 @@ label=navpoint_origin
 name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
+angles=0 0 0
 
 ; ------------------------------------------------------------------
 ; STAR
@@ -34,10 +34,11 @@ label=star
 ; [string] entity name
 name=class A star
 location=512 -512 0
-; [r g b] entity primary color, values in the 0-255 range
-color=255 255 255
+angles=0 0 0
 ; [float] entity radius (10 game units == 1km ingame)
 radius=90
+; [r g b] entity primary color, values in the 0-255 range
+color=255 255 255
 corona=default
 
 ; ------------------------------------------------------------------
@@ -50,17 +51,17 @@ label=ghant
 name=planet Ghant
 ; [x y x] entity location
 location=-270 -800 32
+angles=0 -15 0
+; [float] entity radius (10 game units == 1km ingame)
+radius=64
 ; [r g b] entity primary color, values in the 0-1 range
 ;color=0.82 0.50 .2
 ; [string] globe texture name
 texture=planets/ghant
-; [float] entity radius (10 game units == 1km ingame)
-radius=64
-; [float] axis pitch, in degrees
-pitch=-15
 ; [float] rotation speed, in degrees per second
 rotationspeed=1
 dock=yes
+
 ; info text
 info=Despite its relatively unimportant strategic value, planet Ghant represents the political and economical
 info=heartland of the Independent Colonies. Most of this once mineral-rich world's natural resources have been
@@ -72,7 +73,7 @@ info=equipment and other related technologies.
 	label=terraformingequipment
 	price=1650
 	amount=0
-	
+
 	[cargo]
 	label=water
 	price=8
@@ -83,8 +84,7 @@ info=equipment and other related technologies.
 	price=1250
 	amount=0
 
-; 	available ship types
-
+	; available ship types
 	[ship]
 	label=vector
 
@@ -94,7 +94,6 @@ info=equipment and other related technologies.
 	[ship]
 	label=pod
 
-
 ; ------------------------------------------------------------------
 ; ALEXANDRIA OUTPOST
 
@@ -103,54 +102,51 @@ info=equipment and other related technologies.
 label=alexandria
 ; [string] entity name
 name=Alexandria outpost
+; [x y x] entity location
+location=-192 -704 32
+angles=45 0 0
+; entity radius
+radius=8
 ; [string] entity model name
 model=maps/colonial/alexandria
 ; [string] faction this entity belongs to, sets faction colors
 faction=colonies
-; [x y x] entity location
-location=-192 -704 32
-; [float] axis direction, in degrees
-yaw=45
 ; this is the default base where new players are docked
 default=yes
-; entity radius
-radius=8
+
 ; info text
-info=Alexandria outpost serves as a commercial and entertainment centre for the Ghant system. 
+info=Alexandria outpost serves as a commercial and entertainment centre for the Ghant system.
 info=Because of its remote location, it is also a popular transit zone for more shady operations,
 
-; the sections below add trade definitions to the station
-
-; 	available ship types
-
+	; available ship types
 	[ship]
 	label=vector
 
-; 	available cargo types
+	; available cargo types
 	[cargo]
-; 	always declare the label first
+	; always declare the label first
 	label=crates
-; 	price this base sells and busy the cargo at
+	; price this base sells and busy the cargo at
 	price=25
-; 	initial amount, -1 means unlimited supply
+	; initial amount, -1 means unlimited supply
 	amount=-1
 
 	[cargo]
 	label=liquor
 	price=325
-; 	no initial supply
+	; no initial supply
 	amount=0
 
 	[cargo]
 	label=niobium
 	price=200
-; 	no initial supply
+	; no initial supply
 	amount=0
 
 	[cargo]
 	label=iron
 	price=150
-; 	no initial supply
+	; no initial supply
 	amount=0
 
 	[cargo]
@@ -167,18 +163,18 @@ info=Because of its remote location, it is also a popular transit zone for more
 [entity]
 label=alexandria_storage1
 name=storage tanks
+location=-176 -720 32
+angles=45 0 0
 model=maps/colonial/alexandria_storage
 faction=colonies
-location=-176 -720 32
-yaw=45
 
 [entity]
 label=alexandria_storage2
 name=storage tanks
+location=-172 -720 32
+angles=45 0 0
 model=maps/colonial/alexandria_storage
 faction=colonies
-location=-172 -720 32
-yaw=45
 
 ; ------------------------------------------------------------------
 ; BATTLESHIP CUSTODIAN
@@ -193,9 +189,9 @@ yaw=45
 ship=custodian
 label=custodian
 name=Battleship Custodian
-faction=militia
 location=-204 -656 32
-yaw=305
+angles=305 0 0
+faction=militia
 
 	[ship]
 	label=sharkan
@@ -223,12 +219,13 @@ label=seymour
 name=Planet Seymour
 ; [x y x] entity location
 location=-128 1032 -32
+angles=0 0 0
+; [float] entity radius (10 game units == 1km ingame)
+radius=68
 ; [r g b] entity color, values in the 0-1 range
 color=1 .9 .5
 ; [string] globe texture name
 texture=planets/seymour
-; [float] entity radius (10 game units == 1km ingame)
-radius=68
 
 ; ------------------------------------------------------------------
 ; REGULA STATION
@@ -236,10 +233,11 @@ radius=68
 [station]
 label=regula
 name=Regula Station
-model=maps/colonial/regula
 location=-128 928 -32
+angles=225 0 0
+model=maps/colonial/regula
 color=0.4 0.7 0
-yaw=225
+
 info=Regula station is the headquarters of the local niobium mining operation.
 
 	[ship]
@@ -256,7 +254,7 @@ info=Regula station is the headquarters of the local niobium mining operation.
 	[cargo]
 	label=niobium
 	price=150
-	; unlimited
+	; unlimited supply
 	amount=-1
 
 	[cargo]
@@ -267,8 +265,9 @@ info=Regula station is the headquarters of the local niobium mining operation.
 [entity]
 label=regula_storage
 name=Storage tanks
-model=maps/colonial/regula_storage
 location=-122 928 -32
+angles=0 0 0
+model=maps/colonial/regula_storage
 color=0.4 0.7 0
 
 ; ------------------------------------------------------------------
@@ -277,10 +276,10 @@ color=0.4 0.7 0
 [jumpgate]
 ; name and info are automaticly set for jumpgates
 label=jumpgate_kronenbaden
+location=570 1346 64
+angles=260 0 0
 target=kronenbaden:jumpgate_ghant
 faction=colonies
-location=460 1440 64
-yaw=270
 
 ; ------------------------------------------------------------------
 ; IKARUS SATELLITE
@@ -288,37 +287,33 @@ yaw=270
 [entity]
 label=ikarus
 name=Ikarus satellite
+location=64 -16 0
+angles=120 -15 0
 model=maps/colonial/ikarus
 faction=militia
-location=64 -16 0
-yaw=120
-pitch=-15
-
-; ------------------------------------------------------------------
-; BROGHA JUMPGATE
-
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=716 -1008 20
 
 [jumpgate]
 ; name and info are automaticly set for jumpgates
 label=jumpgate_brogha
+location=686 -1202 24
+angles=120 0 0
 target=brogha:jumpgate_ghant
 faction=colonies
-location=716 -1024 24
-yaw=90
 
 ; ------------------------------------------------------------------
 ; ANTWERP JUMPGATE
 
 [jumpgate]
 label=jumpgate_antwerp
-; override default jumpgate model
-model=maps/colonial/jumpgate
+location=1084 324 32
+angles=200 0 0
 target=antwerp:jumpgate_ghant
 faction=colonies
-location=1024 348 32
-yaw=180
+
+[jumpgate]
+label=jumpgate_warsaw
+location=-840 324 -8
+angles=320 0 0
+target=warsaw:jumpgate_ghant
+faction=colonies
 
diff --git a/base/ini/zones/warsaw.ini b/base/ini/zones/warsaw.ini
index a051a87..818b0b2 100644
--- a/base/ini/zones/warsaw.ini
+++ b/base/ini/zones/warsaw.ini
@@ -2,10 +2,10 @@
 ; warsaw.ini
 ; world description for the Warsaw system
 ;
- 
 
 [zone]
 name=Warsaw system
+sky=sky16
 
 ; ------------------------------------------------------------------
 ; CLASS M STAR
@@ -15,20 +15,21 @@ name=Warsaw system
 label=star
 ; [string] entity name
 name=class K star
-location=1024 0 0
+location=120 1020 -16
+angles=0 0 0
+; [float] entity radius (10 game units == 1km ingame)
+radius=72
 ; [r g b] entity primary color, values in the 0-255 range
 color=219 91 0
-; [float] entity radius (10 game units == 1km ingame)
-radius=64
 
-; ------------------------------------------------------------------ 
+; ------------------------------------------------------------------
 ; KRONENBADEN JUMPGATE
 
 [jumpgate]
 label=jumpgate_kronenbaden
+location=576 580 -32
+angles=195 0 0
 target=kronenbaden:jumpgate_warsaw
-location=768 600 -32
-yaw=180
 faction=colonies
 
 ; ------------------------------------------------------------------
@@ -36,7 +37,37 @@ faction=colonies
 
 [jumpgate]
 label=jumpgate_khorsand
+location=-480 -860 -16
+angles=75 0 0
 target=khorsand:jumpgate_warsaw
-location=-200 -400 0
-yaw=90
 faction=colonies
+
+[jumpgate]
+label=jumpgate_ghant
+location=704 -580 64
+angles=135 0 0
+target=ghant:jumpgate_warsaw
+faction=colonies
+
+[planet]
+label=warsaw
+name=planet Warsaw
+location=-444 324 8
+angles=270 0 0
+radius=62
+dock=yes
+	[cargo]
+	label=gold
+	price=1250
+	amount=0
+
+	; available ship types
+	[ship]
+	label=vector
+
+	[ship]
+	label=scalar
+
+	[ship]
+	label=pod
+