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

v1.2.0: added several checks to prevent simultaneous hero actions

Browse Source
This commit is contained in:
Evan Debenham 2022-02-22 14:53:28 -05:00
parent 9225ce1854
commit 7c596ccab7
6 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
View File

@ -368,7 +368,7 @@ public class CellSelector extends ScrollArea {
private int lastCellMoved = 0; private int lastCellMoved = 0;
private boolean moveFromActions(GameAction... actions){ private boolean moveFromActions(GameAction... actions){
if (Dungeon.hero == null){ if (Dungeon.hero == null || !Dungeon.hero.ready){
return false; return false;
} }

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java
View File

@ -98,9 +98,10 @@ public class ActionIndicator extends Tag {
@Override @Override
protected void onClick() { protected void onClick() {
if (action != null && Dungeon.hero.ready) if (action != null && Dungeon.hero.ready) {
action.doAction(); action.doAction();
} }
}
@Override @Override
protected String hoverText() { protected String hoverText() {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
View File

@ -175,7 +175,7 @@ public class AttackIndicator extends Tag {
@Override @Override
protected void onClick() { protected void onClick() {
if (enabled) { if (enabled && Dungeon.hero.ready) {
if (Dungeon.hero.handle( lastTarget.pos )) { if (Dungeon.hero.handle( lastTarget.pos )) {
Dungeon.hero.next(); Dungeon.hero.next();
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java
View File

@ -49,7 +49,7 @@ public class LootIndicator extends Tag {
slot = new ItemSlot() { slot = new ItemSlot() {
protected void onClick() { protected void onClick() {
if (Dungeon.hero.handle(Dungeon.hero.pos)){ if (Dungeon.hero.ready && Dungeon.hero.handle(Dungeon.hero.pos)){
Dungeon.hero.next(); Dungeon.hero.next();
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java
View File

@ -67,8 +67,10 @@ public class ResumeIndicator extends Tag {
@Override @Override
protected void onClick() { protected void onClick() {
if (Dungeon.hero.ready) {
Dungeon.hero.resume(); Dungeon.hero.resume();
} }
}
@Override @Override
protected String hoverText() { protected String hoverText() {

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
View File

@ -92,7 +92,7 @@ public class Toolbar extends Component {
add(btnWait = new Tool(24, 0, 20, 26) { add(btnWait = new Tool(24, 0, 20, 26) {
@Override @Override
protected void onClick() { protected void onClick() {
if (!GameScene.cancel()) { if (Dungeon.hero.ready && !GameScene.cancel()) {
examining = false; examining = false;
Dungeon.hero.rest(false); Dungeon.hero.rest(false);
} }
@ -109,7 +109,7 @@ public class Toolbar extends Component {
} }
protected boolean onLongClick() { protected boolean onLongClick() {
if (!GameScene.cancel()) { if (Dungeon.hero.ready && !GameScene.cancel()) {
examining = false; examining = false;
Dungeon.hero.rest(true); Dungeon.hero.rest(true);
} }
@ -120,9 +120,11 @@ public class Toolbar extends Component {
add(new Button(){ add(new Button(){
@Override @Override
protected void onClick() { protected void onClick() {
if (Dungeon.hero.ready) {
examining = false; examining = false;
Dungeon.hero.rest(true); Dungeon.hero.rest(true);
} }
}
@Override @Override
public GameAction keyAction() { public GameAction keyAction() {
@ -134,6 +136,7 @@ public class Toolbar extends Component {
add(btnSearch = new Tool(44, 0, 20, 26) { add(btnSearch = new Tool(44, 0, 20, 26) {
@Override @Override
protected void onClick() { protected void onClick() {
if (Dungeon.hero.ready) {
if (!examining) { if (!examining) {
GameScene.selectCell(informer); GameScene.selectCell(informer);
examining = true; examining = true;
@ -142,6 +145,7 @@ public class Toolbar extends Component {
Dungeon.hero.search(true); Dungeon.hero.search(true);
} }
} }
}
@Override @Override
public GameAction keyAction() { public GameAction keyAction() {
@ -167,12 +171,14 @@ public class Toolbar extends Component {
@Override @Override
protected void onClick() { protected void onClick() {
if (SPDSettings.interfaceSize() == 2){ if (Dungeon.hero.ready || !Dungeon.hero.isAlive()) {
if (SPDSettings.interfaceSize() == 2) {
GameScene.toggleInvPane(); GameScene.toggleInvPane();
} else { } else {
GameScene.show(new WndBag(Dungeon.hero.belongings.backpack)); GameScene.show(new WndBag(Dungeon.hero.belongings.backpack));
} }
} }
}
@Override @Override
public GameAction keyAction() { public GameAction keyAction() {