LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.3b: Stones of flock are now also trigger before pressing cells

Browse Source
This commit is contained in:
Evan Debenham 2021-06-16 21:08:06 -04:00
parent 73ca7b5354
commit b01a79283a
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java
View File

@ -32,13 +32,16 @@ public abstract class Runestone extends Item {
stackable = true;
defaultAction = AC_THROW;
}
//runestones press the cell they're thrown to by default, but a couple stones override this
protected boolean pressesCell = true;
@Override
protected void onThrow(int cell) {
if (Dungeon.level.pit[cell] || !defaultAction.equals(AC_THROW)){
super.onThrow( cell );
} else {
Dungeon.level.pressCell( cell );
if (pressesCell) Dungeon.level.pressCell( cell );
activate(cell);
Invisibility.dispel();
}

13
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java
View File

@ -43,18 +43,9 @@ public class StoneOfDisarming extends Runestone {
{
image = ItemSpriteSheet.STONE_DISARM;
}
@Override
protected void onThrow(int cell) {
//This runestone uniquely presses cells after its effect resolves, instead of before
if (Dungeon.level.pit[cell] || !defaultAction.equals(AC_THROW)){
super.onThrow( cell );
} else {
activate(cell);
Invisibility.dispel();
Dungeon.level.pressCell( cell );
}
//so traps do not activate before the effect
pressesCell = false;
}
@Override

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java
View File

@ -37,6 +37,9 @@ public class StoneOfFlock extends Runestone {
{
image = ItemSpriteSheet.STONE_FLOCK;
//the sheep will press the cell instead
pressesCell = false;
}
@Override