diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-10 09:56:24 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-10 09:56:24 +0100 |
commit | c533126c9f5a352ee95b0a41c0406125e03bee25 (patch) | |
tree | af3f290fdb0971cb983891117125b317adbd19df | |
parent | e6121e92ea6f0aa8b1e1643c94c30a8f6d67131c (diff) | |
download | RustAndDust-c533126c9f5a352ee95b0a41c0406125e03bee25.zip RustAndDust-c533126c9f5a352ee95b0a41c0406125e03bee25.tar.gz |
Ctrl: fix action burn down, end of turn
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index 9fcfe08..a92b91d 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -259,15 +259,15 @@ public class Ctrl implements Disposable StateType nextState = this.state.execute(); if (nextState == StateType.DONE) { + if (battle.actionDone()) { + hud.notify("1 Action Point burnt"); + hud.update(); + } if (battle.getPlayer().apExhausted()) { - hud.notify("No more Action Points", 1f, Position.MIDDLE_CENTER, false); + hud.notify("No more Action Points"); nextState = StateType.TURN_OVER; - } - else if (battle.actionDone()) { - hud.notify("1 Action Point burnt", 0.6f, Position.BOTTOM_CENTER, false); - hud.update(); + } else nextState = battle.getState(); - } } return nextState; |