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

Bugfix: Update "attack" button to "move" when fleeing.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-07-16 23:13:50 +02:00
parent 3f9cf63463
commit b13caa40b0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
View File

@@ -143,22 +143,23 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
updateMonsterHealth(selectedMonster);
currentMonster = selectedMonster;
}
updateAttackMoveButtonText(selectedMonster != null);
}
private void updateAttackMoveButtonText() {
if (world.model.uiSelections.selectedMonster != null) {
updateAttackMoveButtonText(world.model.uiSelections.selectedMonster != null);
}
private void updateAttackMoveButtonText(boolean hasSelectedMonster) {
if (hasSelectedMonster) {
attackMoveButton.setText(res.getString(R.string.combat_attack, player.getAttackCost()));
} else if (world.model.uiSelections.selectedPosition != null) {
attackMoveButton.setText(res.getString(R.string.combat_move, player.getMoveCost()));
} else {
attackMoveButton.setText(res.getString(R.string.combat_attack, player.getAttackCost()));
attackMoveButton.setText(res.getString(R.string.combat_move, player.getMoveCost()));
}
}
public void updateStatus() {
updatePlayerAP();
updateSelectedMonster(world.model.uiSelections.selectedMonster);
updateAttackMoveButtonText();
}
private void show() {