summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-06-22 14:49:47 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-06-22 14:49:47 +0200
commit1bcde2b23a273c7ff6c5b5ea5346111084e01700 (patch)
tree9c20ff8a5d48deeb65b50e46e5c8d73a341f23a7 /src/battlemap/struct/bm_attack.erl
parenta76d6919142fed58bbe20031591d31f8bec08bb6 (diff)
Removes obsolete sanity checks.
Diffstat (limited to 'src/battlemap/struct/bm_attack.erl')
-rw-r--r--src/battlemap/struct/bm_attack.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battlemap/struct/bm_attack.erl b/src/battlemap/struct/bm_attack.erl
index af55606..ce3af53 100644
--- a/src/battlemap/struct/bm_attack.erl
+++ b/src/battlemap/struct/bm_attack.erl
@@ -201,14 +201,14 @@ when
Damage = Attack#attack.damage,
case AttackerHealth of
- 0 ->
+ N when (N =< 0) ->
{nothing, AttackerHealth, DefenderHealth};
_ ->
{
Attack,
AttackerHealth,
- max(0, (DefenderHealth - Damage))
+ (DefenderHealth - Damage)
}
end;
apply_to_healths
@@ -228,14 +228,15 @@ when
) ->
Damage = Attack#attack.damage,
+ %% This actually allows you to parry the counter of a dead character.
case DefenderHealth of
- 0 ->
+ N when (N =< 0) ->
{nothing, AttackerHealth, DefenderHealth};
_ ->
{
Attack,
- max(0, (AttackerHealth - Damage)),
+ (AttackerHealth - Damage),
DefenderHealth
}
end.