From: LegendaryGuard Date: Mon, 28 Nov 2022 01:03:40 +0000 (+0100) Subject: Remove Bash and Resistance buffs, both assets and code, these are pretty similar... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=901e6b4a28fb75bf202b4acf0082625452da2e0f;p=xonotic%2Fxonotic-data.pk3dir.git Remove Bash and Resistance buffs, both assets and code, these are pretty similar to Strength and Shield functionalities. Make new powerup model a bit bigger --- diff --git a/gfx/hud/default/buff_bash.tga b/gfx/hud/default/buff_bash.tga deleted file mode 100644 index eaf416cf7..000000000 Binary files a/gfx/hud/default/buff_bash.tga and /dev/null differ diff --git a/gfx/hud/default/buff_resistance.tga b/gfx/hud/default/buff_resistance.tga deleted file mode 100644 index d7e2524b1..000000000 Binary files a/gfx/hud/default/buff_resistance.tga and /dev/null differ diff --git a/gfx/hud/luma/buff_bash.tga b/gfx/hud/luma/buff_bash.tga deleted file mode 100644 index c193a1565..000000000 Binary files a/gfx/hud/luma/buff_bash.tga and /dev/null differ diff --git a/gfx/hud/luma/buff_resistance.tga b/gfx/hud/luma/buff_resistance.tga deleted file mode 100644 index 046c22a91..000000000 Binary files a/gfx/hud/luma/buff_resistance.tga and /dev/null differ diff --git a/models/relics/relic.md3_0.skin b/models/relics/relic.md3_0.skin deleted file mode 100644 index f4d914fa2..000000000 --- a/models/relics/relic.md3_0.skin +++ /dev/null @@ -1,3 +0,0 @@ -ring,models/relics/relic_ring -mesh,models/relics/relic -sign,models/relics/sign_resistance \ No newline at end of file diff --git a/models/relics/relic.md3_10.skin b/models/relics/relic.md3_10.skin index 8276637c0..4b88dde04 100644 --- a/models/relics/relic.md3_10.skin +++ b/models/relics/relic.md3_10.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_jump \ No newline at end of file +sign,models/relics/sign_flight \ No newline at end of file diff --git a/models/relics/relic.md3_11.skin b/models/relics/relic.md3_11.skin index 4b88dde04..9f2525884 100644 --- a/models/relics/relic.md3_11.skin +++ b/models/relics/relic.md3_11.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_flight \ No newline at end of file +sign,models/relics/sign_invisible \ No newline at end of file diff --git a/models/relics/relic.md3_12.skin b/models/relics/relic.md3_12.skin index 9f2525884..cfcb99896 100644 --- a/models/relics/relic.md3_12.skin +++ b/models/relics/relic.md3_12.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_invisible \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_13.skin b/models/relics/relic.md3_13.skin index cfcb99896..a8af448f6 100644 --- a/models/relics/relic.md3_13.skin +++ b/models/relics/relic.md3_13.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_blessed \ No newline at end of file diff --git a/models/relics/relic.md3_14.skin b/models/relics/relic.md3_14.skin index a8af448f6..5b188bebc 100644 --- a/models/relics/relic.md3_14.skin +++ b/models/relics/relic.md3_14.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_blessed \ No newline at end of file +sign,models/relics/sign_vengeance \ No newline at end of file diff --git a/models/relics/relic.md3_15.skin b/models/relics/relic.md3_15.skin index 5b188bebc..5c30ed67c 100644 --- a/models/relics/relic.md3_15.skin +++ b/models/relics/relic.md3_15.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_vengeance \ No newline at end of file +sign,models/relics/sign_inferno \ No newline at end of file diff --git a/models/relics/relic.md3_16.skin b/models/relics/relic.md3_16.skin index 5c30ed67c..30fba072e 100644 --- a/models/relics/relic.md3_16.skin +++ b/models/relics/relic.md3_16.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_inferno \ No newline at end of file +sign,models/relics/sign_swapper \ No newline at end of file diff --git a/models/relics/relic.md3_17.skin b/models/relics/relic.md3_17.skin index 30fba072e..b89d51cec 100644 --- a/models/relics/relic.md3_17.skin +++ b/models/relics/relic.md3_17.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_swapper \ No newline at end of file +sign,models/relics/sign_magnet \ No newline at end of file diff --git a/models/relics/relic.md3_18.skin b/models/relics/relic.md3_18.skin index b89d51cec..7401d28f9 100644 --- a/models/relics/relic.md3_18.skin +++ b/models/relics/relic.md3_18.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_magnet \ No newline at end of file +sign,models/relics/sign_luck \ No newline at end of file diff --git a/models/relics/relic.md3_19.skin b/models/relics/relic.md3_19.skin deleted file mode 100644 index 7401d28f9..000000000 --- a/models/relics/relic.md3_19.skin +++ /dev/null @@ -1,3 +0,0 @@ -ring,models/relics/relic_ring -mesh,models/relics/relic -sign,models/relics/sign_luck \ No newline at end of file diff --git a/models/relics/relic.md3_5.skin b/models/relics/relic.md3_5.skin index 4edbc24b0..cfcb99896 100644 --- a/models/relics/relic.md3_5.skin +++ b/models/relics/relic.md3_5.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_bash \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_6.skin b/models/relics/relic.md3_6.skin index cfcb99896..ce6fb9f41 100644 --- a/models/relics/relic.md3_6.skin +++ b/models/relics/relic.md3_6.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_disability \ No newline at end of file diff --git a/models/relics/relic.md3_7.skin b/models/relics/relic.md3_7.skin index ce6fb9f41..cfcb99896 100644 --- a/models/relics/relic.md3_7.skin +++ b/models/relics/relic.md3_7.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_disability \ No newline at end of file +sign,textures/common/nodraw \ No newline at end of file diff --git a/models/relics/relic.md3_8.skin b/models/relics/relic.md3_8.skin index cfcb99896..3358e23f7 100644 --- a/models/relics/relic.md3_8.skin +++ b/models/relics/relic.md3_8.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,textures/common/nodraw \ No newline at end of file +sign,models/relics/sign_speed \ No newline at end of file diff --git a/models/relics/relic.md3_9.skin b/models/relics/relic.md3_9.skin index 3358e23f7..8276637c0 100644 --- a/models/relics/relic.md3_9.skin +++ b/models/relics/relic.md3_9.skin @@ -1,3 +1,3 @@ ring,models/relics/relic_ring mesh,models/relics/relic -sign,models/relics/sign_speed \ No newline at end of file +sign,models/relics/sign_jump \ No newline at end of file diff --git a/models/relics/relic_powerup.md3 b/models/relics/relic_powerup.md3 index 14cf73616..06ec53d95 100644 Binary files a/models/relics/relic_powerup.md3 and b/models/relics/relic_powerup.md3 differ diff --git a/models/relics/sign_bash.tga b/models/relics/sign_bash.tga deleted file mode 100644 index 348b286af..000000000 Binary files a/models/relics/sign_bash.tga and /dev/null differ diff --git a/models/relics/sign_bash_glow.tga b/models/relics/sign_bash_glow.tga deleted file mode 100644 index 67b11bbca..000000000 Binary files a/models/relics/sign_bash_glow.tga and /dev/null differ diff --git a/models/relics/sign_resistance.tga b/models/relics/sign_resistance.tga deleted file mode 100644 index 56a11639a..000000000 Binary files a/models/relics/sign_resistance.tga and /dev/null differ diff --git a/models/relics/sign_resistance_glow.tga b/models/relics/sign_resistance_glow.tga deleted file mode 100644 index 0e22a4314..000000000 Binary files a/models/relics/sign_resistance_glow.tga and /dev/null differ diff --git a/mutators.cfg b/mutators.cfg index 8949ed8b8..d9a1166fc 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -322,9 +322,6 @@ set g_buffs_cooldown_activate 5 "cooldown period when buff is first activated" set g_buffs_cooldown_respawn 3 "cooldown period when buff is reloading" set g_buffs_ammo 1 "ammo buff: infinite ammunition" set g_buffs_ammo_time 60 "ammo buff carry time" -set g_buffs_resistance 1 "resistance buff: greatly reduces damage taken" -set g_buffs_resistance_time 60 "resistance buff time" -set g_buffs_resistance_blockpercent 0.5 "damage reduction multiplier, higher values mean less damage" set g_buffs_medic 1 "medic buff: increased regeneration speed, extra health, chance to survive a fatal attack" set g_buffs_medic_time 60 "medic buff carry time" set g_buffs_medic_survive_chance 0.6 "multiplier chance of player surviving a fatal hit" @@ -335,10 +332,6 @@ set g_buffs_medic_regen 1.7 "health medic rate multiplier" set g_buffs_vengeance 1 "vengeance buff: attackers also take damage" set g_buffs_vengeance_time 60 "vengeance buff carry time" set g_buffs_vengeance_damage_multiplier 0.4 "amount of damage dealt the attacker takes when hitting a target with vengeance" -set g_buffs_bash 1 "bash buff: increased knockback force and immunity to knockback" -set g_buffs_bash_time 60 "bash buff carry time" -set g_buffs_bash_force 2 "bash force multiplier" -set g_buffs_bash_force_self 1.2 "bash self force multiplier" set g_buffs_disability 0 "disability buff: attacks to players and monsters deal slowness (decreased movement/attack speed) for a few seconds" set g_buffs_disability_time 60 "disability buff carry time" set g_buffs_disability_slowtime 3 "time in seconds for target disability" diff --git a/qcsrc/common/effects/effectinfo_buffs.inc b/qcsrc/common/effects/effectinfo_buffs.inc index 8ac904130..94c177d02 100644 --- a/qcsrc/common/effects/effectinfo_buffs.inc +++ b/qcsrc/common/effects/effectinfo_buffs.inc @@ -1,21 +1,3 @@ -DEF(relic_resistance); -SUB(relic_resistance) { - MY(airfriction) = 0.200000; - MY(alpha_min) = 128; - MY(alpha_max) = 256; - MY(alpha_fade) = 256; - MY(color_min) = "0x00ff80"; - MY(color_max) = "0x00ff80"; - MY(count) = 20; - MY(gravity) = -0.100000; - MY(liquidfriction) = 0.800000; - MY(originjitter) = '8.0 8.0 32.0'; - MY(size_min) = 1.500000; - MY(size_max) = 1.500000; - MY(type) = "static"; - MY(velocityjitter) = '64.0 64.0 32.0'; -} - DEF(relic_regeneration); SUB(relic_regeneration) { MY(airfriction) = 0.200000; diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc index 1572a75e5..4cb193769 100644 --- a/qcsrc/common/mutators/mutator/buffs/all.inc +++ b/qcsrc/common/mutators/mutator/buffs/all.inc @@ -4,8 +4,6 @@ string Buff_UndeprecateName(string buffname) { case "ammoregen": return "ammo"; // Q3TA ammoregen case "doubler": return "inferno"; // Q3TA doubler - case "scout": return "bash"; // Q3TA scout - case "guard": return "resistance"; // Q3TA guard case "revival": case "regen": return "medic"; // WOP revival, Q3A regen case "jumper": return "jump"; // WOP jumper case "invulnerability": return "vampire"; // Q3TA invulnerability @@ -26,17 +24,6 @@ REGISTER_BUFF(AMMO, NEW(AmmoBuff)); BUFF_SPAWNFUNCS(ammo, BUFF_AMMO) BUFF_SPAWNFUNC_Q3COMPAT(item_ammoregen, BUFF_AMMO) -CLASS(ResistanceBuff, Buff) - ATTRIB(ResistanceBuff, m_name, string, _("Resistance")); - ATTRIB(ResistanceBuff, netname, string, "resistance"); - ATTRIB(ResistanceBuff, m_icon, string, "buff_resistance"); - ATTRIB(ResistanceBuff, m_skin, int, 0); - ATTRIB(ResistanceBuff, m_color, vector, '0.36 1 0.07'); -ENDCLASS(ResistanceBuff) -REGISTER_BUFF(RESISTANCE, NEW(ResistanceBuff)); -BUFF_SPAWNFUNCS(resistance, BUFF_RESISTANCE) -BUFF_SPAWNFUNC_Q3COMPAT(item_guard, BUFF_RESISTANCE) - CLASS(MedicBuff, Buff) ATTRIB(MedicBuff, m_name, string, _("Medic")); ATTRIB(MedicBuff, netname, string, "medic"); @@ -49,17 +36,6 @@ BUFF_SPAWNFUNCS(medic, BUFF_MEDIC) BUFF_SPAWNFUNC_Q3COMPAT(item_regen, BUFF_MEDIC) BUFF_SPAWNFUNC_Q3COMPAT(item_revival, BUFF_MEDIC) -CLASS(BashBuff, Buff) - ATTRIB(BashBuff, m_name, string, _("Bash")); - ATTRIB(BashBuff, netname, string, "bash"); - ATTRIB(BashBuff, m_icon, string, "buff_bash"); - ATTRIB(BashBuff, m_skin, int, 5); - ATTRIB(BashBuff, m_color, vector, '1 0.39 0'); -ENDCLASS(BashBuff) -REGISTER_BUFF(BASH, NEW(BashBuff)); -BUFF_SPAWNFUNCS(bash, BUFF_BASH) -BUFF_SPAWNFUNC_Q3COMPAT(item_scout, BUFF_BASH) - CLASS(VampireBuff, Buff) ATTRIB(VampireBuff, m_name, string, _("Vampire")); ATTRIB(VampireBuff, netname, string, "vampire"); diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 6ce016e56..5bda45203 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -663,12 +663,6 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate) if(frag_deathtype == DEATH_BUFF.m_id) { return; } - if(StatusEffects_active(BUFF_RESISTANCE, frag_target)) - { - float reduced = frag_damage * autocvar_g_buffs_resistance_blockpercent; - frag_damage = bound(0, frag_damage - reduced, frag_damage); - } - if(StatusEffects_active(BUFF_MEDIC, frag_target)) if((GetResource(frag_target, RES_HEALTH) - frag_damage) <= 0) if(!ITEM_DAMAGE_NEEDKILL(frag_deathtype)) @@ -694,19 +688,6 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate) dmgent.nextthink = time + 0.1; } - if(StatusEffects_active(BUFF_BASH, frag_target)) - if(frag_attacker != frag_target) - frag_force = '0 0 0'; - - if(StatusEffects_active(BUFF_BASH, frag_attacker)) - if(frag_force) - { - if(frag_attacker == frag_target) - frag_force *= autocvar_g_buffs_bash_force_self; - else - frag_force *= autocvar_g_buffs_bash_force; - } - if(StatusEffects_active(BUFF_DISABILITY, frag_attacker)) if(frag_target != frag_attacker) StatusEffects_apply(STATUSEFFECT_Disabled, frag_target, time + autocvar_g_buffs_disability_slowtime, 0); diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh index c8b2b363d..2c94b706e 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh @@ -30,15 +30,12 @@ bool autocvar_g_buffs_replace_powerups; bool autocvar_g_buffs_drop = false; float autocvar_g_buffs_cooldown_activate; float autocvar_g_buffs_cooldown_respawn; -float autocvar_g_buffs_resistance_blockpercent; float autocvar_g_buffs_medic_survive_chance; float autocvar_g_buffs_medic_survive_health; float autocvar_g_buffs_medic_rot; float autocvar_g_buffs_medic_max; float autocvar_g_buffs_medic_regen; float autocvar_g_buffs_vengeance_damage_multiplier; -float autocvar_g_buffs_bash_force; -float autocvar_g_buffs_bash_force_self; float autocvar_g_buffs_disability_slowtime; float autocvar_g_buffs_disability_speed; float autocvar_g_buffs_disability_rate; diff --git a/scripts/relics.shader b/scripts/relics.shader index e070ea2b6..e0cf9ad90 100644 --- a/scripts/relics.shader +++ b/scripts/relics.shader @@ -27,17 +27,6 @@ models/relics/sign_ammo } } -models/relics/sign_bash -{ - deformVertexes autosprite - cull none - nopicmip - { - map models/relics/sign_bash - blendfunc add - } -} - models/relics/sign_blessed { deformVertexes autosprite @@ -126,17 +115,6 @@ models/relics/sign_medic } } -models/relics/sign_resistance -{ - deformVertexes autosprite - cull none - nopicmip - { - map models/relics/sign_resistance - blendfunc add - } -} - models/relics/sign_speed { deformVertexes autosprite