From 5dc2aa8432fe53b34ee9ba7d99b5d9b789483798 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 10 Feb 2015 10:05:27 +1100 Subject: [PATCH] Inferno buff: damaged targets are inflicted with burning for a few seconds --- models/relics/relic.md3_16.skin | 3 ++ models/relics/sign_inferno.tga | Bin 0 -> 65580 bytes models/relics/sign_inferno_glow.tga | Bin 0 -> 65580 bytes mutators.cfg | 4 ++- qcsrc/common/buffs.qh | 2 ++ qcsrc/common/notifications.qh | 1 + qcsrc/server/autocvars.qh | 2 ++ qcsrc/server/mutators/mutator_buffs.qc | 4 +++ scripts/relics.shader | 45 +++++++++++++++---------- 9 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 models/relics/relic.md3_16.skin create mode 100644 models/relics/sign_inferno.tga create mode 100644 models/relics/sign_inferno_glow.tga diff --git a/models/relics/relic.md3_16.skin b/models/relics/relic.md3_16.skin new file mode 100644 index 000000000..5c30ed67c --- /dev/null +++ b/models/relics/relic.md3_16.skin @@ -0,0 +1,3 @@ +ring,models/relics/relic_ring +mesh,models/relics/relic +sign,models/relics/sign_inferno \ No newline at end of file diff --git a/models/relics/sign_inferno.tga b/models/relics/sign_inferno.tga new file mode 100644 index 0000000000000000000000000000000000000000..50842cc5ae8517cbead5fd25936ab35ccbf1141f GIT binary patch literal 65580 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 literal 0 HcmV?d00001 diff --git a/mutators.cfg b/mutators.cfg index be5af23f9..4d051f83b 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -317,4 +317,6 @@ set g_buffs_flight 1 "flight buff: greatly decreased gravity" set g_buffs_flight_gravity 0.3 "player gravity multiplier while holding flight buff" set g_buffs_invisible 1 "invisible buff: carrier becomes invisible" set g_buffs_invisible_alpha 0.4 "player invisibility multiplier while holding invisible buff" - +set g_buffs_inferno 1 "inferno buff: targets damaged by player carrying inferno buff will also receive burning damage" +set g_buffs_inferno_burntime 1.5 "burning time of damaged target" +set g_buffs_inferno_damagemultiplier 0.25 "multiplier of damage dealt during burn" diff --git a/qcsrc/common/buffs.qh b/qcsrc/common/buffs.qh index b8cb7372a..ef1a0e824 100644 --- a/qcsrc/common/buffs.qh +++ b/qcsrc/common/buffs.qh @@ -53,6 +53,7 @@ REGISTER_BUFF(_("Vengeance"),vengeance,VENGEANCE,15,'0.55 0.5 1'); REGISTER_BUFF(_("Jump"),jump,JUMP,10,'0.7 0.2 1'); REGISTER_BUFF(_("Flight"),flight,FLIGHT,11,'1 0.2 0.5'); REGISTER_BUFF(_("Invisible"),invisible,INVISIBLE,12,'0.9 0.9 0.9'); +REGISTER_BUFF(_("Inferno"),inferno,INFERNO,16,'2 0 0'); #undef REGISTER_BUFF #ifdef SVQC @@ -80,6 +81,7 @@ BUFF_SPAWNFUNCS(vengeance, BUFF_VENGEANCE) BUFF_SPAWNFUNCS(jump, BUFF_JUMP) BUFF_SPAWNFUNCS(flight, BUFF_FLIGHT) BUFF_SPAWNFUNCS(invisible, BUFF_INVISIBLE) +BUFF_SPAWNFUNCS(inferno, BUFF_INFERNO) BUFF_SPAWNFUNCS(random, 0) BUFF_SPAWNFUNC_Q3TA_COMPAT(doubler, BUFF_MEDIC) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 99578b7ab..97a1099a9 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -1069,6 +1069,7 @@ const float ARG_DC = 6; // unique result to durcnt/centerprint ARG_CASE(ARG_CS_SV, "spree_lost", (autocvar_notification_show_sprees ? notif_arg_spree_inf(-2, "", "", f1) : "")) \ ARG_CASE(ARG_CS_SV, "item_wepname", WEP_NAME(f1)) \ ARG_CASE(ARG_CS_SV, "item_buffname", sprintf("%s%s", rgb_to_hexcolor(Buff_Color(f1)), Buff_PrettyName(f1))) \ + ARG_CASE(ARG_CS_SV, "f3buffname", sprintf("%s%s", rgb_to_hexcolor(Buff_Color(f3)), Buff_PrettyName(f3))) \ ARG_CASE(ARG_CS_SV, "item_wepammo", (s1 != "" ? sprintf(_(" with %s"), s1) : "")) \ ARG_CASE(ARG_DC, "item_centime", ftos(autocvar_notification_item_centerprinttime)) \ ARG_CASE(ARG_SV, "death_team", Team_ColoredFullName(f1)) \ diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index bcb9d28d7..673d84dfd 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -882,4 +882,6 @@ float autocvar_g_buffs_vampire_damage_steal; float autocvar_g_buffs_invisible_alpha; float autocvar_g_buffs_flight_gravity; float autocvar_g_buffs_jump_height; +float autocvar_g_buffs_inferno_burntime; +float autocvar_g_buffs_inferno_damagemultiplier; #endif diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc index aef575ae4..2171e6ed3 100644 --- a/qcsrc/server/mutators/mutator_buffs.qc +++ b/qcsrc/server/mutators/mutator_buffs.qc @@ -428,6 +428,10 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerDamage_Calculate) frag_damage = 0; } + if(frag_attacker.buffs & BUFF_INFERNO) + if(frag_target != frag_attacker) + Fire_AddDamage(frag_target, frag_attacker, (frag_damage * autocvar_g_buffs_inferno_damagemultiplier) * autocvar_g_buffs_inferno_burntime, autocvar_g_buffs_inferno_burntime, DEATH_BUFF); + // this... is ridiculous (TODO: fix!) if(frag_attacker.buffs & BUFF_VAMPIRE) if(!frag_target.vehicle) diff --git a/scripts/relics.shader b/scripts/relics.shader index 24f95617f..1ebd9c49d 100644 --- a/scripts/relics.shader +++ b/scripts/relics.shader @@ -2,14 +2,14 @@ models/relics/relic { dpreflectcube cubemaps/default/sky { - map models/relics/relic.tga + map models/relics/relic rgbgen lightingDiffuse } } models/relics/relic_ring { { - map models/relics/relic_ring.tga + map models/relics/relic_ring blendfunc GL_SRC_ALPHA GL_ONE rgbgen lightingDiffuse } @@ -18,7 +18,7 @@ models/relics/sign_resistance { cull none { - map models/relics/sign_resistance.tga + map models/relics/sign_resistance blendfunc add rgbgen lightingDiffuse } @@ -27,7 +27,7 @@ models/relics/sign_regeneration { cull none { - map models/relics/sign_regeneration.tga + map models/relics/sign_regeneration blendfunc add rgbgen lightingDiffuse } @@ -36,7 +36,7 @@ models/relics/sign_vampire { cull none { - map models/relics/sign_vampire.tga + map models/relics/sign_vampire blendfunc add rgbgen lightingDiffuse } @@ -45,7 +45,7 @@ models/relics/sign_ammo { cull none { - map models/relics/sign_ammo.tga + map models/relics/sign_ammo blendfunc add rgbgen lightingDiffuse } @@ -54,7 +54,7 @@ models/relics/sign_damage { cull none { - map models/relics/sign_damage.tga + map models/relics/sign_damage blendfunc add rgbgen lightingDiffuse } @@ -63,7 +63,7 @@ models/relics/sign_splashdamage { cull none { - map models/relics/sign_splashdamage.tga + map models/relics/sign_splashdamage blendfunc add rgbgen lightingDiffuse } @@ -72,7 +72,7 @@ models/relics/sign_firingspeed { cull none { - map models/relics/sign_firingspeed.tga + map models/relics/sign_firingspeed blendfunc add rgbgen lightingDiffuse } @@ -81,7 +81,7 @@ models/relics/sign_disability { cull none { - map models/relics/sign_disability.tga + map models/relics/sign_disability blendfunc add rgbgen lightingDiffuse } @@ -90,7 +90,7 @@ models/relics/sign_teamboost { cull none { - map models/relics/sign_teamboost.tga + map models/relics/sign_teamboost blendfunc add rgbgen lightingDiffuse } @@ -99,7 +99,7 @@ models/relics/sign_speed { cull none { - map models/relics/sign_speed.tga + map models/relics/sign_speed blendfunc add rgbgen lightingDiffuse } @@ -108,7 +108,7 @@ models/relics/sign_jump { cull none { - map models/relics/sign_jump.tga + map models/relics/sign_jump blendfunc add rgbgen lightingDiffuse } @@ -117,7 +117,7 @@ models/relics/sign_flight { cull none { - map models/relics/sign_flight.tga + map models/relics/sign_flight blendfunc add rgbgen lightingDiffuse } @@ -126,7 +126,7 @@ models/relics/sign_invisible { cull none { - map models/relics/sign_invisible.tga + map models/relics/sign_invisible blendfunc add rgbgen lightingDiffuse } @@ -135,7 +135,7 @@ models/relics/sign_radioactive { cull none { - map models/relics/sign_radioactive.tga + map models/relics/sign_radioactive blendfunc add rgbgen lightingDiffuse } @@ -144,7 +144,7 @@ models/relics/sign_resurrection { cull none { - map models/relics/sign_resurrection.tga + map models/relics/sign_resurrection blendfunc add rgbgen lightingDiffuse } @@ -153,7 +153,16 @@ models/relics/sign_vengeance { cull none { - map models/relics/sign_vengeance.tga + map models/relics/sign_vengeance + blendfunc add + rgbgen lightingDiffuse + } +} +models/relics/sign_inferno +{ + cull none + { + map models/relics/sign_inferno blendfunc add rgbgen lightingDiffuse } -- 2.39.2