lightning gun effects tweaked

blood marks replaced by sparks
widescreen levelshots added

baseq3r/scripts/weapons.shader

@@ -144,65 +144,9 @@ BFGTrail
 }
 
 // ------------------------------------------------------------
-// 2.Chaingun
+// 2.Lightning Gun
 // ------------------------------------------------------------
 
-vulcanFlash
-{
-	cull disable
-	deformVertexes bulge 3 3 76
-	{
-		clampmap models/weapons/vulcan/muzzy.tga
-		blendfunc add
-		rgbGen wave inversesawtooth 0 1 0 30 
-		tcMod rotate 1554
-	}
-	{
-		clampmap models/weapons/vulcan/muzzy.tga
-		blendfunc add
-		rgbGen wave inversesawtooth 0 1 0 30 
-		tcMod rotate -2640
-	}
-	{
-		clampmap models/weapons/vulcan/muzzy.tga
-		blendfunc add
-		rgbGen wave inversesawtooth 0 1 0 30 
-		tcMod rotate 7402
-		tcMod stretch sin 0 1 0 1 
-	}
-	{
-		clampmap models/weapons/vulcan/muzzy.tga
-		blendfunc add
-		rgbGen wave inversesawtooth 0 1 0 30 
-		tcMod rotate -6403
-		tcMod stretch sin 0.5 0.5 0 1 
-	}
-}
-
-models/weapons/vulcan/vulcan
-{
-	{
-		map models/weapons/vulcan/vulcan.tga
-		rgbGen lightingDiffuse
-	}
-}
-
-lightningBolt
-{
-	cull disable
-	{
-		animmap 30 textures/oafx/lbeam3.tga textures/oafx/lbeam4.tga textures/oafx/lbeam5.tga textures/oafx/lbeam6.tga textures/oafx/lbeam7.tga textures/oafx/lbeam8.tga textures/oafx/lbeam5.tga textures/oafx/lbeam7.tga 
-		blendfunc add
-		tcMod scale 0.5 1
-		tcMod scroll -1 0
-	}
-	{
-		animmap 40 textures/oafx/lbeam8.tga textures/oafx/lbeam7.tga textures/oafx/lbeam4.tga textures/oafx/lbeam5.tga textures/oafx/lbeam6.tga textures/oafx/lbeam3.tga textures/oafx/lbeam7.tga textures/oafx/lbeam4.tga 
-		blendfunc add
-		tcMod scale 0.2 1
-		tcMod scroll -0.3 0
-	}
-}
 
 lightningBoltnew
 {
@@ -214,23 +158,6 @@ lightningBoltnew
 	}
 }
 
-lightningBoltNewNPM
-{
-	cull disable
-	{
-		animmap 30 textures/oafx/lbeam3.tga textures/oafx/lbeam4.tga textures/oafx/lbeam5.tga textures/oafx/lbeam6.tga textures/oafx/lbeam7.tga textures/oafx/lbeam8.tga textures/oafx/lbeam5.tga textures/oafx/lbeam7.tga 
-		blendfunc add
-		tcMod scale 0.5 1
-		tcMod scroll -1 0
-	}
-	{
-		animmap 40 textures/oafx/lbeam8.tga textures/oafx/lbeam7.tga textures/oafx/lbeam4.tga textures/oafx/lbeam5.tga textures/oafx/lbeam6.tga textures/oafx/lbeam3.tga textures/oafx/lbeam7.tga textures/oafx/lbeam4.tga 
-		blendfunc add
-		tcMod scale 0.2 1
-		tcMod scroll -0.3 0
-	}
-}
-
 lightnnFlash
 {
 	cull disable
@@ -246,6 +173,36 @@ lightnnFlash
 		rgbGen entity
 		tcMod rotate 53
 	}
+
+}
+
+models/weapons2/lightning/f_lightning
+{
+	sort additive
+	cull disable
+	{
+		map models/weapons2/lightning/f_lightning.tga
+		blendfunc GL_ONE GL_ONE
+	}
+}
+
+models/weaphits/electric
+{
+	cull none
+	
+	{
+		clampmap models/weaphits/electric.jpg
+		blendFunc GL_ONE GL_ONE
+                rgbgen wave triangle .8 2 0 9
+                tcMod rotate 360
+	}	
+        {
+		clampmap models/weaphits/electric.tga
+		blendFunc GL_ONE GL_ONE
+                rgbgen wave triangle 1 1.4 0 9.5
+                tcMod rotate -202
+	}	
+	
 }
 
 // ------------------------------------------------------------

engine/code/qcommon/q_shared.h

@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.0.3.0_r292"
+#define PRODUCT_VERSION "v0.0.3.0_r293"
 #endif
 
 

q3rallycode.ppr

@@ -867,6 +867,12 @@ q3rallycode
 6=engine\code\q3_ui\ui_credits.c
 7=engine\code\q3_ui\ui_qmenu.c
 8=engine\code\q3_ui\ui_local.h
+9=engine\code\game\bg_public.h
+10=engine\code\cgame\cg_event.c
+11=engine\code\cgame\cg_effects.c
+12=engine\code\cgame\cg_local.h
+13=engine\code\cgame\cg_rally_hud.c
+14=engine\code\q3_ui\ui_rally_options.c
 [Selected Project Files]
 Main=
 Selected=engine\code\qcommon\q_shared.h
@@ -877,10 +883,10 @@ Caret=1,3695
 TopLine=593
 Caret=13,612
 [engine\code\cgame\cg_weapons.c]
-TopLine=766
-Caret=17,810
+TopLine=677
+Caret=1,692
 [engine\code\game\g_missile.c]
-TopLine=1022
+TopLine=201
 Caret=1,201
 [engine\code\qcommon\q_shared.h]
 TopLine=55
@@ -889,7 +895,7 @@ Caret=39,70
 TopLine=63
 Caret=1,78
 [engine\code\q3_ui\ui_credits.c]
-TopLine=110
+TopLine=111
 Caret=76,135
 [engine\code\q3_ui\ui_qmenu.c]
 TopLine=1899
@@ -897,3 +903,21 @@ Caret=64,1916
 [engine\code\q3_ui\ui_local.h]
 TopLine=25
 Caret=33,40
+[engine\code\game\bg_public.h]
+TopLine=587
+Caret=25,611
+[engine\code\cgame\cg_event.c]
+TopLine=1117
+Caret=1,1132
+[engine\code\cgame\cg_effects.c]
+TopLine=208
+Caret=48,229
+[engine\code\cgame\cg_local.h]
+TopLine=1784
+Caret=1,1799
+[engine\code\cgame\cg_rally_hud.c]
+TopLine=723
+Caret=1,738
+[engine\code\q3_ui\ui_rally_options.c]
+TopLine=227
+Caret=1,242