diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java index 3b9220d19..9d34d1020 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java @@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.food.ChargrilledMeat; +import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio; import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -104,7 +105,7 @@ public class Burning extends Buff implements Hero.Doom { ArrayList burnable = new ArrayList<>(); //does not reach inside of containers for (Item i : hero.belongings.backpack.items){ - if (!i.unique && (i instanceof Scroll || i instanceof MysteryMeat)){ + if (!i.unique && (i instanceof Scroll || i instanceof MysteryMeat || i instanceof FrozenCarpaccio)){ burnable.add(i); } } @@ -112,7 +113,7 @@ public class Burning extends Buff implements Hero.Doom { if (!burnable.isEmpty()){ Item toBurn = Random.element(burnable).detach(hero.belongings.backpack); GLog.w( Messages.get(this, "burnsup", Messages.capitalize(toBurn.toString())) ); - if (toBurn instanceof MysteryMeat){ + if (toBurn instanceof MysteryMeat || toBurn instanceof FrozenCarpaccio){ ChargrilledMeat steak = new ChargrilledMeat(); if (!steak.collect( hero.belongings.backpack )) { Dungeon.level.drop( steak, hero.pos ).sprite.drop(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 73003ee5c..ed1c22933 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -204,8 +204,8 @@ public class Heap implements Bundlable { } else if (item instanceof Dewdrop) { items.remove( item ); evaporated = true; - } else if (item instanceof MysteryMeat) { - replace( item, ChargrilledMeat.cook( (MysteryMeat)item ) ); + } else if (item instanceof MysteryMeat || item instanceof FrozenCarpaccio) { + replace( item, ChargrilledMeat.cook( item.quantity ) ); burnt = true; } else if (item instanceof Bomb) { items.remove( item ); 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 86fe404ac..9be5886e9 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 @@ -36,9 +36,9 @@ public class ChargrilledMeat extends Food { return 8 * quantity; } - public static Food cook( MysteryMeat ingredient ) { + public static Food cook( int quantity ) { ChargrilledMeat result = new ChargrilledMeat(); - result.quantity = ingredient.quantity(); + result.quantity = quantity; return result; } }