v1.2.2 fixed a few bugs and real final commit aaaaah

This commit is contained in:
Evan Debenham
2022-04-07 21:38:29 -04:00
parent f0ecc2a94e
commit 5f4b2560d4
4 changed files with 9 additions and 3 deletions
@@ -104,7 +104,7 @@ public class InputHandler extends InputAdapter {
public synchronized boolean touchUp(int screenX, int screenY, int pointer, int button) { public synchronized boolean touchUp(int screenX, int screenY, int pointer, int button) {
if (button >= 3 && KeyBindings.isKeyBound( button + 1000 )) { 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) { } else if (button < 3) {
PointerEvent.addPointerEvent(new PointerEvent(screenX, screenY, pointer, PointerEvent.Type.UP, button)); PointerEvent.addPointerEvent(new PointerEvent(screenX, screenY, pointer, PointerEvent.Type.UP, button));
} }
+1 -1
View File
@@ -14,7 +14,7 @@ allprojects {
appName = 'Shattered Pixel Dungeon' appName = 'Shattered Pixel Dungeon'
appPackageName = 'com.shatteredpixel.shatteredpixeldungeon' appPackageName = 'com.shatteredpixel.shatteredpixeldungeon'
appVersionCode = 622 appVersionCode = 626
appVersionName = '1.2.2' appVersionName = '1.2.2'
appJavaCompatibility = JavaVersion.VERSION_1_8 appJavaCompatibility = JavaVersion.VERSION_1_8
@@ -428,7 +428,7 @@ public abstract class RegularLevel extends Level {
boolean valid; boolean valid;
do { do {
cell = randomDropCell(SpecialRoom.class); cell = randomDropCell(SpecialRoom.class);
valid = !(room(cell) instanceof SecretRoom) valid = cell != -1 && !(room(cell) instanceof SecretRoom)
&& !(room(cell) instanceof ShopRoom) && !(room(cell) instanceof ShopRoom)
&& map[cell] != Terrain.EMPTY_SP && map[cell] != Terrain.EMPTY_SP
&& map[cell] != Terrain.WATER && map[cell] != Terrain.WATER
@@ -43,6 +43,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EmptyRoom; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EmptyRoom;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.watabou.utils.PathFinder; import com.watabou.utils.PathFinder;
import com.watabou.utils.Point; import com.watabou.utils.Point;
@@ -251,6 +252,11 @@ public class MagicalFireRoom extends SpecialRoom {
emitter.pour( ElmoParticle.FACTORY, 0.02f ); emitter.pour( ElmoParticle.FACTORY, 0.02f );
} }
@Override
public String tileDesc() {
return Messages.get(this, "desc");
}
@Override @Override
public void onBuildFlagMaps( Level l ) { public void onBuildFlagMaps( Level l ) {
if (volume > 0){ if (volume > 0){