From d3f13d4ec505be97d3d9fe3e4760b51e87c4e584 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 11 Oct 2018 18:45:55 -0400 Subject: [PATCH] v0.7.0: feast has been remade to meat pie --- core/src/main/assets/items.png | Bin 18940 -> 18961 bytes .../shatteredpixeldungeon/items/Recipe.java | 4 ++-- .../items/food/{Feast.java => MeatPie.java} | 6 +++--- .../sprites/ItemSpriteSheet.java | 4 ++-- .../shatteredpixeldungeon/ui/QuickRecipe.java | 6 +++--- .../messages/items/items.properties | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) rename core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/{Feast.java => MeatPie.java} (96%) diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index 0bd001bb69150e53c36a2a37180c8826f18a9c74..b921e4f1261f7e5c25d8b0bf21ec5b3411145610 100644 GIT binary patch literal 18961 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 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java index 78fc90376..a346cfe10 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java @@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.AlchemistsToolkit; import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb; import com.shatteredpixel.shatteredpixeldungeon.items.food.Blandfruit; -import com.shatteredpixel.shatteredpixeldungeon.items.food.Feast; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MeatPie; import com.shatteredpixel.shatteredpixeldungeon.items.food.StewedMeat; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.BlizzardBrew; @@ -213,7 +213,7 @@ public abstract class Recipe { new ExoticPotion.PotionToExotic(), new ExoticScroll.ScrollToExotic(), new StewedMeat.threeMeat(), - new Feast.Recipe() + new MeatPie.Recipe() }; public static Recipe findRecipe(ArrayList ingredients){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Feast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java similarity index 96% rename from core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Feast.java rename to core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java index 177dec736..f1bcd12ec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Feast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java @@ -30,10 +30,10 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import java.util.ArrayList; -public class Feast extends Food { +public class MeatPie extends Food { { - image = ItemSpriteSheet.FEAST; + image = ItemSpriteSheet.MEAT_PIE; energy = Hunger.STARVING*2f; } @@ -92,7 +92,7 @@ public class Feast extends Food { @Override public Item sampleOutput(ArrayList ingredients) { - return new Feast(); + return new MeatPie(); } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index e619b8e95..e608e83fe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -607,7 +607,7 @@ public class ItemSpriteSheet { public static final int PASTY = FOOD+6; public static final int PUMPKIN_PIE = FOOD+7; public static final int CANDY_CANE = FOOD+8; - public static final int FEAST = FOOD+9; + public static final int MEAT_PIE = FOOD+9; public static final int BLANDFRUIT = FOOD+10; public static final int BLAND_CHUNKS= FOOD+11; static{ @@ -620,7 +620,7 @@ public class ItemSpriteSheet { assignItemRect(PASTY, 16, 11); assignItemRect(PUMPKIN_PIE, 16, 12); assignItemRect(CANDY_CANE, 13, 16); - assignItemRect(FEAST, 16, 12); + assignItemRect(MEAT_PIE, 16, 12); assignItemRect(BLANDFRUIT, 9, 12); assignItemRect(BLAND_CHUNKS,14, 6); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java index 03b40ce10..012f01065 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java @@ -28,8 +28,8 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Recipe; import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb; import com.shatteredpixel.shatteredpixeldungeon.items.food.Blandfruit; -import com.shatteredpixel.shatteredpixeldungeon.items.food.Feast; import com.shatteredpixel.shatteredpixeldungeon.items.food.Food; +import com.shatteredpixel.shatteredpixeldungeon.items.food.MeatPie; import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; import com.shatteredpixel.shatteredpixeldungeon.items.food.Pasty; import com.shatteredpixel.shatteredpixeldungeon.items.food.StewedMeat; @@ -307,9 +307,9 @@ public class QuickRecipe extends Component { result.add(new QuickRecipe( new StewedMeat.threeMeat() )); result.add(null); result.add(null); - result.add(new QuickRecipe( new Feast.Recipe(), + result.add(new QuickRecipe( new MeatPie.Recipe(), new ArrayList(Arrays.asList(new Pasty(), new Food(), new MysteryMeat.PlaceHolder())), - new Feast())); + new MeatPie())); result.add(null); result.add(null); result.add(new QuickRecipe( new Blandfruit.CookFruit(), 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 9feff2eba..33838a1a5 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 @@ -425,10 +425,6 @@ items.food.blandfruit$chunks.desc=The blandfruit has exploded on impact, leaving items.food.chargrilledmeat.name=chargrilled meat items.food.chargrilledmeat.desc=It looks like a decent steak. -items.food.feast.name=feast -items.food.feast.eat_msg=That meal was incredible! -items.food.feast.desc=A great variety of delicious food! This will satiate you far more than any other meal. - items.food.food.name=ration of food items.food.food.ac_eat=EAT items.food.food.eat_msg=That food tasted delicious! @@ -441,6 +437,10 @@ items.food.frozencarpaccio.refresh=Refreshing! items.food.frozencarpaccio.better=You feel better! items.food.frozencarpaccio.desc=It's a piece of frozen raw meat. The only way to eat it is by cutting thin slices of it. And this way it's suprisingly good. +items.food.meatpie.name=meat pie +items.food.meatpie.eat_msg=That food was incredible! +items.food.meatpie.desc=A delicious pie filled with savoury meat. This will satiate you far more than any other meal. + items.food.mysterymeat.name=mystery meat items.food.mysterymeat.eat_msg=That food tasted... strange. items.food.mysterymeat.hot=Oh it's hot!