From 6d6b3fc5d0a3c95692b2644161885af5ae29c083 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 1 Mar 2023 13:00:31 -0800 Subject: [PATCH] WEAPON_KNIFE: damage values are now editable via skill cvars as well. --- src/shared/w_knife.qc | 30 +++++++++------ zpak001.pk3dir/skill_cstrike.cfg | 63 +++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index bdfe135..82f663f 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.qc @@ -135,21 +135,25 @@ w_knife_primary(player pl) switch (trace_surface_id) { case BODY_HEAD: - dmg = 60; + dmg = Skill_GetValue("plr_knife_dmghead", 60); break; case BODY_STOMACH: - dmg = 18; + dmg = Skill_GetValue("plr_knife_dmgstomach", 18); break; case BODY_LEGLEFT: case BODY_LEGRIGHT: - dmg = 11; + dmg = Skill_GetValue("plr_knife_dmglegs", 11); break; - case BODY_DEFAULT: case BODY_CHEST: + dmg = Skill_GetValue("plr_knife_dmgchest", 15); + break; case BODY_ARMLEFT: case BODY_ARMRIGHT: + dmg = Skill_GetValue("plr_knife_dmgarms", 15); + break; + case BODY_DEFAULT: default: - dmg = 15; + dmg = Skill_GetValue("plr_knife_dmg", 15); break; } Damage_Apply(trace_ent, pl, dmg, WEAPON_KNIFE, DMG_SLASH); @@ -180,7 +184,7 @@ w_knife_secondary(player pl) Weapons_MakeVectors(pl); src = pl.origin + pl.view_ofs; - traceline(src, src + (v_forward * 32), MOVE_HITMODEL, pl); + traceline(src, src + (v_forward * range), MOVE_HITMODEL, pl); Sound_Play(pl, CHAN_WEAPON, "weapon_knife.miss"); @@ -202,21 +206,25 @@ w_knife_secondary(player pl) int dmg = 0; switch (trace_surface_id) { case BODY_HEAD: - dmg = 260; + dmg = Skill_GetValue("plr_knife_altdmghead", 260); break; case BODY_STOMACH: - dmg = 81; + dmg = Skill_GetValue("plr_knife_altdmgstomach", 81); break; case BODY_LEGLEFT: case BODY_LEGRIGHT: - dmg = 48; + dmg = Skill_GetValue("plr_knife_altdmglegs", 48); break; - case BODY_DEFAULT: case BODY_CHEST: + dmg = Skill_GetValue("plr_knife_altdmgchest", 65); + break; case BODY_ARMLEFT: case BODY_ARMRIGHT: + dmg = Skill_GetValue("plr_knife_altdmgarms", 65); + break; + case BODY_DEFAULT: default: - dmg = 65; + dmg = Skill_GetValue("plr_knife_altdmg", 65); break; } diff --git a/zpak001.pk3dir/skill_cstrike.cfg b/zpak001.pk3dir/skill_cstrike.cfg index e133390..785704f 100644 --- a/zpak001.pk3dir/skill_cstrike.cfg +++ b/zpak001.pk3dir/skill_cstrike.cfg @@ -10,4 +10,65 @@ set sk_plr_knife_range3 48 // knife: secondary attack range set sk_plr_knife_altrange1 48 set sk_plr_knife_altrange2 48 -set sk_plr_knife_altrange3 48 \ No newline at end of file +set sk_plr_knife_altrange3 48 + +// knife: primary damage +set sk_plr_knife_dmg1 15 +set sk_plr_knife_dmg2 15 +set sk_plr_knife_dmg3 15 + +// knife: primary damage done to head +set sk_plr_knife_dmghead1 60 +set sk_plr_knife_dmghead2 60 +set sk_plr_knife_dmghead3 60 + +// knife: primary damage done to the stomach +set sk_plr_knife_dmgstomach1 18 +set sk_plr_knife_dmgstomach2 18 +set sk_plr_knife_dmgstomach3 18 + +// knife: primary damage done to the legs +set sk_plr_knife_dmglegs1 11 +set sk_plr_knife_dmglegs2 11 +set sk_plr_knife_dmglegs3 11 + +// knife: primary damage done to the arms +set sk_plr_knife_dmgarms1 15 +set sk_plr_knife_dmgarms2 15 +set sk_plr_knife_dmgarms3 15 + +// knife: primary damage done to the chest +set sk_plr_knife_dmgchest1 15 +set sk_plr_knife_dmgchest2 15 +set sk_plr_knife_dmgchest3 15 + +// knife: secondary damage +set sk_plr_knife_altdmg1 65 +set sk_plr_knife_altdmg2 65 +set sk_plr_knife_altdmg3 65 + +// knife: secondary damage done to head +set sk_plr_knife_altdmghead1 260 +set sk_plr_knife_altdmghead2 260 +set sk_plr_knife_altdmghead3 260 + +// knife: secondary damage done to the stomach +set sk_plr_knife_altdmgstomach1 81 +set sk_plr_knife_altdmgstomach2 81 +set sk_plr_knife_altdmgstomach3 81 + +// knife: secondary damage done to the legs +set sk_plr_knife_altdmglegs1 48 +set sk_plr_knife_altdmglegs2 48 +set sk_plr_knife_altdmglegs3 48 + +// knife: secondary damage done to the arms +set sk_plr_knife_altdmgarms1 65 +set sk_plr_knife_altdmgarms2 65 +set sk_plr_knife_altdmgarms3 65 + +// knife: secondary damage done to the chest +set sk_plr_knife_altdmgchest1 65 +set sk_plr_knife_altdmgchest2 65 +set sk_plr_knife_altdmgchest3 65 +