View quake, improved Rocket Launcher assets.

(FIXME: Rocket explosion doesn't fade out)

36 files changed, 311 insertions, 37 deletions

diff --git a/assets/gfx/rocketx/0002.jpg b/assets/gfx/rocketx/0002.jpg
new file mode 100644
index 0000000..776768b
--- /dev/null
+++ b/assets/gfx/rocketx/0002.jpg
diff --git a/assets/gfx/rocketx/0003.jpg b/assets/gfx/rocketx/0003.jpg
new file mode 100644
index 0000000..91313e7
--- /dev/null
+++ b/assets/gfx/rocketx/0003.jpg
diff --git a/assets/gfx/rocketx/0004.jpg b/assets/gfx/rocketx/0004.jpg
new file mode 100644
index 0000000..a1848ed
--- /dev/null
+++ b/assets/gfx/rocketx/0004.jpg
diff --git a/assets/gfx/rocketx/0005.jpg b/assets/gfx/rocketx/0005.jpg
new file mode 100644
index 0000000..da5e255
--- /dev/null
+++ b/assets/gfx/rocketx/0005.jpg
diff --git a/assets/gfx/rocketx/0006.jpg b/assets/gfx/rocketx/0006.jpg
new file mode 100644
index 0000000..6d026ba
--- /dev/null
+++ b/assets/gfx/rocketx/0006.jpg
diff --git a/assets/gfx/rocketx/0007.jpg b/assets/gfx/rocketx/0007.jpg
new file mode 100644
index 0000000..c18ce0d
--- /dev/null
+++ b/assets/gfx/rocketx/0007.jpg
diff --git a/assets/gfx/rocketx/0008.jpg b/assets/gfx/rocketx/0008.jpg
new file mode 100644
index 0000000..06a2d74
--- /dev/null
+++ b/assets/gfx/rocketx/0008.jpg
diff --git a/assets/gfx/rocketx/0009.jpg b/assets/gfx/rocketx/0009.jpg
new file mode 100644
index 0000000..6e7bc69
--- /dev/null
+++ b/assets/gfx/rocketx/0009.jpg
diff --git a/assets/gfx/rocketx/0010.jpg b/assets/gfx/rocketx/0010.jpg
new file mode 100644
index 0000000..400d603
--- /dev/null
+++ b/assets/gfx/rocketx/0010.jpg
diff --git a/assets/gfx/rocketx/0011.jpg b/assets/gfx/rocketx/0011.jpg
new file mode 100644
index 0000000..17e0220
--- /dev/null
+++ b/assets/gfx/rocketx/0011.jpg
diff --git a/assets/gfx/rocketx/0012.jpg b/assets/gfx/rocketx/0012.jpg
new file mode 100644
index 0000000..6765bf9
--- /dev/null
+++ b/assets/gfx/rocketx/0012.jpg
diff --git a/assets/gfx/rocketx/0013.jpg b/assets/gfx/rocketx/0013.jpg
new file mode 100644
index 0000000..a543aba
--- /dev/null
+++ b/assets/gfx/rocketx/0013.jpg
diff --git a/assets/gfx/rocketx/0014.jpg b/assets/gfx/rocketx/0014.jpg
new file mode 100644
index 0000000..5ed10d8
--- /dev/null
+++ b/assets/gfx/rocketx/0014.jpg
diff --git a/assets/gfx/rocketx/0015.jpg b/assets/gfx/rocketx/0015.jpg
new file mode 100644
index 0000000..5fe6015
--- /dev/null
+++ b/assets/gfx/rocketx/0015.jpg
diff --git a/assets/gfx/rocketx/0016.jpg b/assets/gfx/rocketx/0016.jpg
new file mode 100644
index 0000000..24f0d16
--- /dev/null
+++ b/assets/gfx/rocketx/0016.jpg
diff --git a/assets/gfx/rocketx/0017.jpg b/assets/gfx/rocketx/0017.jpg
new file mode 100644
index 0000000..3b037f5
--- /dev/null
+++ b/assets/gfx/rocketx/0017.jpg
diff --git a/assets/gfx/rocketx/0018.jpg b/assets/gfx/rocketx/0018.jpg
new file mode 100644
index 0000000..b479532
--- /dev/null
+++ b/assets/gfx/rocketx/0018.jpg
diff --git a/assets/gfx/rocketx/0019.jpg b/assets/gfx/rocketx/0019.jpg
new file mode 100644
index 0000000..288bd52
--- /dev/null
+++ b/assets/gfx/rocketx/0019.jpg
diff --git a/assets/gfx/rocketx/0020.jpg b/assets/gfx/rocketx/0020.jpg
new file mode 100644
index 0000000..97f2d10
--- /dev/null
+++ b/assets/gfx/rocketx/0020.jpg
diff --git a/assets/gfx/rocketx/0021.jpg b/assets/gfx/rocketx/0021.jpg
new file mode 100644
index 0000000..3443b96
--- /dev/null
+++ b/assets/gfx/rocketx/0021.jpg
diff --git a/assets/gfx/rocketx/0022.jpg b/assets/gfx/rocketx/0022.jpg
new file mode 100644
index 0000000..b14747d
--- /dev/null
+++ b/assets/gfx/rocketx/0022.jpg
diff --git a/assets/gfx/rocketx/0023.jpg b/assets/gfx/rocketx/0023.jpg
new file mode 100644
index 0000000..da23eb0
--- /dev/null
+++ b/assets/gfx/rocketx/0023.jpg
diff --git a/assets/gfx/rocketx/0024.jpg b/assets/gfx/rocketx/0024.jpg
new file mode 100644
index 0000000..bfe4476
--- /dev/null
+++ b/assets/gfx/rocketx/0024.jpg
diff --git a/assets/gfx/rocketx/0025.jpg b/assets/gfx/rocketx/0025.jpg
new file mode 100644
index 0000000..3c95e8b
--- /dev/null
+++ b/assets/gfx/rocketx/0025.jpg
diff --git a/assets/gfx/rocketx/0026.jpg b/assets/gfx/rocketx/0026.jpg
new file mode 100644
index 0000000..31590ea
--- /dev/null
+++ b/assets/gfx/rocketx/0026.jpg
diff --git a/assets/gfx/rocketx/0027.jpg b/assets/gfx/rocketx/0027.jpg
new file mode 100644
index 0000000..004d27f
--- /dev/null
+++ b/assets/gfx/rocketx/0027.jpg
diff --git a/assets/gfx/rocketx/0028.jpg b/assets/gfx/rocketx/0028.jpg
new file mode 100644
index 0000000..96405cb
--- /dev/null
+++ b/assets/gfx/rocketx/0028.jpg
diff --git a/assets/gfx/rocketx/0029.jpg b/assets/gfx/rocketx/0029.jpg
new file mode 100644
index 0000000..c344ab9
--- /dev/null
+++ b/assets/gfx/rocketx/0029.jpg
diff --git a/assets/gfx/rocketx/0030.jpg b/assets/gfx/rocketx/0030.jpg
new file mode 100644
index 0000000..779691b
--- /dev/null
+++ b/assets/gfx/rocketx/0030.jpg
diff --git a/assets/models/weapons/lcannon/weapon.cfg b/assets/models/weapons/lcannon/weapon.cfg
index e6f1ab4..5719fdc 100644
--- a/assets/models/weapons/lcannon/weapon.cfg
+++ b/assets/models/weapons/lcannon/weapon.cfg
@@ -16,6 +16,7 @@ primary
   impactMark            32 gfx/marks/bullet_mrk
   impactSound           0 models/weapons/lcannon/impact0.wav
   impactParticleSystem  models/weapons/lcannon/impactPS2
+  impactQuake           1
 }
 
 secondary
@@ -30,4 +31,5 @@ secondary
   impactMark            8 gfx/marks/bullet_mrk
   impactSound           0 models/weapons/lcannon/impact0.wav
   impactParticleSystem  models/weapons/lcannon/secondaryImpactPS2
+  impactQuake           5
 }
diff --git a/assets/models/weapons/lightning/weapon.cfg b/assets/models/weapons/lightning/weapon.cfg
index 4d48e0f..9b33568 100644
--- a/assets/models/weapons/lightning/weapon.cfg
+++ b/assets/models/weapons/lightning/weapon.cfg
@@ -10,6 +10,7 @@ primary
 
 	flashSound            0 models/weapons/lightning/flash0.wav
 	firingSound           models/weapons/lightning/firing.wav
+	flashQuake            0.6
 
 	impactMark            6 gfx/marks/bullet_mrk
 	impactSound           0 models/weapons/lightning/impact0.wav
diff --git a/assets/models/weapons/rocketl/rocketl.md3 b/assets/models/weapons/rocketl/rocketl.md3
index 4119209..d515cf4 100644
--- a/assets/models/weapons/rocketl/rocketl.md3
+++ b/assets/models/weapons/rocketl/rocketl.md3
diff --git a/assets/models/weapons/rocketl/rocketl_flash.md3 b/assets/models/weapons/rocketl/rocketl_flash.md3
new file mode 100644
index 0000000..c1acf35
--- /dev/null
+++ b/assets/models/weapons/rocketl/rocketl_flash.md3
diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg
index e5dafc6..5c6b70b 100644
--- a/assets/models/weapons/rocketl/weapon.cfg
+++ b/assets/models/weapons/rocketl/weapon.cfg
@@ -11,9 +11,11 @@ primary
 
   flashDlightColor      1.0 0.7 0.0
   flashSound            0 models/weapons/rocketl/flash0.wav
+  flashQuake            1
 
   impactMark            32 gfx/marks/bullet_mrk
   impactSound           0 models/weapons/rocketl/impact0.wav
   impactParticleSystem  models/weapons/rocketl/impactPS
+  impactQuake           50
 }
 
diff --git a/assets/scripts/hw_rocketl.particle b/assets/scripts/hw_rocketl.particle
index 891ac18..289fced 100644
--- a/assets/scripts/hw_rocketl.particle
+++ b/assets/scripts/hw_rocketl.particle
@@ -38,40 +38,7 @@ models/weapons/rocketl/impactPS
   {
     particle
     {
-      shader sync rocketFlareParticle
-      displacement          0 0 0 0
-
-      velocityType          normal
-
-      velocityDir           linear
-
-      velocityMagnitude     0
-      velocity              0 0 0 ~0
-
-      accelerationType      static
-      accelerationDir       linear
-      acceleration          0 0 0 ~0
-      accelerationMagnitude 0
-
-      radius                0 50 100
-      alpha                 250 1 0
-      rotation              0 ~-15 ~15
-      bounce                0.0
-
-      lifeTime              40
-    }
-
-    count   1
-    delay   0
-    period  0 - 0
-  }
-
-  ejector
-  {
-    particle
-    {
       shader sync gfx/sprites/smoke
-      //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          normal
@@ -103,7 +70,7 @@ models/weapons/rocketl/impactPS
   {
     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
+      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
 
       velocityType          normal
@@ -118,9 +85,9 @@ models/weapons/rocketl/impactPS
       acceleration          0 0 -1 ~5
       accelerationMagnitude 25
 
-      radius                0 0 100
-      alpha                 250 .75 0
-      rotation              0 ~-15 ~15
+      radius                0 30 70
+      alpha                 250 1 0
+      rotation              ~360 0 0
       bounce                0.0
       color                 0 { 0.8 0.2 0.2 } -
 
diff --git a/assets/scripts/hw_rocketl.shader b/assets/scripts/hw_rocketl.shader
index 28c56cb..45abbb8 100644
--- a/assets/scripts/hw_rocketl.shader
+++ b/assets/scripts/hw_rocketl.shader
@@ -56,3 +56,305 @@ rocketThrust
 	}
 }
 
+models/weapons/rocketl/flash
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0006.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+// BEST ROCKET EPXLSION EVAR!
+rocketx1
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0002.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx2
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0003.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx3
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0004.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx4
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0005.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx5
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0006.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx6
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0007.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx7
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0008.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx8
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0009.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx9
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0010.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx10
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0011.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx11
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0012.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx12
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0013.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx13
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0014.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx14
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0015.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx15
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0016.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx16
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0017.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx17
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0018.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx18
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0019.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx19
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0020.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx20
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0021.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx21
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0022.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx22
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0023.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx23
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0024.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx24
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0025.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx25
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0026.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx26
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0027.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx27
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0028.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+
+rocketx28
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0029.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx29
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0030.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+