Initial implementation of new grenades.

13 files changed, 50 insertions, 839 deletions

diff --git a/assets/models/players/human_base/animation.cfg b/assets/models/players/human_base/animation.cfg
index 6ccb57b..6c65233 100644
--- a/assets/models/players/human_base/animation.cfg
+++ b/assets/models/players/human_base/animation.cfg
@@ -18,12 +18,16 @@ footsteps	custom
 130	6	0	15		// TORSO_ATTACK		(MUST NOT CHANGE -- hand animation is synced to this)
 136	6	0	15		// TORSO_ATTACK2	(MUST NOT CHANGE -- hand animation is synced to this)
 
+125 10   0   50     // TORSO_ATTACK3
+
 142	5	0	20		// TORSO_DROP		(MUST NOT CHANGE -- hand animation is synced to this)
 147	4	0	20		// TORSO_RAISE		(MUST NOT CHANGE -- hand animation is synced to this)
 
 151	1	0	15		// TORSO_STAND
 152	1	0	15		// TORSO_STAND2
 
+110 1   1   15      // TORSO_STAND3
+
 153	8	8	16		// LEGS_WALKCR
 161	12	12	20		// LEGS_WALK
 173	9	9	15		// LEGS_RUN
diff --git a/assets/models/players/human_bsuit/animation.cfg b/assets/models/players/human_bsuit/animation.cfg
index 3de86e1..965d140 100644
--- a/assets/models/players/human_bsuit/animation.cfg
+++ b/assets/models/players/human_bsuit/animation.cfg
@@ -17,12 +17,16 @@ footsteps custom
 130	6	0	15		// TORSO_ATTACK		(MUST NOT CHANGE -- hand animation is synced to this)
 130	6	0	15		// TORSO_ATTACK2	(MUST NOT CHANGE -- hand animation is synced to this)
 
+125 10   0   50     // TORSO_ATTACK3
+
 142	5	0	20		// TORSO_DROP		(MUST NOT CHANGE -- hand animation is synced to this)
 147	4	0	20		// TORSO_RAISE		(MUST NOT CHANGE -- hand animation is synced to this)
 
 151	1	0	15		// TORSO_STAND
 152	1	0	15		// TORSO_STAND2
 
+110 1   1   15      // TORSO_STAND3
+
 153	9	9	20		// LEGS_WALKCR
 162	8	8	20		// LEGS_WALK
 170	13	13	23		// LEGS_RUN
diff --git a/assets/models/weapons/grenade/LICENSE b/assets/models/weapons/grenade/LICENSE
new file mode 100644
index 0000000..a3821a7
--- /dev/null
+++ b/assets/models/weapons/grenade/LICENSE
@@ -0,0 +1 @@
+flash0.wav is a derivative work of a sound made by qubodup, released into the public domain.
diff --git a/assets/models/weapons/grenade/flash0.wav b/assets/models/weapons/grenade/flash0.wav
new file mode 100644
index 0000000..ec87e69
--- /dev/null
+++ b/assets/models/weapons/grenade/flash0.wav
diff --git a/assets/models/weapons/grenade/grenade.jpg b/assets/models/weapons/grenade/grenade.jpg
index a645b65..eb9240d 100644
--- a/assets/models/weapons/grenade/grenade.jpg
+++ b/assets/models/weapons/grenade/grenade.jpg
diff --git a/assets/models/weapons/grenade/weapon.cfg b/assets/models/weapons/grenade/weapon.cfg
index 9d0811c..6e6cec6 100644
--- a/assets/models/weapons/grenade/weapon.cfg
+++ b/assets/models/weapons/grenade/weapon.cfg
@@ -1,12 +1,16 @@
+weaponModel       models/weapons/grenade/grenade.md3
 icon              icons/iconw_nade
+crosshair         24 gfx/2d/crosshair-lgun_s
 
 primary
 {
   missileModel          models/weapons/grenade/grenade.md3
   missileAnimates       0 20 20 0
 
+  flashSound            0 models/weapons/grenade/flash0.wav
+
   impactMark            64 gfx/marks/bullet_mrk
-  impactParticleSystem  models/weapons/grenade/impactPS2
+  impactParticleSystem  models/weapons/grenade/impactPS
 
   impactSound           0 models/weapons/grenade/impact0.wav
   impactQuake           120
diff --git a/assets/scripts/aw_level4.particle b/assets/scripts/aw_level4.particle
deleted file mode 100644
index 88f0deb..0000000
--- a/assets/scripts/aw_level4.particle
+++ /dev/null
@@ -1,199 +0,0 @@
-
-models/weapons/grenade/impactFBPS2
-{
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke
-      displacement 0 0 23 ~5
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 60
-      velocity          0 0 1 ~360
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 60
-      acceleration          0 0 -1 ~360
-      radius 10 25.0 370.0
-      alpha  0 0.5 0.0
-      rotation 0 0 -
-	  bounce 0.5
-      lifeTime 15000
-	  childSystem models/weapons/smoke/addimpactPS4
-    }
-
-    count 10
-    delay 0
-    period 10 - ~0%
-      }
-	  
-  ejector
-  {
-    particle
-    {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-
-      displacement 0 0 11 ~20
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 200~75%
-      velocity          0 0 1 ~10
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 300
-      acceleration          0 0 -1 0
-
-      radius 0 400 0.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 800
-
-      childSystem models/weapons/grenade/impactTrailPS2
-    }
-
-    count 5
-    delay 0
-    period 10 - ~0%
-  }
-  
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
-
-      displacement 0 0 8 ~20
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 700~3%
-      velocity          0 0 1 ~320
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 1 0
-
-      radius 0 20.0 2.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.1
-      bounceMark      2~2 60 gfx/marks/burn_mrk
-
-      lifeTime 200
-	  onDeathSystem  models/weapons/smoke/addimpactFlamePSsm
-    }
-
-    count 15
-    delay 0
-    period 0 - ~0%
-  }
-}
-
-
-
-
-
-models/weapons/level4/muzzlePS
-{
-  ejector
-  {
-    particle
-    {
-      shader sync  flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-      displacement 0 0 0 ~5.0
-
-      parentVelocityFraction 0.65
-
-      velocityType      cent
-      velocityDir       linear
-      velocityMagnitude 500
-      velocity          0 0 0 ~0
-
-      physicsRadius 15
-
-      radius 0 25.0 60.0
-      alpha  0 1.0 1.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 1000
-    }
-
-    count 10
-    delay 0
-    period 15 - ~0%
-  }
-
-}
-
-
-
-models/weapons/smoke/addimpactFlame2PSsm
-
-  {
-  ejector
-  {
-    particle
-    {
-      shader sync textures/yeflamer/flamesadd
-        displacement 0 0 0 ~10
-
-      parentVelocityFraction  0.0~0.05
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 2
-      velocity          0 0 -1 ~360
-
-      radius  0 180.0 10.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      lifeTime 10000
-    }
-
-    count 1
-    delay 0
-    period 0 - ~0
-  }
-}
-
-
-models/weapons/flamer/pMissile2PS
-{
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
-
-      displacement 0 0 8 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 400~20%
-      velocity          0 0 -1 ~190
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 -1 0
-
-      radius 0 5.5 1.5
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.1
-
-      lifeTime 3000
-	  onDeathSystem  models/weapons/smoke/addimpactFlamePSsm
-    }
-
-    count 10
-    delay 0
-    period 25 - ~0%
-  }
-}
diff --git a/assets/scripts/hu_explosive_grenade.particle b/assets/scripts/hu_explosive_grenade.particle
index 8424617..99595fe 100644
--- a/assets/scripts/hu_explosive_grenade.particle
+++ b/assets/scripts/hu_explosive_grenade.particle
@@ -1,502 +1,70 @@
 
-models/weapons/grenade/impactTrailPS
-{
-  ejector
-  {
-    particle
-    {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-
-      displacement 0 0 0 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 30
-      velocity          0 0 -1 ~0
-
-      radius 0 30.0 10.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 500
-    }
-
-    count 5
-    delay 0
-    period 40 - 0
-  }
-}
-
 models/weapons/grenade/impactPS
 {
   ejector
   {
     particle
     {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-
-      displacement 0 0 11 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 200~75%
-      velocity          0 0 1 ~10
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 300
-      acceleration          0 0 -1 0
-
-      radius 0 10.0 40.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 500
-
-      childSystem models/weapons/grenade/impactTrailPS
-    }
-
-    count 5
-    delay 0
-    period 10 - ~0%
-  }
-
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/grenade/flare_01
-
-      displacement 0 0 8 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 10~50%
-      velocity          0 0 1 ~60
-
-      radius 0 100.0 200.0
-      alpha  250 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.0
-
-      lifeTime 300
-    }
-
-    count 1
-    delay 0
-    period 10 - ~0%
-  }
-
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
-
-      displacement 0 0 8 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 700~3%
-      velocity          0 0 1 ~180
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 1 0
-
-      radius 0 10.0 2.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 300
-    }
-
-    count 150
-    delay 0
-    period 0 - ~0%
-  }
-}
-
-
-models/weapons/grenade/impactPS2
-{
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke2
-
-      displacement 0 0 0 50.0
-      normalDisplacement 3.0
-
-      velocityType      normal
-      velocityDir       linear
-      velocityMagnitude 10
-      velocity          0 0 0 0
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 1
-      acceleration          0 0 1 0
-
-      radius 0 100.0 500.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      bounce 0.0
-
-      lifeTime 15000
-    }
-
-    count 1
-    delay 0
-    period 0 - ~0%
-  }
-  
-      ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke2
-      displacement 0 0 23 ~0
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 60
-      velocity          0 0 1 ~360
-      realLight 
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 60
-      acceleration          0 0 -1 ~360
-      radius 8 20.0 300.0
-      alpha  0 0.5 0.0
-      rotation 0 0 -
-	  bounce 0.5
-      lifeTime 5000
-	  childSystem models/weapons/smoke/addimpactPS4
-    }
-
-    count 5
-    delay 0
-    period 10 - ~0%
-      }
-	  
-  ejector
-  {
-    particle
-    {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-
-      displacement 0 0 11 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 200~75%
-      velocity          0 0 1 ~10
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 300
-      acceleration          0 0 -1 0
-
-      radius 0 150.0 40.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 500
-
-      childSystem models/weapons/grenade/impactTrailPS2
-    }
+      shader sync gfx/sprites/smoke
+      displacement          0 0 0 0
 
-    count 5
-    delay 0
-    period 10 - ~0%
-  }
-  
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
+      velocityType          normal
 
-      displacement 0 0 8 ~20
+      velocityDir           linear
 
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 700~3%
-      velocity          0 0 1 ~320
+      velocityMagnitude     100
+      velocity              0 0 0 ~35
 
       accelerationType      static
       accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 1 0
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
 
-      radius 0 10.0 2.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.1
-      bounceMark      2~2 32 gfx/marks/burn_mrk
+      radius                0 0 100
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
 
-      lifeTime 150
-	  onDeathSystem  models/weapons/smoke/addimpactFlamePSsm
+      lifeTime              800~200
     }
 
-    count 10
-    delay 0
-    period 0 - ~0%
+    count   10
+    delay   0
+    period  0 - 0
   }
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
-
-      displacement 0 0 8 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 400~20%
-      velocity          0 0 -1 ~190
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 -1 0
-
-      radius 0 1.5 0.5
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.1
-
-      lifeTime 3000
-	  onDeathSystem  models/weapons/smoke/addimpactFlamePSsm
-    }
 
-    count 30
-    delay 0
-    period 0 - ~0%
-  }
-}
-//smoke nade
-models/weapons/smoke/impactPS
-{
- 
   ejector
   {
     particle
     {
+      shader sync rocketx1 rocketx2 rocketx3 rocketx4 rocketx5 rocketx6 rocketx7 rocketx8 rocketx9 rocketx10 rocketx11 rocketx12 rocketx13 rocketx14 rocketx15 rocketx16 rocketx17 rocketx18 rocketx19 rocketx20 rocketx21 rocketx22 rocketx23 rocketx24 rocketx25 rocketx26 rocketx27 rocketx28 rocketx29
+      displacement          0 0 0 0
 
-      shader sync gfx/sprites/smoke2
-      displacement 0 0 3 0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 20
-      velocity          0 0 50 ~20
-	  
-      realLight 
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 1
-      acceleration          0 0 1 ~360
-
-      radius 0 2 10.0
-      alpha  0 1 0.0
-      rotation 20 ~360 -
-      bounce 0.5
-      lifeTime 5000
+      velocityType          normal
 
+      velocityDir           linear
 
-    }
+      velocityMagnitude     100
+      velocity              0 0 0 ~35
 
-    count infinite
-    delay 4000
-    period 50 - ~0%
-  }
- 
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke2
-      displacement 0 0 23 ~0
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 60
-      velocity          0 0 1 ~360
-      realLight 
       accelerationType      static
       accelerationDir       linear
-      accelerationMagnitude 60
-      acceleration          0 0 -1 ~360
-      radius 8 20.0 370.0
-      alpha  0 0.5 0.0
-      rotation 0 0 -
-	  bounce 0.5
-      lifeTime 20000
-	  childSystem models/weapons/smoke/addimpactPS
-    }
-
-    count 40
-    delay 6000
-    period 10 - ~0%
-  }
-}
-
-//smoke nade add
-models/weapons/smoke/addimpactPS
-
-  {
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke2
-      displacement 0 0 0 ~0
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 50
-      velocity          0 0 1 ~360
-
-      radius 0 50 300.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      bounce 0.5
-      realLight 
-      lifeTime 40000
-    }
-
-    count 2
-    delay 2000
-    period 80 - ~0%
-  }
-}
-
-//flame add
-models/weapons/smoke/addimpactFlamePS
-
-  {
-  ejector
-  {
-    particle
-    {
-      shader sync textures/yeflamer/flamesadd
-        displacement 0 0 0 ~0
-
-      parentVelocityFraction  0.0~0.05
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 2
-      velocity          0 0 -1 ~360
-
-      radius  0 50.0 50.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      lifeTime 10000
-    }
-
-    count 1
-    delay 0
-    period 0 - ~0%
-  }
-}
-models/weapons/smoke/addimpactFlamePSsm
-
-  {
-  ejector
-  {
-    particle
-    {
-      shader sync textures/yeflamer/flamesadd
-        displacement 0 0 0 ~0
-
-      parentVelocityFraction  0.0~0.05
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 2
-      velocity          0 0 -1 ~360
-
-      radius  0 20.0 20.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      lifeTime 10000
-    }
-
-    count 1
-    delay 0
-    period 0 - ~0%
-  }
-}
-
-
-
-
-
-models/weapons/grenade/impactTrailPS2
-{
-  ejector
-  {
-    particle
-    {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-
-      displacement 0 0 0 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 30
-      velocity          0 0 -1 ~0
-
-      radius 0 150.0 10.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 500
-    }
-
-    count 5
-    delay 0
-    period 40 - 0
-  }
-}
-
-
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
 
-//smoke nade add
-models/weapons/smoke/addimpactPS4
-
-  {
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke
-      displacement 0 0 0 ~0
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 50
-      velocity          0 0 1 ~360
+      radius                0 50 120
+      alpha                 250 1 1
+      rotation              ~360 0 0
+      bounce                0.0
+      color                 0 { 0.8 0.2 0.2 } -
 
-      radius 0 50 300.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      bounce 0.5
-      realLight 
-      lifeTime 10000
+      lifeTime              300~100
     }
 
-    count 2
-    delay 2000
-    period 80 - ~0%
+    count   1
+    delay   0
+    period  0 - 0
   }
 }
 
 
-
-
diff --git a/assets/scripts/hw_flamer.particle b/assets/scripts/hw_flamer.particle
index 77ae52a..430b5ae 100644
--- a/assets/scripts/hw_flamer.particle
+++ b/assets/scripts/hw_flamer.particle
@@ -35,166 +35,6 @@ models/weapons/flamer/muzzlePS
 }
 
 
-models/weapons/flamer/impactbigPS
-{
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke
-
-      displacement 0 0 0 50.0
-      normalDisplacement 3.0
-
-      velocityType      normal
-      velocityDir       linear
-      velocityMagnitude 10
-      velocity          0 0 0 0
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 1
-      acceleration          0 0 1 0
-
-      radius 0 20.0 70.0
-      alpha  0 1 0.0
-      rotation 0 ~360 -
-      bounce 0.0
-
-      lifeTime 10000
-    }
-
-    count 1
-    delay 0
-    period 0 - ~0%
-  }
-  
-      ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/smoke
-      displacement 0 0 23 ~0
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 60
-      velocity          0 0 1 ~360
-      realLight 
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 60
-      acceleration          0 0 -1 ~360
-      radius 8 20.0 150.0
-      alpha  0 0.5 0.0
-      rotation 0 0 -
-	  bounce 0.5
-      lifeTime 4000
-	  childSystem models/weapons/smoke/addimpactPS4
-    }
-
-    count 1
-    delay 0
-    period 10 - ~0%
-      }
-	  
-  ejector
-  {
-    particle
-    {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
-
-      displacement 0 0 11 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 200~75%
-      velocity          0 0 1 ~10
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 300
-      acceleration          0 0 -1 0
-
-      radius 0 110.0 70.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0
-
-      lifeTime 500
-
-      childSystem models/weapons/grenade/impactTrailPS2
-    }
-
-    count 4
-    delay 0
-    period 10 - ~0%
-  }
-  
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
-
-      displacement 0 0 8 ~20
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 700~3%
-      velocity          0 0 1 ~320
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 1 0
-
-      radius 0 80.0 5.0
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.1
-      bounceMark      2~2 32 gfx/marks/burn_mrk
-
-      lifeTime 180
-	  onDeathSystem  models/weapons/smoke/addimpactFlamePSsm
-    }
-
-    count 6
-    delay 0
-    period 0 - ~0%
-  }
-  ejector
-  {
-    particle
-    {
-      shader sync gfx/sprites/spark
-
-      displacement 0 0 8 ~0
-
-      velocityType      static
-      velocityDir       linear
-      velocityMagnitude 400~20%
-      velocity          0 0 -1 ~190
-
-      accelerationType      static
-      accelerationDir       linear
-      accelerationMagnitude 800
-      acceleration          0 0 -1 0
-
-      radius 0 5.5 1.5
-      alpha  0 1.0 0.0
-      rotation 0 ~360 -
-      bounce 0.1
-
-      lifeTime 3000
-	  onDeathSystem  models/weapons/smoke/addimpactFlamePSsm
-    }
-
-    count 25
-    delay 0
-    period 0 - ~0%
-  }
-}
-
 
 models/weapons/flamer/pMissilePS
 {
diff --git a/assets/scripts/hw_flamer.trail b/assets/scripts/hw_flamer.trail
deleted file mode 100644
index 4ba8db6..0000000
--- a/assets/scripts/hw_flamer.trail
+++ /dev/null
@@ -1,14 +0,0 @@
-models/weapons/flamer/missileTS
-{
-  beam
-  {
-    shader        gfx/flamer/trail
-
-    segments      3
-    width         80.0 20.0
-    alpha         1.0 0.1
-    segmentTime   120
-
-    textureType   stretch 0.0 1.0
-  }
-}
\ No newline at end of file
diff --git a/assets/sound/weapons/grenade/LICENSE b/assets/sound/weapons/grenade/LICENSE
new file mode 100644
index 0000000..3db75f4
--- /dev/null
+++ b/assets/sound/weapons/grenade/LICENSE
@@ -0,0 +1,3 @@
+tick.wav is a derivative work of a sound made by delphidebrain, released under the terms of Creative Commons Attribution 3.0.
+
+prime.wav is a derivative work of a sound made by Ryan Conway, released under the terms of Creative Commons Attribution 3.0.
diff --git a/assets/sound/weapons/grenade/prime.wav b/assets/sound/weapons/grenade/prime.wav
new file mode 100644
index 0000000..431cca9
--- /dev/null
+++ b/assets/sound/weapons/grenade/prime.wav
diff --git a/assets/sound/weapons/grenade/tick.wav b/assets/sound/weapons/grenade/tick.wav
new file mode 100644
index 0000000..6624c47
--- /dev/null
+++ b/assets/sound/weapons/grenade/tick.wav