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

11 files changed, 150 insertions, 39 deletions

diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index a330724..2b8a8e7 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -29,6 +29,7 @@ info=A base component in optronic processing, anisotropic crystals are used to r
 label=carbosteel

 name=Carbosteel

 model=models/cargo/carbosteel/carbosteel

+price=275

 volume=1

 info=The result of a metallurgic process to reinforce durasteel with carbon nano-fibres, carbosteel is a lightweight yet durable alloy capable of surviving exposure to extreme conditions.

 info=It does not oxidize like regular durasteel and is widely used for anything from self-sealing stem bolts to ship hulls.

@@ -123,7 +124,7 @@ volume=4
 [cargo]

 label=medicines

 name=Medicines

-info=Medicines are an integral to the success of all known races.

-info=Dwellers of the border worlds still suffer from acute infection rates and will pay highly for medicinal supplies.

+model=models/cargo/medicines/medicines

+info=Medicines are an integral component of a long life and good health. Due to supply problems and the lack of nearby medical facilities, remote locations will pay highly for medicinal supplies.

 price=225

 volume=1

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 569fcda..df93078 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -66,7 +66,7 @@ color=106 95 87
 label=mercenaries
 name=Mercenaries Guild
 
-[factiom]
+[faction]
 label=merchants
 name=Merchants Association
 
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 16e2097..3444d8c 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -32,18 +32,28 @@ damage=250
 ; CANNONS
 ;
 
+; ------------------------------------------------------------------
+; blasters are used by the Colonial Militia
+
 [cannon]
 label=blaster1
 name=Blaster cannon
 info=Basic pewpew
 price=2500
-level=2
+level=1
 
 	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
 	speed=2000
-	lifespan=4500
-	damage=5
+	; interval between two consecutive shots, in milliseconds
 	interval=100
+	; range is the distance a projectile can travel before it dies, in meters
+	range=9000
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
+	; damage done by the projectile
+	damage=5
+	; projectile model
 	model=blaster1
 
 [cannon]
@@ -54,12 +64,22 @@ price=10000
 level=8
 
 	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
 	speed=2000
-	lifespan=4500
-	damage=15
+	; interval between two consecutive shots, in milliseconds
 	interval=100
+	; range is the distance a projectile can travel before it dies, in meters
+	range=9000
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
+	; damage done by the projectile
+	damage=15
+	; projectile model
 	model=blaster2
-	
+
+; ------------------------------------------------------------------
+; lasers are used by Merchants
+
 [cannon]
 label=laser1
 name=Laser cannon
@@ -73,8 +93,10 @@ level=1
 	speed=1500
 	; interval between two consecutive shots, in milliseconds
 	interval=500
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=7500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
 	; damage done by the projectile
 	damage=10
 	; projectile model	
@@ -91,8 +113,10 @@ level=5
 	speed=1500
 	; interval between two consecutive shots, in milliseconds
 	interval=500
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=7500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
 	; damage done by the projectile
 	damage=15
 	; projectile model	
@@ -109,8 +133,10 @@ level=15
 	speed=1500
 	; interval between two consecutive shots, in milliseconds
 	interval=500
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=7500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	;lifespan=5000
 	; damage done by the projectile
 	damage=25
 	; projectile model	
@@ -127,8 +153,10 @@ level=25
 	speed=1250
 	; interval between two consecutive shots, in milliseconds
 	interval=1000
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=8000
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	;lifespan=5000
 	; damage done by the projectile
 	damage=25
 	; projectile model	
@@ -145,8 +173,10 @@ level=20
 	speed=1300
 	; interval between two consecutive shots, in milliseconds
 	interval=800
-	; lifespan of a single projectile, in milliseconds
-	lifespan=7000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=8500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	;lifespan=7000
 	; damage done by the projectile
 	damage=200
 	; projectile model	
diff --git a/base/ini/world.ini b/base/ini/world.ini
index bfcc78e..21e5d3b 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -46,7 +46,8 @@ zone=phoenicia
 ; dragon eye nebula
 zone=argos
 zone=gibraltar
-zone=colombus 
+zone=colombus
+zone=camorra
 
 ; tsu-khan space
 zone=kiana
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