Skip to content

Fix Shield Secondary Damage Calculation #4609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViralReaction wants to merge 2 commits into
base: Development
Choose a base branch
from
Open

Fix Shield Secondary Damage Calculation #4609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ea8892
Remove dinfo modification
ViralReaction Jun 5, 2026
8a32ec7
Fix VEF Shield Secondary Damage
ViralReaction Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Source/CombatExtended/Harmony/Harmony_CompShield.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ internal static bool Prefix(out bool absorbed, DamageInfo dinfo, CompShield __in
secondaryDamageMultiplierValue = secondaryDamageModExt.shieldDamageMultiplier;
}
secondaryShieldDamageAmount += (secondaryDamageInfo.amount * secondaryDamageMultiplierValue);
dinfo.amountInt += secondaryDamageInfo.amount;

}
}
Expand Down Expand Up @@ -96,7 +95,6 @@ internal static bool Prefix(out bool absorbed, DamageInfo dinfo, CompShield __in
}
else
{
dinfo.amountInt -= secondaryShieldDamageAmount;
__instance.AbsorbedDamage(dinfo);
}
return false;
Expand Down
3 changes: 0 additions & 3 deletions Source/VEFCompat/VEFCompat/Harmony/Harmony_CompShieldBubble.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ public static bool Prefix(out bool absorbed, DamageInfo dinfo, CompShieldBubble
secondaryDamageMultiplierValue = secondaryDamageModExt.shieldDamageMultiplier;
}
secondaryShieldDamageAmount += (secondaryDamageInfo.amount * secondaryDamageMultiplierValue);
dinfo.amountInt += secondaryDamageInfo.amount;

}
}
}
Expand Down Expand Up @@ -80,7 +78,6 @@ public static bool Prefix(out bool absorbed, DamageInfo dinfo, CompShieldBubble
}
else
{
dinfo.amountInt -= secondaryShieldDamageAmount;
__instance.AbsorbedDamage(dinfo);
}
return false;
Expand Down
Loading