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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPD-classes/src/main/java/com/watabou/input/InputHandler.java
View File

@ -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));
}

2
build.gradle
View File

@ -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

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
View File

@ -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

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java
View File

@ -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){