From ef81846d0b36406aacefd56bf6f7451ccc2ed335 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 18 Nov 2024 15:24:10 -0500 Subject: [PATCH] v3.0.0: holy weapon and ward are now affected by arcana boosts --- .../shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java | 2 +- .../shatteredpixeldungeon/items/weapon/Weapon.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 0aad2b1ea..cacaa951a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -468,7 +468,7 @@ public class Armor extends EquipableItem { if (defender.buff(MagicImmune.class) == null) { if (defender instanceof Hero && isEquipped((Hero) defender) && !hasCurseGlyph() && defender.buff(HolyWard.HolyArmBuff.class) != null){ - damage -= 1; + damage -= Math.round(1f * Glyph.genericProcChanceMultiplier(defender)); } else if (glyph != null) { damage = glyph.proc( this, attacker, defender, damage ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index 3c90a4c59..578e3d0e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -118,7 +118,7 @@ abstract public class Weapon extends KindOfWeapon { if (attacker.buff(MagicImmune.class) == null) { if (attacker instanceof Hero && isEquipped((Hero) attacker) && !hasCurseEnchant() && attacker.buff(HolyWeapon.HolyWepBuff.class) != null){ - defender.damage(2, HolyWeapon.INSTANCE); + defender.damage(Math.round(2f * Enchantment.genericProcChanceMultiplier(attacker)), HolyWeapon.INSTANCE); } else if (enchantment != null) { damage = enchantment.proc(this, attacker, defender, damage); }