diff --git a/baseq3r/icons/icona_flame.tga b/baseq3r/icons/icona_flame.tga index 1eba030b..1452f3fc 100644 Binary files a/baseq3r/icons/icona_flame.tga and b/baseq3r/icons/icona_flame.tga differ diff --git a/baseq3r/icons/iconw_flame.tga b/baseq3r/icons/iconw_flame.tga index 8ebb7ada..4b0d0635 100644 Binary files a/baseq3r/icons/iconw_flame.tga and b/baseq3r/icons/iconw_flame.tga differ diff --git a/baseq3r/models/mapobjects/console/centercon.jpg b/baseq3r/models/mapobjects/console/centercon.jpg new file mode 100644 index 00000000..fbc3523b Binary files /dev/null and b/baseq3r/models/mapobjects/console/centercon.jpg differ diff --git a/baseq3r/models/mapobjects/console/scrolltext.jpg b/baseq3r/models/mapobjects/console/scrolltext.jpg new file mode 100644 index 00000000..f23f474f Binary files /dev/null and b/baseq3r/models/mapobjects/console/scrolltext.jpg differ diff --git a/baseq3r/models/mapobjects/jets/jet_1.jpg b/baseq3r/models/mapobjects/jets/jet_1.jpg new file mode 100644 index 00000000..31eccbd8 Binary files /dev/null and b/baseq3r/models/mapobjects/jets/jet_1.jpg differ diff --git a/baseq3r/models/mapobjects/jets/jet_2.jpg b/baseq3r/models/mapobjects/jets/jet_2.jpg new file mode 100644 index 00000000..b1c90c66 Binary files /dev/null and b/baseq3r/models/mapobjects/jets/jet_2.jpg differ diff --git a/baseq3r/models/mapobjects/jets/jet_as.jpg b/baseq3r/models/mapobjects/jets/jet_as.jpg new file mode 100644 index 00000000..ca0d659d Binary files /dev/null and b/baseq3r/models/mapobjects/jets/jet_as.jpg differ diff --git a/baseq3r/models/powerups/ammo/flameammo2.tga b/baseq3r/models/powerups/ammo/flameammo2.tga index 5baba44a..a155a868 100644 Binary files a/baseq3r/models/powerups/ammo/flameammo2.tga and b/baseq3r/models/powerups/ammo/flameammo2.tga differ diff --git a/baseq3r/models/weapons2/flamethrower/f_flamethrower.jpg b/baseq3r/models/weapons2/flamethrower/f_flamethrower.jpg deleted file mode 100644 index ee520161..00000000 Binary files a/baseq3r/models/weapons2/flamethrower/f_flamethrower.jpg and /dev/null differ diff --git a/baseq3r/models/weapons2/flamethrower/flamethr.jpg b/baseq3r/models/weapons2/flamethrower/flamethr.jpg new file mode 100644 index 00000000..f3b3c408 Binary files /dev/null and b/baseq3r/models/weapons2/flamethrower/flamethr.jpg differ diff --git a/baseq3r/models/weapons2/flamethrower/flamethr.tga b/baseq3r/models/weapons2/flamethrower/flamethr.tga deleted file mode 100644 index 441de97e..00000000 Binary files a/baseq3r/models/weapons2/flamethrower/flamethr.tga and /dev/null differ diff --git a/baseq3r/models/weapons2/flamethrower/flamethrower.md3 b/baseq3r/models/weapons2/flamethrower/flamethrower.md3 index bdcbd6c1..7c7710a6 100644 Binary files a/baseq3r/models/weapons2/flamethrower/flamethrower.md3 and b/baseq3r/models/weapons2/flamethrower/flamethrower.md3 differ diff --git a/baseq3r/models/weapons2/flamethrower/flamethrower_flash.md3 b/baseq3r/models/weapons2/flamethrower/flamethrower_flash.md3 index 9164c402..5b9e9448 100644 Binary files a/baseq3r/models/weapons2/flamethrower/flamethrower_flash.md3 and b/baseq3r/models/weapons2/flamethrower/flamethrower_flash.md3 differ diff --git a/baseq3r/models/weapons2/flamethrower/trail2.jpg b/baseq3r/models/weapons2/flamethrower/trail2.jpg new file mode 100644 index 00000000..4b6c596e Binary files /dev/null and b/baseq3r/models/weapons2/flamethrower/trail2.jpg differ diff --git a/baseq3r/scripts/weapons.shader b/baseq3r/scripts/weapons.shader index 997f880b..504fb707 100644 --- a/baseq3r/scripts/weapons.shader +++ b/baseq3r/scripts/weapons.shader @@ -209,15 +209,108 @@ models/weaphits/electric // 3.Flamethrower // ------------------------------------------------------------ -models/weapons2/flamethrower/f_flamethrower +models/mapobjects/jets/jet_1 +{ + surfaceparm trans + nomipmaps + cull disable + { + map models/mapobjects/jets/jet_1.tga + blendFunc add + tcmod scale .5 1 + tcmod scroll 6 0 + rgbGen identity + } + { + map models/mapobjects/jets/jet_2.tga + blendFunc add + tcmod scroll 3 -.5 + rgbGen wave inversesawtooth -.3 1.3 0 .5 + } +} +models/mapobjects/jets/jet_as +{ + deformVertexes autoSprite2 + deformVertexes wave 100 sin 0 1 0 9 + surfaceparm trans + nomipmaps + { + map models/mapobjects/jets/jet_as.tga + blendFunc add + rgbGen identity + } +} +models/weapons2/flamethrower/trail2 +{ + { + map models/weapons2/flamethrower/trail2.tga + tcMod scroll 3.1 1 + rgbgen wave triangle 1 2 0 7 + blendfunc GL_ONE GL_ONE + } + { + map models/weapons2/flamethrower/trail2.tga + tcMod scroll -1.7 1 + rgbgen wave triangle 1 1.1 0 5.1 + blendfunc GL_ONE GL_ONE + } +} +models/mapobjects/console/centercon + { cull disable - { - clampmap models/weapons2/flamethrower/f_flamethrower.tga - blendfunc add - rgbGen identity - tcMod rotate 5288 + { + map models/mapobjects/console/scrolltext.tga + blendFunc add + tcmod scroll 0 -.3 + //tcMod stretch sin .9 0.1 0 1.1 + rgbGen vertex } + + { + clampmap models/mapobjects/console/centercon.tga + blendFunc add + tcMod stretch sin .9 0.1 0 .2 + tcmod rotate 40 + rgbGen vertex + } +} + +textures/sfx/xflame2 +{ + + // ************************************************* + // * Yellow Flame Surface Light 5500 * + // * April 30 1999 * + // * Please Comment Changes * + // ************************************************* + + surfaceparm nomarks + surfaceparm nolightmap + cull none + q3map_surfacelight 5500 + qer_editorimage textures/sfx/flame1.tga + + + { + animMap 10 textures/sfx/flame1.tga textures/sfx/flame2.tga textures/sfx/flame3.tga textures/sfx/flame4.tga textures/sfx/flame5.tga textures/sfx/flame6.tga textures/sfx/flame7.tga textures/sfx/flame8.tga + blendFunc GL_ONE GL_ONE + rgbGen wave inverseSawtooth 0 1 0 10 + + } + { + animMap 10 textures/sfx/flame2.tga textures/sfx/flame3.tga textures/sfx/flame4.tga textures/sfx/flame5.tga textures/sfx/flame6.tga textures/sfx/flame7.tga textures/sfx/flame8.tga textures/sfx/flame1.tga + blendFunc GL_ONE GL_ONE + rgbGen wave sawtooth 0 1 0 10 + } + + + { + map textures/sfx/flameball.tga + blendFunc GL_ONE GL_ONE + rgbGen wave sin .6 .2 0 .6 + } + } // ------------------------------------------------------------ diff --git a/baseq3r/sound/weapons/flamer/fl_fire.wav b/baseq3r/sound/weapons/flamer/fl_fire.wav new file mode 100644 index 00000000..1807453a Binary files /dev/null and b/baseq3r/sound/weapons/flamer/fl_fire.wav differ diff --git a/baseq3r/sound/weapons/flamer/fl_fly.wav b/baseq3r/sound/weapons/flamer/fl_fly.wav new file mode 100644 index 00000000..0161f813 Binary files /dev/null and b/baseq3r/sound/weapons/flamer/fl_fly.wav differ diff --git a/baseq3r/sound/weapons/flamer/fl_hum.wav b/baseq3r/sound/weapons/flamer/fl_hum.wav new file mode 100644 index 00000000..ad153656 Binary files /dev/null and b/baseq3r/sound/weapons/flamer/fl_hum.wav differ