Updated trade definitions, added racetrack to the Phoenicia system, added medicines model.

7 files changed, 98 insertions, 19 deletions

diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
index 0415a31..8dc4703 100644
--- a/base/ini/zones/albion.ini
+++ b/base/ini/zones/albion.ini
@@ -34,14 +34,12 @@ pitch=5
 dock=yes
 location=-224 0 0
 yaw=140
+info=Planet Albion is the home of the Albion University.
 
 	[cargo]
-	label=carbosteel
-	price=300
-
-	[cargo]
-	label=iron
-	price=250
+	label=medicines
+	price=200
+	amount=-1
 
 	[cargo]
 	label=water
@@ -71,15 +69,11 @@ radius=8
 yaw=30
 
 	[cargo]
-	label=gold
-	price=1200
-	amount=0
-
+	label=iron
+	
 	[cargo]
-	label=diamonds
-	price=2300
-	amount=0
-
+	label=carbosteel
+	
 ; ------------------------------------------------------------------ 
 ; LINDBLADE JUMPGATE
 
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index c6e26d7..77b9e7d 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -44,6 +44,11 @@ location=128 768 32
 	label=liquor
 	price=500
 	amount=0
+	
+	[cargo]
+	label=medicines
+	price=350
+	amount=0
 
 	[cargo]
 	label=water
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
index 17bb935..4f331a7 100644
--- a/base/ini/zones/argos.ini
+++ b/base/ini/zones/argos.ini
@@ -2,22 +2,24 @@
 ; 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
-info=The Argos system.
 faction=neutral
 
+info=The Argos system.
+
 ; ------------------------------------------------------------------
 ; MORRIGAN JUMPGATE
 ;
+
 [jumpgate]
 label=jumpgate_morrigan
 location=-348 740 0
@@ -28,16 +30,30 @@ 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/caledonia.ini b/base/ini/zones/caledonia.ini
index 3922bf5..bdfc075 100644
--- a/base/ini/zones/caledonia.ini
+++ b/base/ini/zones/caledonia.ini
@@ -77,3 +77,9 @@ location=320 -40 0
 angles=8 180 0
 texture=planets/caledonia
 dock=yes
+
+	[cargo]
+	label=medicines
+	price=275
+	amount=0
+	
diff --git a/base/ini/zones/colombus.ini b/base/ini/zones/colombus.ini
index c8c06c8..d7fcd54 100644
--- a/base/ini/zones/colombus.ini
+++ b/base/ini/zones/colombus.ini
@@ -2,15 +2,29 @@
 ; colombus.ini
 ; world description for the Colombus system
 ;
-
 ; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 ;
+
 [zone]
 name=Colombus 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.
-faction=neutral
\ No newline at end of file
+
+[jumpgate]
+label=jumpgate_argos
+location=-56 1080 -8
+angles=0 -80 0
+target=argos:jumpgate_colombus
+faction=neutral
+[jumpgate]
+label=jumpgate_camorra
+location=320 -1200 -8
+angles=0 100 0
+target=camorra:jumpgate_colombus
+faction=neutral
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
index bdc77cd..04d1e68 100644
--- a/base/ini/zones/hellas.ini
+++ b/base/ini/zones/hellas.ini
@@ -22,3 +22,10 @@ angles=0 -25 0
 target=eastend:jumpgate_hellas
 faction=praetoria
 
+[jumpgate]
+label=jumpgate_argos
+location=960 -80 8
+angles=0 -180 0
+target=argos:jumpgate_hellas
+faction=praetoria
+
diff --git a/base/ini/zones/phoenicia.ini b/base/ini/zones/phoenicia.ini
index 1d843cf..d2ad897 100644
--- a/base/ini/zones/phoenicia.ini
+++ b/base/ini/zones/phoenicia.ini
@@ -17,3 +17,40 @@ faction=praetoria
 
 ; zone information
 info=The Phoenicia system.
+
+
+[racetrack]
+label=racetrack
+name=Race Start
+model=maps/race/checkpoint
+location=64 0 0
+yaw=180
+color=.5 .5 .5
+
+[checkpoint]
+label=checkpoint1
+name=Checkpoint 1
+model=maps/race/checkpoint
+location=96 0 0
+yaw=180
+
+[checkpoint]
+label=checkpoint2
+name=Checkpoint 2
+model=maps/race/checkpoint
+location=128 0 4
+yaw=180
+
+[checkpoint]
+label=checkpoint3
+name=Checkpoint 3
+model=maps/race/checkpoint
+location=138 -10 4
+yaw=135
+
+[checkpoint]
+label=checkpoint4
+name=Race Finish
+model=maps/race/checkpoint
+location=138 -28 4
+yaw=90