OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-19 18:15:27 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix to attack shortcut logic

Browse Source
This commit is contained in:
guru_meditation_no42
2021-04-11 19:46:12 -07:00
parent a3c632947b
commit c24c8d1444
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
View File

@@ -112,12 +112,10 @@ public final class InputController implements OnClickListener, OnLongClickListen
case KeyEvent.KEYCODE_BUTTON_A: // lock movement until released for precise directional move/attack
case KeyEvent.KEYCODE_SPACE:
case KeyEvent.KEYCODE_NUMPAD_5:
if (!keydown && keyState_attack) { // key released - execute attack
if(!world.model.uiSelections.isInCombat) {
controllers.movementController.stopMovement();
} else if (allowInputInterval()) {
controllers.combatController.executeMoveAttack(keyState_dx, keyState_dy);
}
if (keydown && !keyState_attack) { // key pressed - pause movement
if(!world.model.uiSelections.isInCombat) controllers.movementController.stopMovement();
} else if (!keydown && keyState_attack) { // key released - execute attack / move in direction
if (allowInputInterval()) controllers.combatController.executeMoveAttack(keyState_dx, keyState_dy);
}
keyState_attack = keydown; // prevents movement event below if pressed
cancel = false; //don't cancel, allow pending movement immediately on release via code below