From 8049f8445077ae0f040eea59c58e52026b28c5ad Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 30 Apr 2017 20:10:37 -0400 Subject: [PATCH] v0.6.0: implemented two chasm style connection rooms --- .../levels/rooms/connection/BridgeRoom.java | 53 +++++++++++++++++++ .../levels/rooms/connection/WalkwayRoom.java | 53 +++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/BridgeRoom.java create mode 100644 core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/WalkwayRoom.java diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/BridgeRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/BridgeRoom.java new file mode 100644 index 000000000..ccaf81792 --- /dev/null +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/BridgeRoom.java @@ -0,0 +1,53 @@ +/* + * Pixel Dungeon + * Copyright (C) 2012-2015 Oleg Dolya + * + * Shattered Pixel Dungeon + * Copyright (C) 2014-2017 Evan Debenham + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see + */ + +package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.connection; + +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.Rect; + +public class BridgeRoom extends TunnelRoom { + + @Override + public void paint(Level level) { + + Painter.fill(level, this, 1, Terrain.CHASM); + + super.paint(level); + + for (Room r : neigbours){ + if (r instanceof BridgeRoom || r instanceof WalkwayRoom){ + Rect i = intersect(r); + if (i.width() != 0){ + i.left++; + i.right--; + } else { + i.top++; + i.bottom--; + } + Painter.fill(level, i.left, i.top, i.width()+1, i.height()+1, Terrain.CHASM); + } + } + } +} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/WalkwayRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/WalkwayRoom.java new file mode 100644 index 000000000..b596bb7bd --- /dev/null +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/WalkwayRoom.java @@ -0,0 +1,53 @@ +/* + * Pixel Dungeon + * Copyright (C) 2012-2015 Oleg Dolya + * + * Shattered Pixel Dungeon + * Copyright (C) 2014-2017 Evan Debenham + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see + */ + +package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.connection; + +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.Rect; + +public class WalkwayRoom extends PerimeterRoom { + + @Override + public void paint(Level level) { + + Painter.fill(level, this, 1, Terrain.CHASM); + + super.paint(level); + + for (Room r : neigbours){ + if (r instanceof BridgeRoom || r instanceof WalkwayRoom){ + Rect i = intersect(r); + if (i.width() != 0){ + i.left++; + i.right--; + } else { + i.top++; + i.bottom--; + } + Painter.fill(level, i.left, i.top, i.width()+1, i.height()+1, Terrain.CHASM); + } + } + } +}