From bc6573704c55cee8bcb860486bb4821c4171386c Mon Sep 17 00:00:00 2001
From: nsensfel <SpamShield0@noot-noot.org>
Date: Thu, 14 Feb 2019 14:37:51 +0100
Subject: Constant luck attacks, only real actions mod luck

---
 .../mechanic/turn_action/btl_turn_actions_attack.erl   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/battle/mechanic/turn_action/btl_turn_actions_attack.erl')

diff --git a/src/battle/mechanic/turn_action/btl_turn_actions_attack.erl b/src/battle/mechanic/turn_action/btl_turn_actions_attack.erl
index ad6b7e4..462e868 100644
--- a/src/battle/mechanic/turn_action/btl_turn_actions_attack.erl
+++ b/src/battle/mechanic/turn_action/btl_turn_actions_attack.erl
@@ -71,7 +71,7 @@ handle_attack_sequence
    [NextAttack | AttackSequence],
    Result
 ) ->
-   {AttackEffect, NewAttackerLuck, NewDefenderLuck} =
+   AttackEffect =
       btl_attack:get_description_of
       (
          NextAttack,
@@ -81,17 +81,25 @@ handle_attack_sequence
          DefenderLuck
       ),
 
-   {AttackResult, NewAttackerHealth, NewDefenderHealth} =
-      btl_attack:apply_to_healths
+   {
+      AttackResult,
+      NewAttackerHealth,
+      NewAttackerLuck,
+      NewDefenderHealth,
+      NewDefenderLuck
+   } =
+      btl_attack:apply_to_healths_and_lucks
       (
          AttackEffect,
          AttackerHealth,
-         DefenderHealth
+         AttackerLuck,
+         DefenderHealth,
+         DefenderLuck
       ),
 
    NextResult =
       case AttackResult of
-         nothing -> Result;
+         {nothing, _, _} -> Result;
          _ -> [AttackResult|Result]
       end,
 
-- 
cgit v1.2.3-70-g09d2