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

Ensure turn ends at the end of combat

Browse Source
This commit is contained in:
Dacmot
2017-05-16 22:57:32 -04:00
parent bda232cbc1
commit 45d90689f8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -457,14 +457,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
private void newPlayerTurn(boolean isFirstRound) {
if (canExitCombat()) {
exitCombat(true);
return;
}
controllers.actorStatsController.setActorMaxAP(world.model.player);
if (!isFirstRound) controllers.gameRoundController.onNewPlayerRound();
world.model.uiSelections.isPlayersCombatTurn = true;
combatTurnListeners.onNewPlayerTurn();
if (canExitCombat()) {
exitCombat(true);
return;
}
}
private static boolean hasCriticalAttack(Actor attacker, Actor target) {