From a8bc6e74ff756e693376861c2b653543ad34c625 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 20 Oct 2020 22:01:49 -0400 Subject: [PATCH] v0.9.1: added a new circular basin room to the sewers --- .../rooms/standard/CircleBasinRoom.java | 102 ++++++++++++++++++ .../levels/rooms/standard/StandardRoom.java | 21 ++-- 2 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CircleBasinRoom.java diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CircleBasinRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CircleBasinRoom.java new file mode 100644 index 000000000..8aa5362c6 --- /dev/null +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CircleBasinRoom.java @@ -0,0 +1,102 @@ +/* + * Pixel Dungeon + * Copyright (C) 2012-2015 Oleg Dolya + * + * Shattered Pixel Dungeon + * Copyright (C) 2014-2020 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.standard; + +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; +import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; +import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; +import com.watabou.utils.Point; +import com.watabou.utils.Rect; + +public class CircleBasinRoom extends PatchRoom { + + { + joinable = false; + } + + @Override + public int minWidth() { return sizeCat.minDim+1; } + public int minHeight() { + return sizeCat.minDim+1; + } + + @Override + public float[] sizeCatProbs() { + return new float[]{0, 3, 1}; + } + + //cannot roll even numbers + @Override + public Rect resize(int w, int h) { + super.resize(w, h); + if (width() % 2 == 0) right--; + if (height() % 2 == 0) bottom--; + return this; + } + + @Override + public void paint(Level level) { + Painter.fill( level, this, Terrain.WALL ); + + Painter.fillEllipse( level, this, 1 , Terrain.EMPTY ); + + for (Door door : connected.values()) { + door.set( Door.Type.REGULAR ); + if (door.x == left || door.x == right){ + Painter.drawInside(level, this, door, width()/2, Terrain.EMPTY); + } else { + Painter.drawInside(level, this, door, height()/2, Terrain.EMPTY); + } + } + + Painter.fillEllipse( level, this, 3 , Terrain.CHASM ); + + Point start = new Point(left + width()/2, top + 3); + Point end = new Point(left + width()/2, bottom - 3); + Painter.drawLine(level, start, end, Terrain.EMPTY_SP); + + start.set(left+3, top + height()/2); + end.set(right-3, top + height()/2); + Painter.drawLine(level, start, end, Terrain.EMPTY_SP); + + if (width() > 11 || height() > 11){ + Point center = center(); + Painter.fill( level, center.x-1, center.y-1, 3, 3, Terrain.EMPTY_SP ); + Painter.set( level, center, Terrain.WALL ); + } + + setupPatch(level, 0.5f, 5, true); + for (int i = top + 1; i < bottom; i++) { + for (int j = left + 1; j < right; j++) { + int cell = i * level.width() + j; + if (level.map[cell] == Terrain.EMPTY && patch[xyToPatchCoords(j, i)]) { + level.map[cell] = Terrain.WATER; + if (level.map[cell-level.width()] == Terrain.WALL){ + level.map[cell-level.width()] = Terrain.WALL_DECO; + } + } + } + } + + } + +} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java index afe5db66f..afb060a83 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java @@ -110,6 +110,7 @@ public abstract class StandardRoom extends Room { rooms.add(SewerPipeRoom.class); rooms.add(RingRoom.class); + rooms.add(CircleBasinRoom.class); rooms.add(SegmentedRoom.class); rooms.add(StatuesRoom.class); @@ -138,21 +139,21 @@ public abstract class StandardRoom extends Room { private static float[][] chances = new float[27][]; static { - chances[1] = new float[]{20, 15,5, 0,0, 0,0, 0,0, 0,0, 1,0,1,0,1,0,1,1,0,0}; - chances[2] = new float[]{20, 15,5, 0,0, 0,0, 0,0, 0,0, 1,1,1,1,1,1,1,1,1,1}; + chances[1] = new float[]{15, 10,10,5, 0,0, 0,0, 0,0, 0,0, 1,0,1,0,1,0,1,1,0,0}; + chances[2] = new float[]{15, 10,10,5, 0,0, 0,0, 0,0, 0,0, 1,1,1,1,1,1,1,1,1,1}; chances[4] = chances[3] = chances[2]; - chances[5] = new float[]{20, 15,5, 0,0, 0,0, 0,0, 0,0, 0,0,0,0,0,0,0,0,0,0}; - - chances[6] = new float[]{20, 0,0, 15,5, 0,0, 0,0, 0,0, 1,1,1,1,1,1,1,1,1,1}; + chances[5] = new float[]{15, 10,10,0, 0,0, 0,0, 0,0, 0,0, 0,0,0,0,0,0,0,0,0,0}; + + chances[6] = new float[]{20, 0,0,0, 15,5, 0,0, 0,0, 0,0, 1,1,1,1,1,1,1,1,1,1}; chances[10] = chances[9] = chances[8] = chances[7] = chances[6]; - - chances[11] = new float[]{20, 0,0, 0,0, 15,5, 0,0, 0,0, 1,1,1,1,1,1,1,1,1,1}; + + chances[11] = new float[]{20, 0,0,0, 0,0, 15,5, 0,0, 0,0, 1,1,1,1,1,1,1,1,1,1}; chances[15] = chances[14] = chances[13] = chances[12] = chances[11]; - chances[16] = new float[]{20, 0,0, 0,0, 0,0, 15,5, 0,0, 1,1,1,1,1,1,1,1,1,1}; + chances[16] = new float[]{20, 0,0,0, 0,0, 0,0, 15,5, 0,0, 1,1,1,1,1,1,1,1,1,1}; chances[20] = chances[19] = chances[18] = chances[17] = chances[16]; - - chances[21] = new float[]{20, 0,0, 0,0, 0,0, 0,0, 15,5, 1,1,1,1,1,1,1,1,1,1}; + + chances[21] = new float[]{20, 0,0,0, 0,0, 0,0, 0,0, 15,5, 1,1,1,1,1,1,1,1,1,1}; chances[26] = chances[25] = chances[24] = chances[23] = chances[22] = chances[21]; }