new ammoboxes (insellium)

new ammosprites (insellium)

baseq3r/scripts/ammo.mtr

@@ -0,0 +1,458 @@
+// powerups
+//
+//
+// ammo
+//
+models/powerups/ammo/bfgammo_new
+{
+	{
+		map models/powerups/ammo/envmapbfg.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/bfgfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/bfgammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/bfgammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+	{
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/bfgammo1
+{
+        {
+	        map models/powerups/ammo/purple.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/bfgammo2
+{
+	{
+		map models/powerups/ammo/bfgammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/grenammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/grenammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+	   {
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/grenammo1
+{
+        {
+	        map models/powerups/ammo/green.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/grenammo2
+{
+	{
+		map models/powerups/ammo/grenammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/ammo/grenade
+{
+        {
+                map models/ammo/grenade.tga
+        }
+	{
+		AnimMap 7 models/ammo/grenade_r.tga models/ammo/grenade_g.tga
+	       blendfunc GL_ONE GL_ONE
+	}
+}
+models/powerups/ammo/lighammo_new
+{
+	{
+		map models/powerups/ammo/envmapligh.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/lighfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/lighammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/lighammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+	{
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/lighammo1
+{
+        {
+	        map models/powerups/ammo/pale_yellow.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/lighammo2
+{
+	{
+		map models/powerups/ammo/lighammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/machammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/machammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+	   {
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+          }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/machammo1
+{
+        {
+	        map models/powerups/ammo/yellow.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/machammo2
+{
+	{
+		map models/powerups/ammo/machammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/plasammo_new
+{
+	{
+		map models/powerups/ammo/envmapplas.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/plasfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/plasammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/plasammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+	{
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/plasammo1
+{
+        {
+	        map models/powerups/ammo/blue.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/plasammo2
+{
+	{
+		map models/powerups/ammo/plasammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/railammo1
+{
+	{
+		map textures/effects/envmaprail.tga
+		rgbGen lightingDiffuse
+		tcGen environment 
+	}
+}
+models/powerups/ammo/railammo_new
+{
+	{
+		map textures/effects/envmaprail.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/railfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/railammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/railammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+	{
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/railammo2
+{
+	{
+		map models/powerups/ammo/railammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/rockammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/rockammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+	   {
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/rockammo1
+{
+        {
+	        map models/powerups/ammo/red.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/rockammo2
+{
+	{
+		map models/powerups/ammo/rockammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/shotammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/shotammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+	   {
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/shotammo1
+{
+        {
+	        map models/powerups/ammo/orange.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/shotammo2
+{
+	{
+		map models/powerups/ammo/shotammo2.tga
+		rgbGen identity
+	}
+	
+}
+
+models/powerups/ammo/flameammo_new
+{
+	{
+		map textures/effects/tinfx2d.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map textures/sfx/firegorre.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/flameammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/flameammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+	{
+            stage normalmap
+            map models/powerups/ammo/ammo_n.png
+            normalScale 1 1
+        }
+        {
+            stage specularmap
+            map models/powerups/ammo/ammo_s.png
+            specularReflectance 1
+            specularExponent 32
+        }
+}
+models/powerups/ammo/flameammo1
+{
+        {
+	        map models/powerups/ammo/red.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/flameammo2
+{
+	{
+		map models/powerups/ammo/flameammo2.tga
+		rgbGen identity
+	}
+	
+}

baseq3r/scripts/ammo.shader

@@ -1,240 +1,359 @@
-// ------------------------------------------------------------
-// Shaders for Q3Rally Ammo Boxes - rewritten by P3rlE
-// based on the ammo.shader from jzero --> johnzero@verizon.net
-// ------------------------------------------------------------
-
-
-// ------------------------------------------------------------
-// 1.Machinegun ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/machammo
+// powerups
+//
+//
+// ammo
+//
+models/powerups/ammo/bfgammo_new
 {
 	{
-		map models/powerups/ammo/ammobox.tga
-		rgbGen lightingDiffuse
-	}
-	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 1 1 0 )
-		alphaGen wave sawtooth 0 1 0 1 
-	}
-}
-
-models/powerups/ammo/machammo2
-{
-	{
-		map models/powerups/ammo/machammo2.tga
+		map models/powerups/ammo/envmapbfg.tga
 		rgbGen identity
-	}
-}
-
-// ------------------------------------------------------------
-// 2.Shotgun ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/shotammo
-{
-	{
-		map models/powerups/ammo/ammobox.tga
-		rgbGen lightingDiffuse
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
 	}
 	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 1 0.5 0 )
-		alphaGen wave sawtooth 0 1 0 1 
-	}
-}
-
-models/powerups/ammo/shotammo2
-{
-	{
-		map models/powerups/ammo/shotammo2.tga
+		map models/powerups/ammo/bfgfluid.tga
+		blendfunc add
 		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
 	}
-}
-
-// ------------------------------------------------------------
-// 3.Grenadelauncher ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/grenammo
 	{
-	{
-		map models/powerups/ammo/ammobox.tga
+		map models/powerups/ammo/bfgammo_new.tga
+		blendfunc blend
 		rgbGen lightingDiffuse
 	}
 	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 0 0.56 0 )
-		alphaGen wave sawtooth 0 1 0 1 
+		map models/powerups/ammo/bfgammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
 	}
 }
-
-models/powerups/ammo/grenammo2
+models/powerups/ammo/bfgammo1
 {
         {
-		map models/powerups/ammo/grenammo2.tga
-		rgbGen identity
-	}
-}
-
-// ------------------------------------------------------------
-// 4.Lightninggun ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/lighammo
-{
-	{
-		map models/powerups/ammo/ammobox.tga
+	        map models/powerups/ammo/purple.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
                 rgbGen lightingDiffuse
         }
-	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 0.50 1 1 )
-		alphaGen wave sawtooth 0 1 0 1 
 }
-}
-
-models/powerups/ammo/lighammo2
-{
-	{
-		map models/powerups/ammo/lighammo2.tga
-		rgbGen identity
-	}
-}
-
-// ------------------------------------------------------------
-// 5.Plasmagun ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/plasammo
-{
-	{
-		map models/powerups/ammo/ammobox.tga
-		rgbGen lightingDiffuse
-	}
-	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 0 0 1 )
-		alphaGen wave sawtooth 0 1 0 1 
-	}
-}
-
-models/powerups/ammo/plasammo2
-{
-	{
-		map models/powerups/ammo/plasammo2.tga
-		rgbGen identity
-	}
-}
-
-// ------------------------------------------------------------
-// 6.Rocketlauncher ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/rockammo
-{
-	{
-		map models/powerups/ammo/ammobox.tga
-		rgbGen lightingDiffuse
-	}
-	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 1 0 0 )
-		alphaGen wave sawtooth 0 1 0 1 
-	}
-}
-
-models/powerups/ammo/rockammo2
-{
-	{
-		map models/powerups/ammo/rockammo2.tga
-		rgbGen identity
-	}
-}
-
-// ------------------------------------------------------------
-// 7.Railgun ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/railammo
-{
-	{
-		map models/powerups/ammo/ammobox.tga
-		rgbGen lightingDiffuse
-	}
-	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 0 1 0 )
-		alphaGen wave sawtooth 0 1 0 1 
-	}
-}
-
-models/powerups/ammo/railammo2
-{
-	{
-		map models/powerups/ammo/railammo2.tga
-		rgbGen identity
-	}
-}
-
-// ------------------------------------------------------------
-// 8.BigFuckingGun ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/bfgammo
-{
-	{
-		map models/powerups/ammo/ammobox.tga
-		rgbGen lightingDiffuse
-	}
-	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 0 1 0 )
-		alphaGen wave sawtooth 0 1 0 1 
-	}
-}
-
 models/powerups/ammo/bfgammo2
 {
 	{
 		map models/powerups/ammo/bfgammo2.tga
 		rgbGen identity
 	}
+	
+}
+models/powerups/ammo/grenammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/grenammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+}
+models/powerups/ammo/grenammo1
+{
+        {
+	        map models/powerups/ammo/green.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/grenammo2
+{
+	{
+		map models/powerups/ammo/grenammo2.tga
+		rgbGen identity
 	}
 	
-// ------------------------------------------------------------
-// 9.Flamethrower ammo
-// ------------------------------------------------------------
-
-models/powerups/ammo/flameammo
+}
+models/ammo/grenade
 {
         {
-		map models/powerups/ammo/ammobox.tga
+                map models/ammo/grenade.tga
+        }
+	{
+		AnimMap 7 models/ammo/grenade_r.tga models/ammo/grenade_g.tga
+	       blendfunc GL_ONE GL_ONE
+	}
+}
+models/powerups/ammo/lighammo_new
+{
+	{
+		map models/powerups/ammo/envmapligh.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/lighfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/lighammo_new.tga
+		blendfunc blend
 		rgbGen lightingDiffuse
 	}
 	{
-		map models/powerups/ammo/ammolights.tga
-		blendfunc blend
-		rgbGen const ( 1 0.5 0 )
-		alphaGen wave sawtooth 0 1 0 1 
+		map models/powerups/ammo/lighammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
 	}
 }
+models/powerups/ammo/lighammo1
+{
+        {
+	        map models/powerups/ammo/pale_yellow.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/lighammo2
+{
+	{
+		map models/powerups/ammo/lighammo2.tga
+		rgbGen identity
+	}
 	
+}
+models/powerups/ammo/machammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/machammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+}
+models/powerups/ammo/machammo1
+{
+        {
+	        map models/powerups/ammo/yellow.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/machammo2
+{
+	{
+		map models/powerups/ammo/machammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/plasammo_new
+{
+	{
+		map models/powerups/ammo/envmapplas.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/plasfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/plasammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/plasammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+}
+models/powerups/ammo/plasammo1
+{
+        {
+	        map models/powerups/ammo/blue.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/plasammo2
+{
+	{
+		map models/powerups/ammo/plasammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/railammo1
+{
+	{
+		map textures/effects/envmaprail.tga
+		rgbGen lightingDiffuse
+		tcGen environment 
+	}
+}
+models/powerups/ammo/railammo_new
+{
+	{
+		map textures/effects/envmaprail.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/ammo/railfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/railammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/railammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+}
+models/powerups/ammo/railammo2
+{
+	{
+		map models/powerups/ammo/railammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/rockammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/rockammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+}
+models/powerups/ammo/rockammo1
+{
+        {
+	        map models/powerups/ammo/red.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/rockammo2
+{
+	{
+		map models/powerups/ammo/rockammo2.tga
+		rgbGen identity
+	}
+	
+}
+models/powerups/ammo/shotammo_new
+{
+       {
+	        map textures/effects/tinfx2d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen identity
+       }
+       {
+	        map models/powerups/ammo/shotammo_new.tga
+		blendfunc blend
+                rgbGen lightingDiffuse
+       }
+}
+models/powerups/ammo/shotammo1
+{
+        {
+	        map models/powerups/ammo/orange.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
+models/powerups/ammo/shotammo2
+{
+	{
+		map models/powerups/ammo/shotammo2.tga
+		rgbGen identity
+	}
+	
+}
+
+models/powerups/ammo/flameammo_new
+{
+	{
+		map textures/effects/tinfx2d.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map textures/sfx/firegorre.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/ammo/flameammo_new.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/flameammo-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+}
+models/powerups/ammo/flameammo1
+{
+        {
+	        map models/powerups/ammo/red.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ZERO
+                rgbGen lightingDiffuse
+        }
+}
 models/powerups/ammo/flameammo2
 {
 	{
 		map models/powerups/ammo/flameammo2.tga
 		rgbGen identity
 	}
-}
 	
+}