From b0a9981e09bbc7c30769f680a4e0ff17c9ea8239 Mon Sep 17 00:00:00 2001 From: enneract Date: Mon, 24 Nov 2014 02:20:51 +0100 Subject: Implement the Lightning Gun. --- assets/scripts/hw_lightning.particle | 35 +++++++++++++++++++++++++++++++++++ assets/scripts/hw_lightning.shader | 9 +++++++++ 2 files changed, 44 insertions(+) create mode 100644 assets/scripts/hw_lightning.particle create mode 100644 assets/scripts/hw_lightning.shader (limited to 'assets/scripts') diff --git a/assets/scripts/hw_lightning.particle b/assets/scripts/hw_lightning.particle new file mode 100644 index 0000000..afcba47 --- /dev/null +++ b/assets/scripts/hw_lightning.particle @@ -0,0 +1,35 @@ + +models/weapons/lightning/impactPS +{ + ejector + { + particle + { + shader sync gfx/psaw/blue_particle + + displacement 0 0 0 ~2.0 + + velocityType normal + velocityDir linear + velocityMagnitude 100 + velocity 0 0 -1 ~90 + + accelerationType static + accelerationDir linear + accelerationMagnitude 800 + acceleration 0 0 -1 ~10 + + radius 0 1.0~2.0 3.0~2.0 + alpha 0 1.0 1.0 + rotation 0 ~360 - + bounce 0.5 + + lifeTime 1000 + } + + count 3 + delay 0 + period 0 - ~0% + } +} + diff --git a/assets/scripts/hw_lightning.shader b/assets/scripts/hw_lightning.shader new file mode 100644 index 0000000..2fa0c0c --- /dev/null +++ b/assets/scripts/hw_lightning.shader @@ -0,0 +1,9 @@ +gfx/lightning/beam +{ + nomipmaps + { + map gfx/lightning/beam + blendFunc add + tcMod scroll -5 0 + } +} -- cgit From 0aa94f6b6b7b49972a839aadaee4dbb42a3a53de Mon Sep 17 00:00:00 2001 From: enneract Date: Tue, 25 Nov 2014 01:45:57 +0100 Subject: Lightning Gun assets. --- assets/scripts/hw_lightning.particle | 10 +++++----- assets/scripts/hw_lightning.shader | 29 ++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 6 deletions(-) (limited to 'assets/scripts') diff --git a/assets/scripts/hw_lightning.particle b/assets/scripts/hw_lightning.particle index afcba47..f9370d5 100644 --- a/assets/scripts/hw_lightning.particle +++ b/assets/scripts/hw_lightning.particle @@ -5,29 +5,29 @@ models/weapons/lightning/impactPS { particle { - shader sync gfx/psaw/blue_particle + shader sync gfx/lightning/particle displacement 0 0 0 ~2.0 velocityType normal velocityDir linear velocityMagnitude 100 - velocity 0 0 -1 ~90 + velocity 0 0 -1 ~10 accelerationType static accelerationDir linear accelerationMagnitude 800 acceleration 0 0 -1 ~10 - radius 0 1.0~2.0 3.0~2.0 + radius 0 9 0 alpha 0 1.0 1.0 rotation 0 ~360 - bounce 0.5 - lifeTime 1000 + lifeTime 100 } - count 3 + count 1 delay 0 period 0 - ~0% } diff --git a/assets/scripts/hw_lightning.shader b/assets/scripts/hw_lightning.shader index 2fa0c0c..c42612b 100644 --- a/assets/scripts/hw_lightning.shader +++ b/assets/scripts/hw_lightning.shader @@ -1,9 +1,36 @@ +gfx/lightning/particle +{ + { + map models/weapons/lightning/flash.jpg + blendFunc add + } +} + gfx/lightning/beam { nomipmaps { - map gfx/lightning/beam + map models/weapons/lightning/bolt.jpg blendFunc add tcMod scroll -5 0 + tcMod scale 5 1 + } +} + +models/weapons/lightning/flash +{ + cull none + { + map models/weapons/lightning/flash.jpg + blendFunc add + } +} + +models/weapons/lightning/bolt +{ + cull none + { + map models/weapons/lightning/bolt.jpg + blendFunc add } } -- cgit From d1853e239ae258e394a516f0eeda80f430a1a328 Mon Sep 17 00:00:00 2001 From: enneract Date: Sat, 13 Dec 2014 16:06:15 +0100 Subject: View quake, improved Rocket Launcher assets. (FIXME: Rocket explosion doesn't fade out) --- assets/scripts/hw_rocketl.particle | 41 +---- assets/scripts/hw_rocketl.shader | 302 +++++++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+), 37 deletions(-) (limited to 'assets/scripts') 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 @@ -34,44 +34,11 @@ models/weapons/rocketl/missilePS models/weapons/rocketl/impactPS { - ejector - { - 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 + } +} + -- cgit From cf0eb59c5407fd959410035532120a52a11b109e Mon Sep 17 00:00:00 2001 From: enneract Date: Sun, 14 Dec 2014 12:38:45 +0100 Subject: Fix rocket explosion not fading out properly. --- assets/scripts/hw_rocketl.particle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assets/scripts') diff --git a/assets/scripts/hw_rocketl.particle b/assets/scripts/hw_rocketl.particle index 289fced..5fbf798 100644 --- a/assets/scripts/hw_rocketl.particle +++ b/assets/scripts/hw_rocketl.particle @@ -86,7 +86,7 @@ models/weapons/rocketl/impactPS accelerationMagnitude 25 radius 0 30 70 - alpha 250 1 0 + alpha 250 1 1 rotation ~360 0 0 bounce 0.0 color 0 { 0.8 0.2 0.2 } - -- cgit