From 556028f6b5e8ea223a02274c44319584c7fb1ca3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 24 Nov 2021 14:43:33 -0500 Subject: [PATCH] v1.1.0: fixed some effects not triggering for ghost & armored statues --- .../shatteredpixeldungeon/actors/mobs/ArmoredStatue.java | 1 + .../shatteredpixeldungeon/items/artifacts/DriedRose.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredStatue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredStatue.java index 723d2bc53..67c1ba793 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredStatue.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredStatue.java @@ -91,6 +91,7 @@ public class ArmoredStatue extends Statue { @Override public int defenseProc(Char enemy, int damage) { + damage = super.defenseProc(enemy, damage); return armor.proc(enemy, this, damage); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index df6723ca9..43fcb385c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -616,10 +616,9 @@ public class DriedRose extends Artifact { @Override public int defenseProc(Char enemy, int damage) { if (rose != null && rose.armor != null) { - return rose.armor.proc( enemy, this, damage ); - } else { - return super.defenseProc(enemy, damage); + damage = rose.armor.proc( enemy, this, damage ); } + return super.defenseProc(enemy, damage); } @Override