From d447948a48961e6ead2afe28f9fdaadf1c91d472 Mon Sep 17 00:00:00 2001 From: jgemma Date: Sat, 5 Jan 2019 11:17:58 -0500 Subject: [PATCH] Removed the call to apply taunt skill effect from the playerAttacks method and moved it to the attackWithCurrentMonster() method after the engine has determined that the monster has missed which is after the missed event is logged. --- .../com/gpl/rpg/AndorsTrail/controller/CombatController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index 5f6807781..31cd1bed2 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -406,6 +406,7 @@ public final class CombatController implements VisualEffectCompletedCallback { } else { combatActionListeners.onMonsterAttackMissed(currentActiveMonster, attack); startMissedEffect(attack, world.model.player.position, this, CALLBACK_MONSTERATTACK); + controllers.skillController.applySkillEffectsFromMonsterAttack(attack, currentActiveMonster); } } @@ -513,13 +514,11 @@ public final class CombatController implements VisualEffectCompletedCallback { private AttackResult playerAttacks(Monster currentMonster) { AttackResult result = attack(world.model.player, currentMonster); - controllers.skillController.applySkillEffectsFromPlayerAttack(result, currentMonster); return result; } private AttackResult monsterAttacks(Monster currentMonster) { AttackResult result = attack(currentMonster, world.model.player); - controllers.skillController.applySkillEffectsFromMonsterAttack(result, currentMonster); return result; }