LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.0: feast has been remade to meat pie

Browse Source
This commit is contained in:
Evan Debenham 2018-10-11 18:45:55 -04:00
parent 07ba48e8e0
commit d3f13d4ec5
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java
View File

@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.AlchemistsToolkit; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.AlchemistsToolkit;
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb; import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
import com.shatteredpixel.shatteredpixeldungeon.items.food.Blandfruit; 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.food.StewedMeat;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.BlizzardBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.BlizzardBrew;
@ -213,7 +213,7 @@ public abstract class Recipe {
new ExoticPotion.PotionToExotic(), new ExoticPotion.PotionToExotic(),
new ExoticScroll.ScrollToExotic(), new ExoticScroll.ScrollToExotic(),
new StewedMeat.threeMeat(), new StewedMeat.threeMeat(),
new Feast.Recipe() new MeatPie.Recipe()
}; };
public static Recipe findRecipe(ArrayList<Item> ingredients){ public static Recipe findRecipe(ArrayList<Item> ingredients){

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Feast.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java
View File

@ -30,10 +30,10 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import java.util.ArrayList; 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; energy = Hunger.STARVING*2f;
} }
@ -92,7 +92,7 @@ public class Feast extends Food {
@Override @Override
public Item sampleOutput(ArrayList<Item> ingredients) { public Item sampleOutput(ArrayList<Item> ingredients) {
return new Feast(); return new MeatPie();
} }
} }
} }

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -607,7 +607,7 @@ public class ItemSpriteSheet {
public static final int PASTY = FOOD+6; public static final int PASTY = FOOD+6;
public static final int PUMPKIN_PIE = FOOD+7; public static final int PUMPKIN_PIE = FOOD+7;
public static final int CANDY_CANE = FOOD+8; 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 BLANDFRUIT = FOOD+10;
public static final int BLAND_CHUNKS= FOOD+11; public static final int BLAND_CHUNKS= FOOD+11;
static{ static{
@ -620,7 +620,7 @@ public class ItemSpriteSheet {
assignItemRect(PASTY, 16, 11); assignItemRect(PASTY, 16, 11);
assignItemRect(PUMPKIN_PIE, 16, 12); assignItemRect(PUMPKIN_PIE, 16, 12);
assignItemRect(CANDY_CANE, 13, 16); assignItemRect(CANDY_CANE, 13, 16);
assignItemRect(FEAST, 16, 12); assignItemRect(MEAT_PIE, 16, 12);
assignItemRect(BLANDFRUIT, 9, 12); assignItemRect(BLANDFRUIT, 9, 12);
assignItemRect(BLAND_CHUNKS,14, 6); assignItemRect(BLAND_CHUNKS,14, 6);
} }

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java
View File

@ -28,8 +28,8 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.Recipe; import com.shatteredpixel.shatteredpixeldungeon.items.Recipe;
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb; import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
import com.shatteredpixel.shatteredpixeldungeon.items.food.Blandfruit; 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.Food;
import com.shatteredpixel.shatteredpixeldungeon.items.food.MeatPie;
import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
import com.shatteredpixel.shatteredpixeldungeon.items.food.Pasty; import com.shatteredpixel.shatteredpixeldungeon.items.food.Pasty;
import com.shatteredpixel.shatteredpixeldungeon.items.food.StewedMeat; 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(new QuickRecipe( new StewedMeat.threeMeat() ));
result.add(null); result.add(null);
result.add(null); result.add(null);
result.add(new QuickRecipe( new Feast.Recipe(), result.add(new QuickRecipe( new MeatPie.Recipe(),
new ArrayList<Item>(Arrays.asList(new Pasty(), new Food(), new MysteryMeat.PlaceHolder())), new ArrayList<Item>(Arrays.asList(new Pasty(), new Food(), new MysteryMeat.PlaceHolder())),
new Feast())); new MeatPie()));
result.add(null); result.add(null);
result.add(null); result.add(null);
result.add(new QuickRecipe( new Blandfruit.CookFruit(), result.add(new QuickRecipe( new Blandfruit.CookFruit(),

8
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -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.name=chargrilled meat
items.food.chargrilledmeat.desc=It looks like a decent steak. 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.name=ration of food
items.food.food.ac_eat=EAT items.food.food.ac_eat=EAT
items.food.food.eat_msg=That food tasted delicious! 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.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.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.name=mystery meat
items.food.mysterymeat.eat_msg=That food tasted... strange. items.food.mysterymeat.eat_msg=That food tasted... strange.
items.food.mysterymeat.hot=Oh it's hot! items.food.mysterymeat.hot=Oh it's hot!