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

v3.3.5: added two more rooms for tester vault enemies to appear in

Browse Source 
v3.3.5: fixed an exploit where quitting would cancel fury partway
This commit is contained in:
Evan Debenham
2026-02-04 17:39:12 -05:00
parent 73ce3a9dab
commit cd7ed99ac0
5 changed files with 161 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SPD-classes/src/main/java/com/watabou/utils/Random.java
+11
View File
@@ -257,6 +257,17 @@ public class Random {
Collections.shuffle(list, generators.peek());
}
public static void shuffle( int[] array ) {
for (int i=0; i < array.length - 1; i++) {
int j = Int( i, array.length );
if (j != i) {
int t = array[i];
array[i] = array[j];
array[j] = t;
}
}
}
public static<T> void shuffle( T[] array ) {
for (int i=0; i < array.length - 1; i++) {
int j = Int( i, array.length );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/VaultLevel.java
+7 -1
View File
@@ -37,11 +37,14 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.features.LevelTransition;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultCircleRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultCrossRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultEnemyCenterRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultEntranceRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultFinalRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultLongRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultQuadrantsRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultRingRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultRingsRoom;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault.VaultSimpleEnemyTreasureRoom;
import com.watabou.utils.Random;
import java.util.ArrayList;
@@ -54,11 +57,14 @@ public class VaultLevel extends CityLevel {
initRooms.add(roomEntrance = new VaultEntranceRoom());
for (int i = 0; i < 4; i++){
for (int i = 0; i < 2; i++){
initRooms.add(new VaultRingRoom());
initRooms.add(new VaultCircleRoom());
initRooms.add(new VaultCrossRoom());
initRooms.add(new VaultQuadrantsRoom());
initRooms.add(new VaultEnemyCenterRoom());
initRooms.add(new VaultRingsRoom());
initRooms.add(new VaultSimpleEnemyTreasureRoom());
}
initRooms.add(new VaultLongRoom());
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/vault/VaultRingsRoom.java
+60
View File
@@ -0,0 +1,60 @@
package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.VaultRat;
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.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.StandardRoom;
import com.watabou.utils.Point;
import com.watabou.utils.Random;
public class VaultRingsRoom extends StandardRoom {
@Override
public float[] sizeCatProbs() {
return new float[]{0, 1, 0};
}
@Override
public void paint(Level level) {
Painter.fill( level, this, Terrain.WALL );
Painter.fill( level, this, 1 , Terrain.EMPTY );
Painter.fill(level, left+2, top+2, 3, 3, Terrain.WALL);
Painter.fill(level, right-4, top+2, 3, 3, Terrain.WALL);
Painter.fill(level, left+2, bottom-4, 3, 3, Terrain.WALL);
Painter.fill(level, right-4, bottom-4, 3, 3, Terrain.WALL);
for (Door door : connected.values()) {
door.set( Door.Type.REGULAR );
}
VaultRat rat = new VaultRat();
do {
rat.pos = level.pointToCell(random(1));
} while (level.solid[rat.pos]);
rat.state = rat.WANDERING;
level.mobs.add(rat);
rat.wanderPositions = new int[]{
level.pointToCell(new Point(left+1, top+1)),
level.pointToCell(new Point(left+1, top+5)),
level.pointToCell(new Point(left+1, top+9)),
level.pointToCell(new Point(left+5, top+1)),
level.pointToCell(new Point(left+5, top+5)),
level.pointToCell(new Point(left+5, top+9)),
level.pointToCell(new Point(left+9, top+1)),
level.pointToCell(new Point(left+9, top+5)),
level.pointToCell(new Point(left+9, top+9))
};
Random.shuffle(rat.wanderPositions);
}
@Override
public boolean canMerge(Level l, Room other, Point p, int mergeTerrain) {
return false;
}
}
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/vault/VaultSimpleEnemyTreasureRoom.java
+81
View File
@@ -0,0 +1,81 @@
package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.quest.vault;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.VaultRat;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
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.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.StandardRoom;
import com.watabou.utils.Point;
import com.watabou.utils.Random;
public class VaultSimpleEnemyTreasureRoom extends StandardRoom {
@Override
public float[] sizeCatProbs() {
return new float[]{0, 1, 0};
}
@Override
public void paint(Level level) {
Painter.fill( level, this, Terrain.WALL );
Painter.fill( level, this, 1 , Terrain.EMPTY );
int ratPos = 0;
int treasurePos = 0;
switch (Random.Int(4)){
case 0:
Painter.fill(level, left+2, top+2, 6, 6, Terrain.WALL );
Painter.fill(level, left+3, top+3, 4, 4, Terrain.EMPTY_SP );
Painter.fill(level, left+4, top+7, 2, 1, Terrain.EMPTY_SP );
Painter.fill(level, left+7, top+4, 1, 2, Terrain.EMPTY_SP );
ratPos = level.pointToCell(new Point(left+4, top+4));
treasurePos = level.pointToCell(new Point(left+3, top+3));
break;
case 1:
Painter.fill(level, left+3, top+2, 6, 6, Terrain.WALL );
Painter.fill(level, left+4, top+3, 4, 4, Terrain.EMPTY_SP );
Painter.fill(level, left+5, top+7, 2, 1, Terrain.EMPTY_SP );
Painter.fill(level, left+3, top+4, 1, 2, Terrain.EMPTY_SP );
ratPos = level.pointToCell(new Point(right-4, top+4));
treasurePos = level.pointToCell(new Point(right-3, top+3));
break;
case 2:
Painter.fill(level, left+3, top+3, 6, 6, Terrain.WALL );
Painter.fill(level, left+4, top+4, 4, 4, Terrain.EMPTY_SP );
Painter.fill(level, left+5, top+3, 2, 1, Terrain.EMPTY_SP );
Painter.fill(level, left+3, top+5, 1, 2, Terrain.EMPTY_SP );
ratPos = level.pointToCell(new Point(right-4, bottom-4));
treasurePos = level.pointToCell(new Point(right-3, bottom-3));
break;
case 3:
Painter.fill(level, left+2, top+3, 6, 6, Terrain.WALL );
Painter.fill(level, left+3, top+4, 4, 4, Terrain.EMPTY_SP );
Painter.fill(level, left+4, top+3, 2, 1, Terrain.EMPTY_SP );
Painter.fill(level, left+7, top+5, 1, 2, Terrain.EMPTY_SP );
ratPos = level.pointToCell(new Point(left+4, bottom-4));
treasurePos = level.pointToCell(new Point(left+3, bottom-3));
break;
}
level.drop(Generator.randomWeapon(true), treasurePos).type = Heap.Type.CHEST;
for (Door door : connected.values()) {
door.set( Door.Type.REGULAR );
}
VaultRat rat = new VaultRat();
rat.pos = ratPos;
level.mobs.add(rat);
}
@Override
public boolean canMerge(Level l, Room other, Point p, int mergeTerrain) {
return false;
}
}