konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.0.0: holy weapon and ward now work with curses

Browse Source
This commit is contained in:
Evan Debenham
2024-11-26 11:06:43 -05:00
parent e171a1efee
commit abc6b8bc04
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
View File

@@ -467,7 +467,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){
&& defender.buff(HolyWard.HolyArmBuff.class) != null){
damage -= Math.round(1f * Glyph.genericProcChanceMultiplier(defender));
} else if (glyph != null) {
damage = glyph.proc( this, attacker, defender, damage );

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
View File

@@ -117,7 +117,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){
&& attacker.buff(HolyWeapon.HolyWepBuff.class) != null){
defender.damage(Math.round(2f * Enchantment.genericProcChanceMultiplier(attacker)), HolyWeapon.INSTANCE);
} else if (enchantment != null) {
damage = enchantment.proc(this, attacker, defender, damage);