From c533126c9f5a352ee95b0a41c0406125e03bee25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 10 Dec 2015 09:56:24 +0100 Subject: Ctrl: fix action burn down, end of turn --- core/src/ch/asynk/rustanddust/game/Ctrl.java | 12 ++++++------ 1 file 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; -- cgit v1.1-2-g2b99