Skip to content

Commit

Permalink
Allowed 'noMelee' weapons to be treated as broadswords (#198).
Browse files Browse the repository at this point in the history
  • Loading branch information
Mirsario committed Sep 7, 2023
1 parent 228c478 commit 8b27594
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
### Fixes
- Fixed issue [#200](https://github.com/Mirsario/TerrariaOverhaul/issues/200) (Killing Blow Localizations are Outdated).
- Fixed the Volcano, Blood Butcherer, and a few other melee weapons using incorrect rotations & locations for their particle effects.
- Fixed the following broadswords not getting the broadsword overhaul: `Night's Edge`, `Excalibur`, `True Excalibur`, `True Night's Edge`, `Terra Blade`, `The Horseman's Blade`.

# 5.0 BETA 13B

Expand Down
5 changes: 3 additions & 2 deletions Common/Melee/_Overhauls/Broadsword.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public partial class Broadsword : ItemOverhaul, IModifyItemNPCHitSound

public override bool ShouldApplyItemOverhaul(Item item)
{
// Broadswords always swing, deal melee damage, don't have channeling, and are visible
if (item.useStyle != ItemUseStyleID.Swing || item.noMelee || item.channel || item.noUseGraphic) {
// Broadswords always swing, don't have channeling, and are visible
if (item.useStyle != ItemUseStyleID.Swing || item.channel || item.noUseGraphic) {
return false;
}

Expand All @@ -44,6 +44,7 @@ public override bool ShouldApplyItemOverhaul(Item item)
return false;
}

// Must be part of the melee class, or a subclass of it.
if (!item.DamageType.CountsAsClass(DamageClass.Melee)) {
return false;
}
Expand Down

0 comments on commit 8b27594

Please sign in to comment.