summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-02-23 22:47:43 +0100
committernsensfel <SpamShield0@noot-noot.org>2018-02-23 22:47:43 +0100
commit96c35eb8c79826fa07d2b00bbac039d9ec95eb3c (patch)
tree94d7fef850637be6fd800f139a59d578763ba671 /src/query/character_turn
parent959b994bced0863d4b8a984f38f5ac61aa3620e0 (diff)
...
Diffstat (limited to 'src/query/character_turn')
-rw-r--r--src/query/character_turn/handle_character_instance_attacking_2.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/query/character_turn/handle_character_instance_attacking_2.erl b/src/query/character_turn/handle_character_instance_attacking_2.erl
index be2ac99..ecb2a95 100644
--- a/src/query/character_turn/handle_character_instance_attacking_2.erl
+++ b/src/query/character_turn/handle_character_instance_attacking_2.erl
@@ -58,6 +58,7 @@ handle_parry (AttackerStatistics, DefenderStatistics) ->
[]
end.
+%% FIXME: parry not working as intended
handle_attacks ([], _AttackerStatistics, _DefenderStatistics, Results) ->
Results;
handle_attacks
@@ -323,11 +324,11 @@ handle_character_instance_attacking (QueryState, Input) ->
Actions =
case {CanDefend, CanParry} of
{true, true} ->
- [second, counter, parry, first];
+ [{second, parry}, counter, {first, parry}];
{true, false} ->
- [second, counter, first];
+ [{second, no_parry}, counter, {fist, no_parry}];
{false, _} ->
- [second, first]
+ [{second, no_parry}, {first, no_parry}]
end,
Effects =
handle_attacks