| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2020-05-28 12:47:36 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2020-05-28 12:47:36 +0200 |
| commit | 7365a30773cdedcc89e1df9cd83a4835f9e09a10 (patch) | |
| tree | c596cde7b856015d8b7341c3e3bc58b57461e951 | |
| parent | 72ffbf106d4ac051419edee91bcf8ce657fd1dc0 (diff) | |
Don't allow move->attack validation w/o target.
| -rw-r--r-- | src/battle/src/View/Controlled.elm | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/src/battle/src/View/Controlled.elm b/src/battle/src/View/Controlled.elm index aa34b48..4f6a378 100644 --- a/src/battle/src/View/Controlled.elm +++ b/src/battle/src/View/Controlled.elm @@ -180,23 +180,32 @@ end_turn_button char_turn = (Html.button [ ( - if - ( - (temporary_path /= registered_path) - || - ( + let + is_aiming_at_something = (Struct.CharacterTurn.is_aiming_at_something char_turn) - && (action /= Struct.CharacterTurn.Attacking) - && (action /= Struct.CharacterTurn.UsingSkill) - ) - || + in + if ( - (registered_path == []) - && (action == Struct.CharacterTurn.None) + (temporary_path /= registered_path) + || + ( + is_aiming_at_something + && (action /= Struct.CharacterTurn.Attacking) + && (action /= Struct.CharacterTurn.UsingSkill) + ) + || + ( + (not is_aiming_at_something) + && (action == Struct.CharacterTurn.Attacking) + ) + || + ( + (registered_path == []) + && (action == Struct.CharacterTurn.None) + ) ) - ) - then (Html.Attributes.class "disabled") - else (Html.Events.onClick Struct.Event.TurnEnded) + then (Html.Attributes.class "disabled") + else (Html.Events.onClick Struct.Event.TurnEnded) ), (Html.Attributes.class "action-button"), (Html.Attributes.class "end-turn-button"), |