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

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

Browse Source 
which is after the missed event is logged.
This commit is contained in:
jgemma
2019-01-05 11:17:58 -05:00
parent d01f2d533c
commit d447948a48
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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