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

v2.0.0: adjusted time freeze, now directly triggers plants/traps

Browse Source
This commit is contained in:
Evan Debenham
2022-11-15 12:14:20 -05:00
parent 5f650681df
commit ac77531603
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
+16 -3
View File
@@ -36,6 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEnergy; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEnergy;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
@@ -357,8 +358,16 @@ public class TimekeepersHourglass extends Artifact {
} }
public void triggerPresses(){ public void triggerPresses(){
for (int cell : presses) for (int cell : presses){
Dungeon.level.pressCell(cell); Trap t = Dungeon.level.traps.get(cell);
if (t != null){
t.trigger();
}
Plant p = Dungeon.level.plants.get(cell);
if (p != null){
p.trigger();
}
}
presses = new ArrayList<>(); presses = new ArrayList<>();
} }
@@ -366,7 +375,11 @@ public class TimekeepersHourglass extends Artifact {
public void disarmPressedTraps(){ public void disarmPressedTraps(){
for (int cell : presses){ for (int cell : presses){
Trap t = Dungeon.level.traps.get(cell); Trap t = Dungeon.level.traps.get(cell);
if (t != null && t.disarmedByActivation) t.disarm(); if (t != null && t.disarmedByActivation) {
t.disarm();
}
Dungeon.level.uproot(cell);
} }
presses = new ArrayList<>(); presses = new ArrayList<>();
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java
+13 -2
View File
@@ -123,7 +123,14 @@ public class Swiftthistle extends Plant {
public void triggerPresses(){ public void triggerPresses(){
for (int cell : presses){ for (int cell : presses){
Dungeon.level.pressCell(cell); Trap t = Dungeon.level.traps.get(cell);
if (t != null){
t.trigger();
}
Plant p = Dungeon.level.plants.get(cell);
if (p != null){
p.trigger();
}
} }
presses = new ArrayList<>(); presses = new ArrayList<>();
@@ -132,7 +139,11 @@ public class Swiftthistle extends Plant {
public void disarmPressedTraps(){ public void disarmPressedTraps(){
for (int cell : presses){ for (int cell : presses){
Trap t = Dungeon.level.traps.get(cell); Trap t = Dungeon.level.traps.get(cell);
if (t != null && t.disarmedByActivation) t.disarm(); if (t != null && t.disarmedByActivation) {
t.disarm();
}
Dungeon.level.uproot(cell);
} }
presses = new ArrayList<>(); presses = new ArrayList<>();