diff --git a/SPD-classes/src/main/java/com/watabou/input/InputHandler.java b/SPD-classes/src/main/java/com/watabou/input/InputHandler.java index 5c380337f..69bc306a1 100644 --- a/SPD-classes/src/main/java/com/watabou/input/InputHandler.java +++ b/SPD-classes/src/main/java/com/watabou/input/InputHandler.java @@ -104,7 +104,7 @@ public class InputHandler extends InputAdapter { public synchronized boolean touchUp(int screenX, int screenY, int pointer, int button) { if (button >= 3 && KeyBindings.isKeyBound( button + 1000 )) { - KeyEvent.addKeyEvent( new KeyEvent( button + 1000, true ) ); + KeyEvent.addKeyEvent( new KeyEvent( button + 1000, false ) ); } else if (button < 3) { PointerEvent.addPointerEvent(new PointerEvent(screenX, screenY, pointer, PointerEvent.Type.UP, button)); } diff --git a/build.gradle b/build.gradle index 3f26eb398..312411d53 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ allprojects { appName = 'Shattered Pixel Dungeon' appPackageName = 'com.shatteredpixel.shatteredpixeldungeon' - appVersionCode = 622 + appVersionCode = 626 appVersionName = '1.2.2' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java index ef43d06b4..35f70e952 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java @@ -428,7 +428,7 @@ public abstract class RegularLevel extends Level { boolean valid; do { cell = randomDropCell(SpecialRoom.class); - valid = !(room(cell) instanceof SecretRoom) + valid = cell != -1 && !(room(cell) instanceof SecretRoom) && !(room(cell) instanceof ShopRoom) && map[cell] != Terrain.EMPTY_SP && map[cell] != Terrain.WATER diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java index 6c78df59b..3af355a4c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java @@ -43,6 +43,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EmptyRoom; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.watabou.utils.PathFinder; import com.watabou.utils.Point; @@ -251,6 +252,11 @@ public class MagicalFireRoom extends SpecialRoom { emitter.pour( ElmoParticle.FACTORY, 0.02f ); } + @Override + public String tileDesc() { + return Messages.get(this, "desc"); + } + @Override public void onBuildFlagMaps( Level l ) { if (volume > 0){