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

1 files changed, 46 insertions, 16 deletions

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