diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java index 7fb14baa8..1a730f15a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java @@ -38,7 +38,7 @@ public class Hunger extends Buff implements Hero.Doom { private static final float STEP = 10f; public static final float HUNGRY = 300f; - public static final float STARVING = 400f; + public static final float STARVING = 450f; private float level; private float partialDamage; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 3025be69b..191a182ad 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -45,6 +45,7 @@ import com.watabou.utils.Bundle; import java.util.ArrayList; +//TODO perhaps adjust leveling mechanics on this to go along with 0.6.0 hunger changes public class HornOfPlenty extends Artifact { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java index 2505229de..e7b79ee67 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java @@ -28,7 +28,7 @@ public class ChargrilledMeat extends Food { { image = ItemSpriteSheet.STEAK; - energy = Hunger.STARVING - Hunger.HUNGRY; + energy = Hunger.HUNGRY/2f; hornValue = 1; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java index f10ade30c..1748f089c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java @@ -43,7 +43,7 @@ public class FrozenCarpaccio extends Food { { image = ItemSpriteSheet.CARPACCIO; - energy = Hunger.STARVING - Hunger.HUNGRY; + energy = Hunger.HUNGRY/2f; hornValue = 1; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java index 5f195c6b0..8fa822c62 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java @@ -38,7 +38,7 @@ public class MysteryMeat extends Food { { image = ItemSpriteSheet.MEAT; - energy = Hunger.STARVING - Hunger.HUNGRY; + energy = Hunger.HUNGRY/2f; hornValue = 1; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java index e5f96b18b..364b61cec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java @@ -24,11 +24,12 @@ package com.shatteredpixel.shatteredpixeldungeon.items.food; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +//TODO rename this class to small ration in the next update public class OverpricedRation extends Food { { image = ItemSpriteSheet.OVERPRICED; - energy = Hunger.STARVING - Hunger.HUNGRY; + energy = Hunger.HUNGRY/2f; hornValue = 1; } diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 61fa55d90..f359f8fd1 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -363,7 +363,7 @@ items.food.mysterymeat.not_well=You are not feeling well. items.food.mysterymeat.stuffed=You are stuffed. items.food.mysterymeat.desc=Eat at your own risk! -items.food.overpricedration.name=overpriced food ration +items.food.overpricedration.name=small food ration items.food.overpricedration.eat_msg=That food tasted ok. items.food.overpricedration.desc=It looks exactly like a standard ration of food but smaller.