From bbdd25b9571adc3d5020a1fa8003a58f1d9e55e1 Mon Sep 17 00:00:00 2001 From: Zukero Date: Thu, 10 Jan 2019 07:41:27 +0100 Subject: [PATCH] Ensure conditions consecutive to player attacks are reported after the attack result in the combat log. --- .../com/gpl/rpg/AndorsTrail/controller/CombatController.java | 5 +++-- 1 file changed, 3 insertions(+), 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 3c9e24319..b0cd7978d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -181,6 +181,8 @@ public final class CombatController implements VisualEffectCompletedCallback { combatActionListeners.onPlayerAttackMissed(target, attack); startMissedEffect(attack, attackPosition, this, CALLBACK_PLAYERATTACK); } + controllers.skillController.applySkillEffectsFromPlayerAttack(attack, target); + } private void playerAttackCompleted() { @@ -406,8 +408,8 @@ 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); } + controllers.skillController.applySkillEffectsFromMonsterAttack(attack, currentActiveMonster); } private static final int CALLBACK_MONSTERATTACK = 0; @@ -514,7 +516,6 @@ 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; }