From 5b1ca40ae930062f93562d2b1c48fc36da8c0810 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 25 May 2023 11:18:22 -0400 Subject: [PATCH] v2.1.0: improved clarity when bleed-immune enemies are hit by harvest --- core/src/main/assets/messages/actors/actors.properties | 1 + .../com/shatteredpixel/shatteredpixeldungeon/actors/Char.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 426d865e1..bee1b3fe5 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -1367,3 +1367,4 @@ actors.char.kill=%s killed you... actors.char.defeat=you defeated %s. actors.char.def_verb=dodged actors.char.invulnerable=invulnerable +actors.char.immune=immune diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 1e224b644..84715f61b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -713,7 +713,9 @@ public abstract class Char extends Actor { if (buff(Sickle.HarvestBleedTracker.class) != null){ if (isImmune(Bleeding.class)){ - dmg = 0; + sprite.showStatus(CharSprite.POSITIVE, Messages.titleCase(Messages.get(this, "immune"))); + buff(Sickle.HarvestBleedTracker.class).detach(); + return; } Bleeding b = buff(Bleeding.class);