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

v0.9.1: fixed a bug with sewer pipe rooms and let them merge together

Browse Source
This commit is contained in:
Evan Debenham 2020-10-23 22:30:29 -04:00
parent fafb887d3b
commit 81156427bb
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RegularPainter.java
View File

@ -214,6 +214,9 @@ public abstract class RegularPainter extends Painter {
case TUNNEL:
l.map[door] = l.tunnelTile();
break;
case WATER:
l.map[door] = Terrain.WATER;
break;
case UNLOCKED:
l.map[door] = Terrain.DOOR;
break;

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

@ -387,7 +387,7 @@ public abstract class Room extends Rect implements Graph.Node, Bundlable {
public static class Door extends Point implements Bundlable {
public enum Type {
EMPTY, TUNNEL, REGULAR, UNLOCKED, HIDDEN, BARRICADE, LOCKED
EMPTY, TUNNEL, WATER, REGULAR, UNLOCKED, HIDDEN, BARRICADE, LOCKED
}
public Type type = Type.EMPTY;

42
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/SewerPipeRoom.java
View File

@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
import com.watabou.utils.GameMath;
import com.watabou.utils.PathFinder;
import com.watabou.utils.Point;
@ -157,8 +158,19 @@ public class SewerPipeRoom extends StandardRoom {
}
}
for (Door door : connected.values()) {
door.set( Door.Type.REGULAR );
for (Room r : connected.keySet()) {
if (r instanceof SewerPipeRoom){
Point door = connected.get(r);
Painter.fill(level, door.x-1, door.y-1, 3, 3, Terrain.EMPTY);
if (door.x == left || door.x == right){
Painter.fill(level, door.x-1, door.y, 3, 1, Terrain.WATER);
} else {
Painter.fill(level, door.x, door.y-1, 1, 3, Terrain.WATER);
}
connected.get(r).set( Door.Type.WATER );
} else {
connected.get(r).set( Door.Type.REGULAR );
}
}
}
@ -192,18 +204,19 @@ public class SewerPipeRoom extends StandardRoom {
return c;
}
private int spaceBetween(int a, int b){
return Math.abs(a - b)-1;
}
//gets the path distance between two points
private int distanceBetweenPoints(Point a, Point b){
//on the same side
if (a.y == b.y || a.x == b.x){
if (((a.x == left || a.x == right) && a.y == b.y)
|| ((a.y == top || a.y == bottom) && a.x == b.x)){
return Math.max(spaceBetween(a.x, b.x), spaceBetween(a.y, b.y));
}
//otherwise...
//subtract 1 at the end to account for overlap
return
@ -215,14 +228,15 @@ public class SewerPipeRoom extends StandardRoom {
-
1;
}
private Point[] corners;
//picks the smallest path to fill between two points
private void fillBetweenPoints(Level level, Point from, Point to, int floor){
//doors are along the same side
if (from.y == to.y || from.x == to.x){
if (((from.x == left+1 || from.x == right-1) && from.x == to.x)
|| ((from.y == top+1 || from.y == bottom-1) && from.y == to.y)){
Painter.fill(level,
Math.min(from.x, to.x),
Math.min(from.y, to.y),
@ -231,7 +245,7 @@ public class SewerPipeRoom extends StandardRoom {
floor);
return;
}
//set up corners
if (corners == null){
corners = new Point[4];
@ -240,7 +254,7 @@ public class SewerPipeRoom extends StandardRoom {
corners[2] = new Point(right-2, bottom-2);
corners[3] = new Point(left+2, bottom-2);
}
//doors on adjacent sides
for (Point c : corners){
if ((c.x == from.x || c.y == from.y) && (c.x == to.x || c.y == to.y)){
@ -249,7 +263,7 @@ public class SewerPipeRoom extends StandardRoom {
return;
}
}
//doors on opposite sides
Point side;
if (from.y == top+2 || from.y == bottom-2){
@ -260,7 +274,7 @@ public class SewerPipeRoom extends StandardRoom {
} else {
side = new Point(right-2, top + height()/2);
}
} else {
//connect along the top, or bottom side
if (spaceBetween(top, from.y) + spaceBetween(top, to.y) <=