Skip to content
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

Exclude melee from wall frags #3572

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Exclude melee from wall frags #3572

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
79c06e4
Exclude melee from wall frags
Safairette Nov 28, 2024
ed3b590
Add tools to melee dinfo
Safairette Nov 30, 2024
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
1 change: 1 addition & 0 deletions Source/CombatExtended/CombatExtended/Verbs/Verb_MeleeAttackCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ protected virtual IEnumerable<DamageInfo> DamageInfosToApply(LocalTargetInfo tar
damageInfo.SetWeaponBodyPartGroup(bodyPartGroupDef);
damageInfo.SetWeaponHediff(hediffDef);
damageInfo.SetAngle(direction);
damageInfo.SetTool(tool);
yield return damageInfo;
if (this.tool != null && this.tool.extraMeleeDamages != null)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/CombatExtended/Harmony/Harmony_DamageWorker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static bool Prefix(DamageWorker __instance, DamageInfo dinfo, Thing victi
{
return true;
}
if (victim.def.useHitPoints && dinfo.Def.harmsHealth && dinfo.Def != DamageDefOf.Mining)
if (victim.def.useHitPoints && dinfo.Def.harmsHealth && dinfo.tool == null && dinfo.Def != DamageDefOf.Mining)
{
if (victim.def.category == ThingCategory.Building)
{
Expand Down