OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Ensure conditions consecutive to player attacks are reported after the

Browse Source 
attack result in the combat log.
This commit is contained in:
Zukero
2019-01-10 07:41:27 +01:00
parent 9081bad8f9
commit bbdd25b957
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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