From c78cfdd7531693b81dcbc539b41935858a104f42 Mon Sep 17 00:00:00 2001 From: Rederick5 Date: Tue, 17 Feb 2026 08:58:13 -0500 Subject: [PATCH 1/3] Fixed multiple reductions of damage during partial charge. --- src/game/shared/weapons/giattack.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp index 16f8edec..fb6501f2 100644 --- a/src/game/shared/weapons/giattack.cpp +++ b/src/game/shared/weapons/giattack.cpp @@ -788,11 +788,12 @@ void CGenericItem::StrikeLand() if (bUnderleveled) flDamage *= 0.5; //this might be working - //Print( "In damage: %f\nLast charged: %f\n", flDamage, m_LastChargedAmt ); - if (m_LastChargedAmt > 0 && m_LastChargedAmt < 1) + Print( "In damage: %f\nLast charged: %f\n", flDamage, m_LastChargedAmt ); + if (m_LastChargedAmt < 1) { - Print("Out damage: %f\n", flDamage *= m_LastChargedAmt); - flDamage *= m_LastChargedAmt; + flDamage *= (m_LastChargedAmt + 1); + Print("Out damage: %f\nCharge Multiplier: %f\n", flDamage, (m_LastChargedAmt+1)); + } SetDebugProgress(ItemThinkProgress, "CGenericItem::StrikeLand - Call DoDamage"); From fc0c46a07b7aa7c739164401af4d73bd6681a9f7 Mon Sep 17 00:00:00 2001 From: Rederick5 Date: Tue, 17 Feb 2026 09:00:33 -0500 Subject: [PATCH 2/3] commented print statements --- src/game/shared/weapons/giattack.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp index fb6501f2..99f6938c 100644 --- a/src/game/shared/weapons/giattack.cpp +++ b/src/game/shared/weapons/giattack.cpp @@ -788,12 +788,11 @@ void CGenericItem::StrikeLand() if (bUnderleveled) flDamage *= 0.5; //this might be working - Print( "In damage: %f\nLast charged: %f\n", flDamage, m_LastChargedAmt ); + //Print( "In damage: %f\nLast charged: %f\n", flDamage, m_LastChargedAmt ); if (m_LastChargedAmt < 1) { flDamage *= (m_LastChargedAmt + 1); - Print("Out damage: %f\nCharge Multiplier: %f\n", flDamage, (m_LastChargedAmt+1)); - + //Print("Out damage: %f\nCharge Multiplier: %f\n", flDamage, (m_LastChargedAmt+1)); } SetDebugProgress(ItemThinkProgress, "CGenericItem::StrikeLand - Call DoDamage"); From 5f0c440ede40bf09a50b3f5c36977a0b8668243d Mon Sep 17 00:00:00 2001 From: Rederick5 <73010056+Rederick5@users.noreply.github.com> Date: Mon, 23 Feb 2026 18:37:57 -0500 Subject: [PATCH 3/3] Removed m_LastChargedAmt modifiers in StrikeLand() Charge damage is calculated through scripting. --- src/game/shared/weapons/giattack.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/game/shared/weapons/giattack.cpp b/src/game/shared/weapons/giattack.cpp index 99f6938c..4cab29ba 100644 --- a/src/game/shared/weapons/giattack.cpp +++ b/src/game/shared/weapons/giattack.cpp @@ -788,13 +788,6 @@ void CGenericItem::StrikeLand() if (bUnderleveled) flDamage *= 0.5; //this might be working - //Print( "In damage: %f\nLast charged: %f\n", flDamage, m_LastChargedAmt ); - if (m_LastChargedAmt < 1) - { - flDamage *= (m_LastChargedAmt + 1); - //Print("Out damage: %f\nCharge Multiplier: %f\n", flDamage, (m_LastChargedAmt+1)); - } - SetDebugProgress(ItemThinkProgress, "CGenericItem::StrikeLand - Call DoDamage"); int bitsDamage = DMG_CLUB; if (!m_pPlayer)