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

Do not wait for combat turns when monsters want to move, but cannot find a path.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-06-12 01:25:11 +02:00
parent bc52d9b7af
commit 048ea6b356
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,10 +359,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
private void moveCurrentMonster() {
controllers.actorStatsController.useAPs(currentActiveMonster, currentActiveMonster.getMoveCost());
if (controllers.monsterMovementController.findPathFor(currentActiveMonster, world.model.player.position)) {
controllers.monsterMovementController.moveMonsterToNextPosition(currentActiveMonster, world.model.currentMap);
combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
if (!controllers.monsterMovementController.findPathFor(currentActiveMonster, world.model.player.position)) {
// Couldn't find a path to move on.
handleNextMonsterAction();
return;
}
controllers.monsterMovementController.moveMonsterToNextPosition(currentActiveMonster, world.model.currentMap);
combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
waitForNextMonsterAction();
}