diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index f4f85a3c2..d4c0aefbb 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -617,7 +617,7 @@ actors.hero.talent$combinedlethalitytriggertracker.desc=The Duelist's next attac #warrior actors.hero.talent.hearty_meal.title=hearty meal -actors.hero.talent.hearty_meal.desc=_+1:_ Eating heals the Warrior for _2 HP_ when he is below 50% health, and _3 HP_ when he is below 25% health.\n\n_+2:_ Eating heals the Warrior for _3 HP_ when he is below 50% health, and _5 HP_ when he is below 25% health. +actors.hero.talent.hearty_meal.desc=_+1:_ Eating food heals the Warrior for _3 HP_ when he is at or below 30% health.\n\n_+2:_ Eating food heals the Warrior for _5 HP_ when is at or below 30% health. actors.hero.talent.veterans_intuition.title=veteran's intuition actors.hero.talent.veterans_intuition.desc=_+1:_ The Warrior identifies weapons _1.75x faster_ and armor _2.5x faster_.\n\n_+2:_ The Warrior identifies weapons _2.5x faster_ and armor _when he equips it_. actors.hero.talent.test_subject.title=test subject diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java index 20f388f19..14c6fca1d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java @@ -462,12 +462,9 @@ public enum Talent { public static void onFoodEaten( Hero hero, float foodVal, Item foodSource ){ if (hero.hasTalent(HEARTY_MEAL)){ - if (hero.HP <= hero.HT/2) { - //2/3 HP healed, when hero is below 50% health - int healing = 1 + hero.pointsInTalent(HEARTY_MEAL); - //3/5 HP healed, when hero is below 25% health - if (hero.HP <= hero.HT/4) healing = 1 + 2 * hero.pointsInTalent(HEARTY_MEAL); - + //3/5 HP healed, when hero is below 30% health + if (hero.HP/(float)hero.HT <= 0.3f) { + int healing = 1 + 2 * hero.pointsInTalent(HEARTY_MEAL); hero.HP = Math.min(hero.HP + healing, hero.HT); hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(healing), FloatingText.HEALING); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java index 9b37070b2..9892ccc63 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java @@ -249,7 +249,7 @@ public class StatusPane extends Component { if (!Dungeon.hero.isAlive()) { avatar.tint(0x000000, 0.5f); - } else if ((health/(float)max) < 0.3f) { + } else if ((health/(float)max) <= 0.3f) { warning += Game.elapsed * 5f *(0.4f - (health/(float)max)); warning %= 1f; avatar.tint(ColorMath.interpolate(warning, warningColors), 0.5f );