Adds cannons and turrets to the Winsor, adds more weapons for sale.

5 files changed, 183 insertions, 76 deletions

diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 2c35c3f..08113ab 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -28,61 +28,9 @@ name=Smart mine
 price=15000
 damage=250
 
-
-; ------------------------------------------------------------------
-; BLASTERS
-; blasters are used by the Colonial Militia
-
-[cannon]
-label=blaster1
-name=Blaster cannon
-info=Basic pewpew
-price=2500
-level=1
-
-	[projectile]
-	; speed of a projectile generated by this weapon, in meters per second
-	speed=2000
-	; interval between two consecutive shots, in milliseconds
-	interval=200
-	; 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
-	; sound to play if the projectile is fired
-	sound=blaster
-
-[cannon]
-label=blaster2
-name=Improved Blaster cannon
-info=Improved pewpew
-price=10000
-level=8
-
-	[projectile]
-	; speed of a projectile generated by this weapon, in meters per second
-	speed=2000
-	; interval between two consecutive shots, in milliseconds
-	interval=200
-	; 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=10
-	; projectile model
-	model=blaster2
-	; sound to play if the projectile is fired
-	sound=blaster
-
 ; ------------------------------------------------------------------
 ; LASERS
-; 	faction		Merchants
-; 	color		255, 0, 0 (red)
+; Lasers are civilian weapons
 
 [cannon]
 label=laser1
@@ -118,7 +66,7 @@ info=but the impact of a projectile has far more dramatic results.
 [cannon]
 label=laser2
 name=Improved laser cannon
-price=5000
+price=9000
 level=5
 model=models/weapons/laser/laser2
 
@@ -141,7 +89,7 @@ model=models/weapons/laser/laser2
 [cannon]
 label=laser3
 name=Advanced laser cannon
-price=15000
+price=18000
 level=15
 model=models/weapons/laser/laser3
 
@@ -165,7 +113,7 @@ model=models/weapons/laser/laser3
 [turret]
 label=turretlaser1
 name=Laser turret
-price=25000
+price=3000
 level=5
 
 	[projectile]
@@ -178,7 +126,7 @@ level=5
 	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
 	; lifespan=5000
 	; damage done by the projectile
-	damage=10
+	damage=12
 	; projectile model
 	model=laser1
 	; sound to play if the projectile is fired
@@ -187,7 +135,7 @@ level=5
 [turret]
 label=turretlaser2
 name=Improved laser turret
-price=50000
+price=11500
 level=15
 
 	[projectile]
@@ -200,13 +148,86 @@ level=15
 	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
 	; lifespan=5000
 	; damage done by the projectile
-	damage=15
+	damage=18
 	; projectile model
 	model=laser2
 	; sound to play if the projectile is fired
 	sound=laser
 
 ; ------------------------------------------------------------------
+; BLASTERS
+; blasters are used by the Colonial Militia
+
+[cannon]
+label=blaster1
+name=Blaster cannon
+info=Basic pewpew
+price=5500
+level=1
+
+	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
+	speed=2000
+	; interval between two consecutive shots, in milliseconds
+	interval=200
+	; 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
+	; sound to play if the projectile is fired
+	sound=blaster
+
+[cannon]
+label=blaster2
+name=Improved Blaster cannon
+info=Improved pewpew
+price=14000
+level=8
+
+	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
+	speed=2000
+	; interval between two consecutive shots, in milliseconds
+	interval=200
+	; 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=10
+	; projectile model
+	model=blaster2
+	; sound to play if the projectile is fired
+	sound=blaster
+
+[turret]
+label=turretblaster1
+name=Blaster turret
+info=Basic pewpew
+price=6500
+level=1
+
+	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
+	speed=2000
+	; interval between two consecutive shots, in milliseconds
+	interval=200
+	; 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=7
+	; projectile model
+	model=blaster1
+	; sound to play if the projectile is fired
+	sound=blaster
+
+; ------------------------------------------------------------------
 ; ION
 ; Ion-base weapons are used by the Lindblade military.
 
@@ -248,7 +269,7 @@ level=15
 	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
 	; lifespan=5000
 	; damage done by the projectile
-	damage=45
+	damage=55
 	; projectile model
 	model=ion1
 	; sound to play if the projectile is fired
@@ -274,7 +295,7 @@ level=25
 	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
 	;lifespan=5000
 	; damage done by the projectile
-	damage=25
+	damage=100
 	; projectile model
 	model=neutron1
 	; sound to play if the projectile is fired
@@ -296,7 +317,7 @@ level=45
 	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
 	;lifespan=5000
 	; damage done by the projectile
-	damage=45
+	damage=125
 	; projectile model
 	model=neutron2
 	; sound to play if the projectile is fired
@@ -318,20 +339,42 @@ level=25
 	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
 	;lifespan=5000
 	; damage done by the projectile
-	damage=25
+	damage=110
 	; projectile model
 	model=neutron1
 	; sound to play if the projectile is fired
 	sound=neutron
 
+[turret]
+label=turretneutron2
+name=Neutron turret
+price=150000
+level=25
+
+	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
+	speed=1250
+	; interval between two consecutive shots, in milliseconds
+	interval=1000
+	; 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=135
+	; projectile model
+	model=neutron2
+	; sound to play if the projectile is fired
+	sound=neutron
+
 ; ------------------------------------------------------------------
 ; METRION
 ; Metrion-based weapons are overpowered
 
 [cannon]
 label=metrion1
-name=Metrion Accelerator
-price=150000
+name=Metrion accelerator
+price=1500000
 level=45
 
 	[projectile]
@@ -349,3 +392,10 @@ level=45
 	model=metrion1
 	; sound to play if the projectile is fired
 	sound=metrion
+; ------------------------------------------------------------------
+; SINGULARITY
+; Metrion-based weapons are totally overpowered
+
+[cannon]
+label=singularity1
+name=Singularity projector
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 4ce8ac8..9de193a 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -58,9 +58,18 @@ location=512 -512 0
 	price=12
 	amount=0
 	
+	; weapon trade definitions
+	[weapon]
+	label=mine_dumb
+	amount=-1
+
 	[weapon]
 	label=blaster1
 	amount=-1
+	
+	[weapon]
+	label=turretblaster1
+	amount=-1
 
 ; ------------------------------------------------------------------ 
 ; PLANET ANTWERP
@@ -109,6 +118,10 @@ dock=yes
 	[weapon]
 	label=blaster2
 	amount=-1
+	
+	[weapon]
+	label=turretblaster1
+	amount=-1
 
 ; ------------------------------------------------------------------ 
 ; BUCCANEERS' DEN
@@ -146,6 +159,18 @@ radius=20
 	label=water
 	price=20
 	amount=0
+	
+	[weapon]
+	label=laser1
+	amount=-1
+	
+	[weapon]
+	label=laser2
+	amount=-1
+	
+	[weapon]
+	label=turretlaser1
+	amount=-1
 
 ; ------------------------------------------------------------------ 
 ; GHANT JUMPGATE
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index bf29f06..0366c25 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -249,6 +249,11 @@ faction=militia
 	price=10
 	amount=0
 
+	; weapon trade definitions
+	[weapon]
+	label=mine_dumb
+	amount=-1
+
 	[weapon]
 	label=blaster1
 	amount=-1
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 3f67312..8233c66 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -79,6 +79,14 @@ faction=lindblade
 	label=water
 	price=8
 	amount=0
+	
+	[weapon]
+	label=ion1
+	amount=-1
+	
+	[weapon]
+	label=turretion1
+	amount=-1
 
 ; ------------------------------------------------------------------
 ; STATION 15
@@ -109,6 +117,10 @@ faction=lindblade
 	label=water
 	price=10
 	amount=0
+	
+	[weapon]
+	label=ion1
+	amount=-1
 
 [jumpgate]
 label=jumpgate_albion
diff --git a/base/maps/lindblade/winsor.map b/base/maps/lindblade/winsor.map
index 5a22209..001e534 100644
--- a/base/maps/lindblade/winsor.map
+++ b/base/maps/lindblade/winsor.map
@@ -1551,11 +1551,11 @@ colors/chrome
 // brush 134
 {
 ( 432 96 48 ) ( 432 -32 48 ) ( 144 96 48 ) common/clip 0 0 0 1 1 0 0 0
-( 432 96 144 ) ( 144 96 144 ) ( 432 96 64 ) common/clip 0 0 0 1 1 0 0 0
-( 448 96 144 ) ( 448 96 64 ) ( 448 -32 144 ) common/clip 0 0 0 1 1 0 0 0
+( 448 72 -32 ) ( 448 72 48 ) ( 384 96 48 ) common/clip 0 0 0 1 1 0 0 0
+( 448 72 48 ) ( 448 72 -32 ) ( 448 -16 -32 ) common/clip 0 0 0 1 1 0 0 0
 ( 144 -32 -32 ) ( 432 -32 -32 ) ( 144 96 -32 ) common/clip 0 0 0 1 1 0 0 0
-( 144 -32 64 ) ( 144 -32 144 ) ( 432 -32 64 ) common/clip 0 0 0 1 1 0 0 0
-( 368 -48 64 ) ( 368 80 64 ) ( 368 -48 144 ) common/clip 0 0 0 1 1 0 0 0
+( 448 -16 48 ) ( 448 -16 -32 ) ( 384 -32 48 ) common/clip 0 0 0 1 1 0 0 0
+( 384 -48 64 ) ( 384 80 64 ) ( 384 -48 144 ) common/clip 0 0 0 1 1 0 0 0
 }
 // brush 135
 {
@@ -1597,14 +1597,14 @@ colors/chrome
 {
 ( 344 112 96 ) ( 344 -128 96 ) ( -136 112 96 ) common/clip 0 0 0 1 1 0 0 0
 ( 336 128 128 ) ( -144 128 128 ) ( 336 128 -32 ) common/clip 0 0 0 1 1 0 0 0
-( 368 80 128 ) ( 368 80 -32 ) ( 368 -160 128 ) common/clip 0 0 0 1 1 0 0 0
-( -144 -128 -32 ) ( 336 -128 -32 ) ( -144 112 -32 ) common/clip 0 0 0 1 1 0 0 0
-( -144 -128 -32 ) ( -144 -128 128 ) ( 336 -128 -32 ) common/clip 0 0 0 1 1 0 0 0
+( 384 -32 48 ) ( 384 96 48 ) ( 384 96 -32 ) common/clip 0 0 0 1 1 0 0 0
+( 384 -32 -32 ) ( 384 96 -32 ) ( -128 128 -32 ) common/clip 0 0 0 1 1 0 0 0
+( 272 -128 89.875 ) ( 272 -128 -32 ) ( -128 -128 -32 ) common/clip 0 0 0 1 1 0 0 0
 ( -128 -128 -32 ) ( -128 112 -32 ) ( -128 -128 128 ) common/clip 0 0 0 1 1 0 0 0
 ( 200 64 96 ) ( 368 64 80 ) ( 200 -64 96 ) common/clip 0 0 0 1 1 0 0 0
-( 200 128 -64 ) ( 368 96 -64 ) ( 200 128 64 ) common/clip 0 0 0 1 1 0 0 0
-( 360 -32 -64 ) ( 280 -112 -64 ) ( 360 -32 64 ) common/clip 0 0 0 1 1 0 0 0
-( 352 64 80 ) ( 368 64 48 ) ( 352 -64 80 ) common/clip 0 0 0 1 1 0 0 0
+( 384 96 -32 ) ( 384 96 48 ) ( 200 128 96 ) common/clip 0 0 0 1 1 0 0 0
+( 384 -32 48 ) ( 384 -32 -32 ) ( 272 -128 89.125 ) common/clip 0 0 0 1 1 0 0 0
+( 384 96 48 ) ( 384 -32 48 ) ( 351.25 99.25 81.625 ) common/clip 0 0 0 1 1 0 0 0
 }
 // brush 140
 {
@@ -3100,7 +3100,7 @@ colors/grey25_shiny
 // entity 1
 {
 "classname" "location_cannon"
-"origin" "312.000000 -72.000000 24.000000"
+"origin" "456.000000 96.000000 24.000000"
 }
 // entity 2
 {
@@ -3168,24 +3168,28 @@ colors/grey25_shiny
 "classname" "fx_particles"
 "origin" "-272.000000 240.000000 -64.000000"
 "script" "dust_trail"
+"angle" "-180.000000"
 }
 // entity 11
 {
 "classname" "fx_particles"
 "origin" "-272.000000 240.000000 32.000000"
 "script" "dust_trail"
+"angle" "-180.000000"
 }
 // entity 12
 {
 "classname" "fx_particles"
 "origin" "-272.000000 -240.000000 -64.000000"
 "script" "dust_trail"
+"angle" "-180.000000"
 }
 // entity 13
 {
 "classname" "fx_particles"
 "origin" "-272.000000 -240.000000 32.000000"
 "script" "dust_trail"
+"angle" "-180.000000"
 }
 // entity 14
 {
@@ -3270,3 +3274,14 @@ colors/grey25_shiny
 "light" "24"
 "spawnflags" "4"
 }
+// entity 25
+{
+"classname" "location_turret"
+"origin" "-192.000000 24.000000 136.000000"
+"angles" "-90.000000 0.000000 0.000005"
+}
+// entity 26
+{
+"classname" "location_cannon"
+"origin" "456.000000 -40.000000 24.000000"
+}