v0.6.2: adjusted secret chest and trap rooms

This commit is contained in:
Evan Debenham
2017-10-23 02:08:02 -04:00
parent 0cdc6f27df
commit 9520c9a402
2 changed files with 18 additions and 11 deletions
@@ -33,16 +33,28 @@ import com.watabou.utils.Point;
public class SecretChestChasmRoom extends SecretRoom { public class SecretChestChasmRoom extends SecretRoom {
//width and height are controlled here so that this room always requires 2 levitation potions
@Override @Override
public int minWidth() { public int minWidth() {
return 8; return 8;
} }
@Override
public int maxWidth() {
return 9;
}
@Override @Override
public int minHeight() { public int minHeight() {
return 8; return 8;
} }
@Override
public int maxHeight() {
return 9;
}
@Override @Override
public void paint(Level level) { public void paint(Level level) {
super.paint(level); super.paint(level);
@@ -69,23 +81,19 @@ public class SecretChestChasmRoom extends SecretRoom {
p = new Point(left+3, top+3); p = new Point(left+3, top+3);
Painter.set(level, p, Terrain.EMPTY_SP); Painter.set(level, p, Terrain.EMPTY_SP);
level.drop(Generator.random(Generator.Category.SCROLL), level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
p.x = right-3; p.x = right-3;
Painter.set(level, p, Terrain.EMPTY_SP); Painter.set(level, p, Terrain.EMPTY_SP);
level.drop(Generator.random(Generator.Category.POTION), level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
p.y = bottom-3; p.y = bottom-3;
Painter.set(level, p, Terrain.EMPTY_SP); Painter.set(level, p, Terrain.EMPTY_SP);
level.drop(Generator.random(Generator.Category.SCROLL), level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
p.x = left+3; p.x = left+3;
Painter.set(level, p, Terrain.EMPTY_SP); Painter.set(level, p, Terrain.EMPTY_SP);
level.drop(Generator.random(Generator.Category.POTION), level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
level.addItemToSpawn(new PotionOfLevitation()); level.addItemToSpawn(new PotionOfLevitation());
@@ -38,7 +38,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.FlockTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrimTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrimTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrippingTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrippingTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.PoisonDartTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.PoisonDartTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.SummoningTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.TeleportationTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.TeleportationTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.WarpingTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.WarpingTrap;
@@ -52,9 +51,9 @@ public class TrapsRoom extends SpecialRoom {
Painter.fill( level, this, Terrain.WALL ); Painter.fill( level, this, Terrain.WALL );
Class<? extends Trap> trapClass; Class<? extends Trap> trapClass;
switch (Random.Int(5)){ switch (Random.Int(4)){
case 0: case 0:
trapClass = !Dungeon.bossLevel(Dungeon.depth + 1)? null : SummoningTrap.class; trapClass = null;
break; break;
default: default:
trapClass = Random.oneOf(levelTraps[Dungeon.depth/5]); trapClass = Random.oneOf(levelTraps[Dungeon.depth/5]);