summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-02-14 14:37:51 +0100
committernsensfel <SpamShield0@noot-noot.org>2019-02-14 14:37:51 +0100
commitbc6573704c55cee8bcb860486bb4821c4171386c (patch)
tree99c0939d3708d38e873b290bcf495c2d12b6fa04 /src/battle/mechanic/turn_action/btl_turn_actions_attack.erl
parent0e3471cf7283c1faac11f3d3bc64abbcb17a2d9c (diff)
Constant luck attacks, only real actions mod luck
Diffstat (limited to 'src/battle/mechanic/turn_action/btl_turn_actions_attack.erl')
-rw-r--r--src/battle/mechanic/turn_action/btl_turn_actions_attack.erl18
1 files changed, 13 insertions, 5 deletions
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,