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

v2.5.0: fixed sealed level resetting not clearing bomb fuses

Browse Source
This commit is contained in:
Evan Debenham
2024-06-30 14:38:31 -04:00
parent 6a6e049f4f
commit 651cc8631a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
+9 -1
View File
@@ -64,6 +64,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Stylus;
import com.shatteredpixel.shatteredpixeldungeon.items.Torch; import com.shatteredpixel.shatteredpixeldungeon.items.Torch;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TalismanOfForesight; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TalismanOfForesight;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourglass; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourglass;
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfEnchantment; import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfEnchantment;
@@ -613,7 +614,14 @@ public abstract class Level implements Bundlable {
public ArrayList<Item> getItemsToPreserveFromSealedResurrect(){ public ArrayList<Item> getItemsToPreserveFromSealedResurrect(){
ArrayList<Item> items = new ArrayList<>(); ArrayList<Item> items = new ArrayList<>();
for (Heap h : heaps.valueList()){ for (Heap h : heaps.valueList()){
if (h.type == Heap.Type.HEAP) items.addAll(h.items); if (h.type == Heap.Type.HEAP) {
for (Item i : h.items){
if (i instanceof Bomb){
((Bomb) i).fuse = null;
}
items.add(i);
}
}
} }
for (Mob m : mobs){ for (Mob m : mobs){
for (PinCushion b : m.buffs(PinCushion.class)){ for (PinCushion b : m.buffs(PinCushion.class)){