OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-22 03:19:12 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Perform end-of-round in combatExit() and remove resetRoundTimers()

Browse Source
This commit is contained in:
Dacmot
2017-05-22 13:20:27 -04:00
parent fedff3eca1
commit a8a1b13d49
1 changed files with 7 additions and 1 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

@@ -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);