diff --git a/baseq3r/icons/icona_bfg.tga b/baseq3r/icons/icona_bfg.tga index a5765563..5a1a5e64 100644 Binary files a/baseq3r/icons/icona_bfg.tga and b/baseq3r/icons/icona_bfg.tga differ diff --git a/baseq3r/icons/icona_flame.tga b/baseq3r/icons/icona_flame.tga index 85371dff..1eba030b 100644 Binary files a/baseq3r/icons/icona_flame.tga and b/baseq3r/icons/icona_flame.tga differ diff --git a/baseq3r/icons/icona_grenade.tga b/baseq3r/icons/icona_grenade.tga index c0f11075..2d92a75f 100644 Binary files a/baseq3r/icons/icona_grenade.tga and b/baseq3r/icons/icona_grenade.tga differ diff --git a/baseq3r/icons/icona_lightning.tga b/baseq3r/icons/icona_lightning.tga index 6feef541..f9f49174 100644 Binary files a/baseq3r/icons/icona_lightning.tga and b/baseq3r/icons/icona_lightning.tga differ diff --git a/baseq3r/icons/icona_machinegun.tga b/baseq3r/icons/icona_machinegun.tga index 0d096285..fe026922 100644 Binary files a/baseq3r/icons/icona_machinegun.tga and b/baseq3r/icons/icona_machinegun.tga differ diff --git a/baseq3r/icons/icona_plasma.tga b/baseq3r/icons/icona_plasma.tga index bbc919a5..9d27dcea 100644 Binary files a/baseq3r/icons/icona_plasma.tga and b/baseq3r/icons/icona_plasma.tga differ diff --git a/baseq3r/icons/icona_railgun.tga b/baseq3r/icons/icona_railgun.tga index 79c49a1d..dfeda1b1 100644 Binary files a/baseq3r/icons/icona_railgun.tga and b/baseq3r/icons/icona_railgun.tga differ diff --git a/baseq3r/icons/icona_rocket.tga b/baseq3r/icons/icona_rocket.tga index bda5b7b6..03c2d27c 100644 Binary files a/baseq3r/icons/icona_rocket.tga and b/baseq3r/icons/icona_rocket.tga differ diff --git a/baseq3r/icons/icona_shotgun.tga b/baseq3r/icons/icona_shotgun.tga index 8ec87f8d..ac5ea04c 100644 Binary files a/baseq3r/icons/icona_shotgun.tga and b/baseq3r/icons/icona_shotgun.tga differ diff --git a/baseq3r/icons/iconw_flame.tga b/baseq3r/icons/iconw_flame.tga index 7b8dcd06..8ebb7ada 100644 Binary files a/baseq3r/icons/iconw_flame.tga and b/baseq3r/icons/iconw_flame.tga differ diff --git a/baseq3r/models/powerups/ammo/ammo_n.png b/baseq3r/models/powerups/ammo/ammo_n.png new file mode 100644 index 00000000..fe943793 Binary files /dev/null and b/baseq3r/models/powerups/ammo/ammo_n.png differ diff --git a/baseq3r/models/powerups/ammo/ammo_s.png b/baseq3r/models/powerups/ammo/ammo_s.png new file mode 100644 index 00000000..f9acd7c4 Binary files /dev/null and b/baseq3r/models/powerups/ammo/ammo_s.png differ diff --git a/baseq3r/models/powerups/ammo/bfgam.md3 b/baseq3r/models/powerups/ammo/bfgam.md3 index 7e111129..533fae08 100644 Binary files a/baseq3r/models/powerups/ammo/bfgam.md3 and b/baseq3r/models/powerups/ammo/bfgam.md3 differ diff --git a/baseq3r/models/powerups/ammo/bfgam_1.md3 b/baseq3r/models/powerups/ammo/bfgam_1.md3 new file mode 100644 index 00000000..533fae08 Binary files /dev/null and b/baseq3r/models/powerups/ammo/bfgam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/bfgammo-glow.jpg b/baseq3r/models/powerups/ammo/bfgammo-glow.jpg new file mode 100644 index 00000000..c2c76913 Binary files /dev/null and b/baseq3r/models/powerups/ammo/bfgammo-glow.jpg differ diff --git a/baseq3r/models/powerups/ammo/bfgammo2.tga b/baseq3r/models/powerups/ammo/bfgammo2.tga index d8189972..04c89741 100644 Binary files a/baseq3r/models/powerups/ammo/bfgammo2.tga and b/baseq3r/models/powerups/ammo/bfgammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/bfgammo_new.tga b/baseq3r/models/powerups/ammo/bfgammo_new.tga new file mode 100644 index 00000000..bdb97ce3 Binary files /dev/null and b/baseq3r/models/powerups/ammo/bfgammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/bfgback.jpg b/baseq3r/models/powerups/ammo/bfgback.jpg new file mode 100644 index 00000000..f72a894b Binary files /dev/null and b/baseq3r/models/powerups/ammo/bfgback.jpg differ diff --git a/baseq3r/models/powerups/ammo/bfgfluid.jpg b/baseq3r/models/powerups/ammo/bfgfluid.jpg new file mode 100644 index 00000000..0c0e2298 Binary files /dev/null and b/baseq3r/models/powerups/ammo/bfgfluid.jpg differ diff --git a/baseq3r/models/powerups/ammo/envmapbfg.jpg b/baseq3r/models/powerups/ammo/envmapbfg.jpg new file mode 100644 index 00000000..c0556350 Binary files /dev/null and b/baseq3r/models/powerups/ammo/envmapbfg.jpg differ diff --git a/baseq3r/models/powerups/ammo/envmapligh.jpg b/baseq3r/models/powerups/ammo/envmapligh.jpg new file mode 100644 index 00000000..b4215b20 Binary files /dev/null and b/baseq3r/models/powerups/ammo/envmapligh.jpg differ diff --git a/baseq3r/models/powerups/ammo/envmapplas.jpg b/baseq3r/models/powerups/ammo/envmapplas.jpg new file mode 100644 index 00000000..71c83d3b Binary files /dev/null and b/baseq3r/models/powerups/ammo/envmapplas.jpg differ diff --git a/baseq3r/models/powerups/ammo/flameam.md3 b/baseq3r/models/powerups/ammo/flameam.md3 index 0cdf8e65..87eded81 100644 Binary files a/baseq3r/models/powerups/ammo/flameam.md3 and b/baseq3r/models/powerups/ammo/flameam.md3 differ diff --git a/baseq3r/models/powerups/ammo/flameammo-glow.jpg b/baseq3r/models/powerups/ammo/flameammo-glow.jpg new file mode 100644 index 00000000..455e489f Binary files /dev/null and b/baseq3r/models/powerups/ammo/flameammo-glow.jpg differ diff --git a/baseq3r/models/powerups/ammo/flameammo2.tga b/baseq3r/models/powerups/ammo/flameammo2.tga index 2ef19bcc..5baba44a 100644 Binary files a/baseq3r/models/powerups/ammo/flameammo2.tga and b/baseq3r/models/powerups/ammo/flameammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/flameammo_new.tga b/baseq3r/models/powerups/ammo/flameammo_new.tga new file mode 100644 index 00000000..90d47813 Binary files /dev/null and b/baseq3r/models/powerups/ammo/flameammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/grenadeam.md3 b/baseq3r/models/powerups/ammo/grenadeam.md3 index 52f9e283..a4cbd83d 100644 Binary files a/baseq3r/models/powerups/ammo/grenadeam.md3 and b/baseq3r/models/powerups/ammo/grenadeam.md3 differ diff --git a/baseq3r/models/powerups/ammo/grenadeam_1.md3 b/baseq3r/models/powerups/ammo/grenadeam_1.md3 new file mode 100644 index 00000000..a4cbd83d Binary files /dev/null and b/baseq3r/models/powerups/ammo/grenadeam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/grenadeback.jpg b/baseq3r/models/powerups/ammo/grenadeback.jpg new file mode 100644 index 00000000..f2c427f0 Binary files /dev/null and b/baseq3r/models/powerups/ammo/grenadeback.jpg differ diff --git a/baseq3r/models/powerups/ammo/grenammo2.tga b/baseq3r/models/powerups/ammo/grenammo2.tga index 0d8e89e0..d1f9f62f 100644 Binary files a/baseq3r/models/powerups/ammo/grenammo2.tga and b/baseq3r/models/powerups/ammo/grenammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/grenammo_new.tga b/baseq3r/models/powerups/ammo/grenammo_new.tga new file mode 100644 index 00000000..6d37c4c0 Binary files /dev/null and b/baseq3r/models/powerups/ammo/grenammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/lighammo-glow.jpg b/baseq3r/models/powerups/ammo/lighammo-glow.jpg new file mode 100644 index 00000000..28a42965 Binary files /dev/null and b/baseq3r/models/powerups/ammo/lighammo-glow.jpg differ diff --git a/baseq3r/models/powerups/ammo/lighammo2.tga b/baseq3r/models/powerups/ammo/lighammo2.tga index 411c2097..347922b0 100644 Binary files a/baseq3r/models/powerups/ammo/lighammo2.tga and b/baseq3r/models/powerups/ammo/lighammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/lighammo_new.tga b/baseq3r/models/powerups/ammo/lighammo_new.tga new file mode 100644 index 00000000..9fe8328c Binary files /dev/null and b/baseq3r/models/powerups/ammo/lighammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/lighfluid.jpg b/baseq3r/models/powerups/ammo/lighfluid.jpg new file mode 100644 index 00000000..b9d0abdb Binary files /dev/null and b/baseq3r/models/powerups/ammo/lighfluid.jpg differ diff --git a/baseq3r/models/powerups/ammo/lightningam.md3 b/baseq3r/models/powerups/ammo/lightningam.md3 index 055992a9..a70c9b48 100644 Binary files a/baseq3r/models/powerups/ammo/lightningam.md3 and b/baseq3r/models/powerups/ammo/lightningam.md3 differ diff --git a/baseq3r/models/powerups/ammo/lightningam_1.md3 b/baseq3r/models/powerups/ammo/lightningam_1.md3 new file mode 100644 index 00000000..a70c9b48 Binary files /dev/null and b/baseq3r/models/powerups/ammo/lightningam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/lightningback.jpg b/baseq3r/models/powerups/ammo/lightningback.jpg new file mode 100644 index 00000000..001c1429 Binary files /dev/null and b/baseq3r/models/powerups/ammo/lightningback.jpg differ diff --git a/baseq3r/models/powerups/ammo/machammo2.tga b/baseq3r/models/powerups/ammo/machammo2.tga index ff6e6afe..6a321520 100644 Binary files a/baseq3r/models/powerups/ammo/machammo2.tga and b/baseq3r/models/powerups/ammo/machammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/machammo_new.tga b/baseq3r/models/powerups/ammo/machammo_new.tga new file mode 100644 index 00000000..11559358 Binary files /dev/null and b/baseq3r/models/powerups/ammo/machammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/machineback.jpg b/baseq3r/models/powerups/ammo/machineback.jpg new file mode 100644 index 00000000..97925c33 Binary files /dev/null and b/baseq3r/models/powerups/ammo/machineback.jpg differ diff --git a/baseq3r/models/powerups/ammo/machinegunam.md3 b/baseq3r/models/powerups/ammo/machinegunam.md3 index ec2e30ab..e14ff2bd 100644 Binary files a/baseq3r/models/powerups/ammo/machinegunam.md3 and b/baseq3r/models/powerups/ammo/machinegunam.md3 differ diff --git a/baseq3r/models/powerups/ammo/machinegunam_1.md3 b/baseq3r/models/powerups/ammo/machinegunam_1.md3 new file mode 100644 index 00000000..e14ff2bd Binary files /dev/null and b/baseq3r/models/powerups/ammo/machinegunam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/plasammo-glow.jpg b/baseq3r/models/powerups/ammo/plasammo-glow.jpg new file mode 100644 index 00000000..c9300023 Binary files /dev/null and b/baseq3r/models/powerups/ammo/plasammo-glow.jpg differ diff --git a/baseq3r/models/powerups/ammo/plasammo2.tga b/baseq3r/models/powerups/ammo/plasammo2.tga index 53b3cd9b..20492f05 100644 Binary files a/baseq3r/models/powerups/ammo/plasammo2.tga and b/baseq3r/models/powerups/ammo/plasammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/plasammo_new.tga b/baseq3r/models/powerups/ammo/plasammo_new.tga new file mode 100644 index 00000000..a2d31aa3 Binary files /dev/null and b/baseq3r/models/powerups/ammo/plasammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/plasfluid.jpg b/baseq3r/models/powerups/ammo/plasfluid.jpg new file mode 100644 index 00000000..d8b5a242 Binary files /dev/null and b/baseq3r/models/powerups/ammo/plasfluid.jpg differ diff --git a/baseq3r/models/powerups/ammo/plasmaam.md3 b/baseq3r/models/powerups/ammo/plasmaam.md3 index 92d1b689..be3705d4 100644 Binary files a/baseq3r/models/powerups/ammo/plasmaam.md3 and b/baseq3r/models/powerups/ammo/plasmaam.md3 differ diff --git a/baseq3r/models/powerups/ammo/plasmaam_1.md3 b/baseq3r/models/powerups/ammo/plasmaam_1.md3 new file mode 100644 index 00000000..be3705d4 Binary files /dev/null and b/baseq3r/models/powerups/ammo/plasmaam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/plasmaback.jpg b/baseq3r/models/powerups/ammo/plasmaback.jpg new file mode 100644 index 00000000..4f862cd6 Binary files /dev/null and b/baseq3r/models/powerups/ammo/plasmaback.jpg differ diff --git a/baseq3r/models/powerups/ammo/railammo-glow.jpg b/baseq3r/models/powerups/ammo/railammo-glow.jpg new file mode 100644 index 00000000..bcce2d11 Binary files /dev/null and b/baseq3r/models/powerups/ammo/railammo-glow.jpg differ diff --git a/baseq3r/models/powerups/ammo/railammo2.tga b/baseq3r/models/powerups/ammo/railammo2.tga index 0a3d365a..66ff8e4b 100644 Binary files a/baseq3r/models/powerups/ammo/railammo2.tga and b/baseq3r/models/powerups/ammo/railammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/railammo_new.tga b/baseq3r/models/powerups/ammo/railammo_new.tga new file mode 100644 index 00000000..e14dff1b Binary files /dev/null and b/baseq3r/models/powerups/ammo/railammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/railfluid.jpg b/baseq3r/models/powerups/ammo/railfluid.jpg new file mode 100644 index 00000000..60ad8454 Binary files /dev/null and b/baseq3r/models/powerups/ammo/railfluid.jpg differ diff --git a/baseq3r/models/powerups/ammo/railgunam.md3 b/baseq3r/models/powerups/ammo/railgunam.md3 index 4f938af7..a301b3fc 100644 Binary files a/baseq3r/models/powerups/ammo/railgunam.md3 and b/baseq3r/models/powerups/ammo/railgunam.md3 differ diff --git a/baseq3r/models/powerups/ammo/railgunam_1.md3 b/baseq3r/models/powerups/ammo/railgunam_1.md3 new file mode 100644 index 00000000..a301b3fc Binary files /dev/null and b/baseq3r/models/powerups/ammo/railgunam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/railgunback.jpg b/baseq3r/models/powerups/ammo/railgunback.jpg new file mode 100644 index 00000000..11f77771 Binary files /dev/null and b/baseq3r/models/powerups/ammo/railgunback.jpg differ diff --git a/baseq3r/models/powerups/ammo/rockammo2.tga b/baseq3r/models/powerups/ammo/rockammo2.tga index 8fa141b8..d3ca0a7c 100644 Binary files a/baseq3r/models/powerups/ammo/rockammo2.tga and b/baseq3r/models/powerups/ammo/rockammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/rockammo_new.tga b/baseq3r/models/powerups/ammo/rockammo_new.tga new file mode 100644 index 00000000..d029012c Binary files /dev/null and b/baseq3r/models/powerups/ammo/rockammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/rocketam.md3 b/baseq3r/models/powerups/ammo/rocketam.md3 index b57c81a5..dbfcbd03 100644 Binary files a/baseq3r/models/powerups/ammo/rocketam.md3 and b/baseq3r/models/powerups/ammo/rocketam.md3 differ diff --git a/baseq3r/models/powerups/ammo/rocketam_1.md3 b/baseq3r/models/powerups/ammo/rocketam_1.md3 new file mode 100644 index 00000000..dbfcbd03 Binary files /dev/null and b/baseq3r/models/powerups/ammo/rocketam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/rocketback.jpg b/baseq3r/models/powerups/ammo/rocketback.jpg new file mode 100644 index 00000000..58f8deca Binary files /dev/null and b/baseq3r/models/powerups/ammo/rocketback.jpg differ diff --git a/baseq3r/models/powerups/ammo/shotammo2.tga b/baseq3r/models/powerups/ammo/shotammo2.tga index d1074efe..6bdaef9e 100644 Binary files a/baseq3r/models/powerups/ammo/shotammo2.tga and b/baseq3r/models/powerups/ammo/shotammo2.tga differ diff --git a/baseq3r/models/powerups/ammo/shotammo_new.tga b/baseq3r/models/powerups/ammo/shotammo_new.tga new file mode 100644 index 00000000..43527b28 Binary files /dev/null and b/baseq3r/models/powerups/ammo/shotammo_new.tga differ diff --git a/baseq3r/models/powerups/ammo/shotgunam.md3 b/baseq3r/models/powerups/ammo/shotgunam.md3 index 72aeabc8..5b88cd87 100644 Binary files a/baseq3r/models/powerups/ammo/shotgunam.md3 and b/baseq3r/models/powerups/ammo/shotgunam.md3 differ diff --git a/baseq3r/models/powerups/ammo/shotgunam_1.md3 b/baseq3r/models/powerups/ammo/shotgunam_1.md3 new file mode 100644 index 00000000..5b88cd87 Binary files /dev/null and b/baseq3r/models/powerups/ammo/shotgunam_1.md3 differ diff --git a/baseq3r/models/powerups/ammo/shotgunback.jpg b/baseq3r/models/powerups/ammo/shotgunback.jpg new file mode 100644 index 00000000..8366b818 Binary files /dev/null and b/baseq3r/models/powerups/ammo/shotgunback.jpg differ diff --git a/baseq3r/scripts/ammo.mtr b/baseq3r/scripts/ammo.mtr new file mode 100644 index 00000000..7709e8bb --- /dev/null +++ b/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 + } + +} \ No newline at end of file diff --git a/baseq3r/scripts/ammo.shader b/baseq3r/scripts/ammo.shader index d01dfcd5..c99e99a4 100644 --- a/baseq3r/scripts/ammo.shader +++ b/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 - } + { + map models/powerups/ammo/purple.tga + tcGen environment + blendfunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } } - -// ------------------------------------------------------------ -// 4.Lightninggun ammo -// ------------------------------------------------------------ - -models/powerups/ammo/lighammo -{ - { - map models/powerups/ammo/ammobox.tga - 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 } + } - -// ------------------------------------------------------------ -// 9.Flamethrower ammo -// ------------------------------------------------------------ - -models/powerups/ammo/flameammo +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/ammobox.tga + 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/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 } -} - + +} \ No newline at end of file