From 16d34a748d62ab59f9b53a52d3e72d5b872efce1 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Tue, 3 Jul 2018 14:33:35 +0200 Subject: Fixes parries. --- src/battlemap/struct/bm_attack.erl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/battlemap/struct/bm_attack.erl b/src/battlemap/struct/bm_attack.erl index a8f97de..a1ce027 100644 --- a/src/battlemap/struct/bm_attack.erl +++ b/src/battlemap/struct/bm_attack.erl @@ -206,9 +206,15 @@ apply_to_healths ) when ( - (Attack#attack.order == first) - or (Attack#attack.order == second) - or ((Attack#attack.order == counter) and Attack#attack.is_parry) + ( + (not Attack#attack.is_parry) + and ((Attack#attack.order == first) or (Attack#attack.order == second)) + ) + or + ( + Attack#attack.is_parry + and (Attack#attack.order == counter) + ) ) -> Damage = Attack#attack.damage, @@ -225,10 +231,13 @@ apply_to_healths ) when ( - (Attack#attack.order == counter) + ( + (not Attack#attack.is_parry) + and (Attack#attack.order == counter) + ) or ( - (Attack#attack.is_parry) + Attack#attack.is_parry and ((Attack#attack.order == first) or (Attack#attack.order == second)) ) ) -> -- cgit v1.2.3-70-g09d2