From 0aa94f6b6b7b49972a839aadaee4dbb42a3a53de Mon Sep 17 00:00:00 2001
From: enneract <trem.redman@gmail.com>
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