diff --git a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json index cd60ec70b..13dbeccbd 100644 --- a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json +++ b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json @@ -53,6 +53,7 @@ "replies":[ { "nextPhraseID":"sign_lodar_shortcut_5a", + "text":"N", "requires":[ { "negate":true, @@ -68,7 +69,7 @@ ] }, { - "message":"There is no way to go further. Maybe this has something to do this the stones?", + "message":"There is no way to go further. Maybe this has something to do with the stones?", "id":"sign_lodar_shortcut_2a", "rewards":[ { diff --git a/AndorsTrail/res/xml/shortcut_lodar2.tmx b/AndorsTrail/res/xml/shortcut_lodar2.tmx index 78d9cab13..d0b6d283c 100644 --- a/AndorsTrail/res/xml/shortcut_lodar2.tmx +++ b/AndorsTrail/res/xml/shortcut_lodar2.tmx @@ -234,7 +234,6 @@ - diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index e3580aa83..aae93beb4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -376,11 +376,12 @@ public final class CombatController implements VisualEffectCompletedCallback { handleNextMonsterAction(); return; } - + + final Monster movingMonster = currentActiveMonster; controllers.monsterMovementController.moveMonsterToNextPositionDuringCombat(currentActiveMonster, world.model.currentMap, new VisualEffectController.VisualEffectCompletedCallback(){ @Override public void onVisualEffectCompleted(int callbackValue) { - combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster); + combatActionListeners.onMonsterMovedDuringCombat(movingMonster); handleNextMonsterAction(); } });