3 files changed, 92 insertions, 9 deletions

diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 7fa5dba..cdd33cd 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -102,7 +102,7 @@ level=1
 	; lifespan=5000
 	; damage done by the projectile
 	damage=10
-	; projectile model	
+	; projectile model
 	model=laser1
 	; sound to play if the projectile is fired
 	sound=laser
@@ -124,7 +124,7 @@ level=5
 	; lifespan=5000
 	; damage done by the projectile
 	damage=15
-	; projectile model	
+	; projectile model
 	model=laser2
 	; sound to play if the projectile is fired
 	sound=laser
@@ -146,7 +146,7 @@ level=15
 	;lifespan=5000
 	; damage done by the projectile
 	damage=25
-	; projectile model	
+	; projectile model
 	model=laser2
 	; sound to play if the projectile is fired
 	sound=laser
@@ -169,7 +169,7 @@ level=5
 	; lifespan=5000
 	; damage done by the projectile
 	damage=10
-	; projectile model	
+	; projectile model
 	model=laser1
 	; sound to play if the projectile is fired
 	sound=laser
@@ -191,7 +191,7 @@ level=15
 	; lifespan=5000
 	; damage done by the projectile
 	damage=15
-	; projectile model	
+	; projectile model
 	model=laser2
 	; sound to play if the projectile is fired
 	sound=laser
@@ -202,7 +202,7 @@ level=15
 
 [cannon]
 label=neutron1
-name=Neutron Cannon
+name=Neutron cannon
 price=27000
 level=25
 
@@ -217,14 +217,36 @@ level=25
 	;lifespan=5000
 	; damage done by the projectile
 	damage=25
-	; projectile model	
+	; projectile model
 	model=neutron1
 	; sound to play if the projectile is fired
 	sound=neutron
 
+[cannon]
+label=neutron2
+name=Improved neutron cannon
+price=122000
+level=45
+
+	[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=45
+	; projectile model
+	model=neutron2
+	; sound to play if the projectile is fired
+	sound=neutron
+
 [turret]
 label=turretneutron1
-name=Neutron Turret
+name=Neutron turret
 price=27000
 level=25
 
@@ -239,7 +261,7 @@ level=25
 	;lifespan=5000
 	; damage done by the projectile
 	damage=25
-	; projectile model	
+	; projectile model
 	model=neutron1
 	; sound to play if the projectile is fired
 	sound=neutron
diff --git a/base/maps/projectiles/neutron2.map b/base/maps/projectiles/neutron2.map
new file mode 100644
index 0000000..e959093
--- /dev/null
+++ b/base/maps/projectiles/neutron2.map
@@ -0,0 +1,12 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+}
+// entity 1
+{
+"classname" "fx_particles"
+"origin" "0.000000 0.000000 0.000000"
+"angle" "-179.999985"
+"script" "neutron2"
+}
diff --git a/base/particles/neutron2.ini b/base/particles/neutron2.ini
new file mode 100644
index 0000000..a8ba2bb
--- /dev/null
+++ b/base/particles/neutron2.ini
@@ -0,0 +1,49 @@
+;
+; particles/neutron1.ini
+; Neutron cannon particles
+;
+
+[particles]
+
+	[ejector]
+	type=sprite
+	texture=fx/flare01
+	lifespan=1000
+	interval=50
+	radius=8 2
+	alpha=0.75 0
+	speed=8
+	cone=150
+	color=0 255 0
+
+	[ejector]
+	type=trail
+	texture=fx/engine_trail
+	lifespan=500
+	interval=200
+	radius=4
+	alpha=0.5
+	color=0 196 0
+	
+	[ejector]
+	type=sprite
+	texture=fx/flare04
+	cone=30
+	speed=128
+	lifespan=1500
+	interval=8
+	radius=8 8 2
+	alpha=0.75 0
+	color=0 255 0
+	attached=true
+	
+	[ejector]
+	type=flare
+	texture=fx/engine_ring
+	speed=128
+	lifespan=1500
+	interval=250
+	radius=30 32
+	alpha=0.5 0
+	color=0 196 0
+	attached=true
\ No newline at end of file