summaryrefslogtreecommitdiff |
diff options
author | nsensfel <SpamShield0@noot-noot.org> | 2019-10-08 18:19:38 +0200 |
---|---|---|
committer | nsensfel <SpamShield0@noot-noot.org> | 2019-10-08 18:19:38 +0200 |
commit | 36c4af70fb3cda46d553306b65d9a73b1d0220fc (patch) | |
tree | 23d28bd76b89c8724a61cf435caffdc56d8a2a89 /src/battle/mechanic | |
parent | 27e6fba1b383b6045c8ef42a4beea9903359b07d (diff) |
...
Diffstat (limited to 'src/battle/mechanic')
-rw-r--r-- | src/battle/mechanic/condition/blt_cond_heal.erl | 7 | ||||
-rw-r--r-- | src/battle/mechanic/skill/btl_skill_static_heal.erl (renamed from src/battle/mechanic/skill/btl_static_heal.erl) | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/battle/mechanic/condition/blt_cond_heal.erl b/src/battle/mechanic/condition/blt_cond_heal.erl index 2479720..e67ae08 100644 --- a/src/battle/mechanic/condition/blt_cond_heal.erl +++ b/src/battle/mechanic/condition/blt_cond_heal.erl @@ -26,16 +26,15 @@ btl_character_turn_update:type() ) -> { - btl_condition:type(), - [ataxic:basic()], + [{btl_condition:type(), ataxic:basic()}], btl_character_turn_update:type() }. apply (Condition, Update) -> {TargetIX, Amount} = - case btl_condition:get_parameter(Condition) of + case btl_condition:get_parameters(Condition) of {StoredTargetIX, StoredAmount} -> {StoredTargetIX, StoredAmount}; Other -> error({condition, parameter, Other}) end, % TODO - {Condition, [], Update}. + {[{Condition, []}], Update}. diff --git a/src/battle/mechanic/skill/btl_static_heal.erl b/src/battle/mechanic/skill/btl_skill_static_heal.erl index bb67463..7a9bf35 100644 --- a/src/battle/mechanic/skill/btl_static_heal.erl +++ b/src/battle/mechanic/skill/btl_skill_static_heal.erl @@ -36,7 +36,7 @@ cast_logic (TargetIX, Amount, S0Update) -> {TargetIX, HealAmount} ), - {_S1Healing, _HealingUpdates, S1Update} = + {_S1HealindAndUpdate, S1Update} = btl_cond_heal:apply ( Healing, |