konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.4.0: fixed code errors and a naming error in new bridge rooms

Browse Source
This commit is contained in:
Evan Debenham
2024-04-24 12:23:33 -04:00
parent fe7a58f675
commit 3542191354
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ChasmBridgeRoom.java
View File

@@ -23,7 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
public class ChasmBridgeRoom extends BridgeRoom{ public class ChasmBridgeRoom extends StandardBridgeRoom {
protected int maxBridgeWidth( int roomDimension ) { protected int maxBridgeWidth( int roomDimension ) {
return roomDimension >= 7 ? 2 : 1; return roomDimension >= 7 ? 2 : 1;

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BridgeRoom.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java
View File

@@ -33,7 +33,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
public abstract class BridgeRoom extends StandardRoom { public abstract class StandardBridgeRoom extends StandardRoom {
@Override @Override
public int minWidth() { public int minWidth() {
@@ -53,12 +53,12 @@ public abstract class BridgeRoom extends StandardRoom {
@Override @Override
public boolean canPlaceItem(Point p, Level l) { public boolean canPlaceItem(Point p, Level l) {
return super.canPlaceItem(p, l) && !spaceRect.inside(p); return super.canPlaceItem(p, l) && (spaceRect == null || !spaceRect.inside(p));
} }
@Override @Override
public boolean canPlaceCharacter(Point p, Level l) { public boolean canPlaceCharacter(Point p, Level l) {
return super.canPlaceItem(p, l) && !spaceRect.inside(p); return super.canPlaceItem(p, l) && (spaceRect == null || !spaceRect.inside(p));
} }
//keep these so that subclasses can use them in their methods //keep these so that subclasses can use them in their methods

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/WaterBridgeRoom.java
View File

@@ -24,7 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.watabou.utils.Point; import com.watabou.utils.Point;
public class WaterBridgeRoom extends BridgeRoom { public class WaterBridgeRoom extends StandardBridgeRoom {
protected int maxBridgeWidth( int roomDimension ) { protected int maxBridgeWidth( int roomDimension ) {
return roomDimension >= 8 ? 3 : 2; return roomDimension >= 8 ? 3 : 2;