From 45d90689f89ee55077f05083e66de56c319e9096 Mon Sep 17 00:00:00 2001 From: Dacmot Date: Tue, 16 May 2017 22:57:32 -0400 Subject: [PATCH 1/5] Ensure turn ends at the end of combat --- .../gpl/rpg/AndorsTrail/controller/CombatController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index 0ece356f8..c57c681b2 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -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) { From fedff3eca11f292448c541731d80ca911be75bd4 Mon Sep 17 00:00:00 2001 From: Dacmot Date: Sun, 21 May 2017 16:38:14 -0400 Subject: [PATCH 2/5] Revert change in newPlayerTurn() which did not work --- .../gpl/rpg/AndorsTrail/controller/CombatController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index c57c681b2..0ece356f8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -457,14 +457,14 @@ public final class CombatController implements VisualEffectCompletedCallback { } private void newPlayerTurn(boolean isFirstRound) { - controllers.actorStatsController.setActorMaxAP(world.model.player); - if (!isFirstRound) controllers.gameRoundController.onNewPlayerRound(); - world.model.uiSelections.isPlayersCombatTurn = true; - combatTurnListeners.onNewPlayerTurn(); if (canExitCombat()) { exitCombat(true); return; } + controllers.actorStatsController.setActorMaxAP(world.model.player); + if (!isFirstRound) controllers.gameRoundController.onNewPlayerRound(); + world.model.uiSelections.isPlayersCombatTurn = true; + combatTurnListeners.onNewPlayerTurn(); } private static boolean hasCriticalAttack(Actor attacker, Actor target) { From a8a1b13d492a939ea03f1b3a3f02dd291e1fbed3 Mon Sep 17 00:00:00 2001 From: Dacmot Date: Mon, 22 May 2017 13:20:27 -0400 Subject: [PATCH 3/5] Perform end-of-round in combatExit() and remove resetRoundTimers() --- .../gpl/rpg/AndorsTrail/controller/CombatController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index 0ece356f8..9e43feb59 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -58,7 +58,7 @@ public final class CombatController implements VisualEffectCompletedCallback { combatTurnListeners.onCombatEnded(); world.model.uiSelections.selectedPosition = null; world.model.uiSelections.selectedMonster = null; - controllers.gameRoundController.resetRoundTimers(); + endOfCombatRound(); if (pickupLootBags && totalExpThisFight > 0) { controllers.itemController.lootMonsterBags(killedMonsterBags, totalExpThisFight); } else { @@ -557,6 +557,12 @@ public final class CombatController implements VisualEffectCompletedCallback { } } + public void endOfCombatRound() { + world.model.worldData.tickWorldTime(); + controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false); + controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, true); + } + public void monsterSteppedOnPlayer(Monster m) { setCombatSelection(m); enterCombat(BeginTurnAs.monsters); From 2c95d0b88d1a36d4d78c2ddee84a34eef3e82f25 Mon Sep 17 00:00:00 2001 From: Dacmot Date: Mon, 22 May 2017 22:37:14 -0400 Subject: [PATCH 4/5] Add back round counters reset and move a function call to put it with similar functions --- .../com/gpl/rpg/AndorsTrail/controller/CombatController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index 9e43feb59..ac3674114 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -55,7 +55,6 @@ public final class CombatController implements VisualEffectCompletedCallback { public void exitCombat(boolean pickupLootBags) { setCombatSelection(null, null); world.model.uiSelections.isInCombat = false; - combatTurnListeners.onCombatEnded(); world.model.uiSelections.selectedPosition = null; world.model.uiSelections.selectedMonster = null; endOfCombatRound(); @@ -558,7 +557,9 @@ public final class CombatController implements VisualEffectCompletedCallback { } public void endOfCombatRound() { + combatTurnListeners.onCombatEnded(); world.model.worldData.tickWorldTime(); + controllers.gameRoundController.resetRoundTimers(); controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false); controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, true); } From a3a043b9939c7caeaa8801b5bdddea1f1e24f3e3 Mon Sep 17 00:00:00 2001 From: dacmot Date: Tue, 25 Jul 2017 14:55:25 -0400 Subject: [PATCH 5/5] Add myself to authors --- AndorsTrail/res/values/authors.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml index 1658477e9..c3748aeee 100644 --- a/AndorsTrail/res/values/authors.xml +++ b/AndorsTrail/res/values/authors.xml @@ -19,6 +19,7 @@ Additional programming by Lucas Delvallet<br /> Additional programming by Florian Doublet<br /> Additional programming by M.H. Alkotob<br /> + Additional programming by Olivier Dragon<br /> Additional graphics by Karvis<br /> Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz<br /> Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico<br />