From 0366cdc0ed76d94e64d132e12bc1f98472d4d7c1 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 7 Nov 2018 01:52:57 -0500 Subject: [PATCH] v0.7.0b: further fixes/adjustments: - removed leftover conversion logic from beta - imp now spawns at the same time as other mobs - remains in mass grave room now spawn wraiths at the normal rate again --- .../shatteredpixeldungeon/ShatteredPixelDungeon.java | 4 ---- .../shatteredpixeldungeon/levels/CityLevel.java | 6 +++--- .../levels/rooms/special/MassGraveRoom.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index e0da595d2..642981e3c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -143,10 +143,6 @@ public class ShatteredPixelDungeon extends Game { com.shatteredpixel.shatteredpixeldungeon.items.spells.MagicalInfusion.class, "com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion" ); - //v0.7.0 beta, remove before full release - com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.food.MeatPie.class, - "com.shatteredpixel.shatteredpixeldungeon.items.food.Feast" ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java index 38e5ba9f3..4a03caa26 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java @@ -103,10 +103,10 @@ public class CityLevel extends RegularLevel { } @Override - protected void createItems() { - super.createItems(); - + protected void createMobs() { Imp.Quest.spawn( this ); + + super.createMobs(); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java index 97cf03f23..7a4891929 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MassGraveRoom.java @@ -89,7 +89,7 @@ public class MassGraveRoom extends SpecialRoom { pos = level.pointToCell(random()); } while (level.map[pos] != Terrain.EMPTY_SP || level.heaps.get(pos) != null); Heap h = level.drop(item, pos); - h.haunted = true; + h.setHauntedIfCursed(1f); h.type = Heap.Type.SKELETON; } }