| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battlemap/game-logic')
| -rw-r--r-- | src/battlemap/game-logic/bm_turn_actions.erl | 2 | ||||
| -rw-r--r-- | src/battlemap/game-logic/bm_victory.erl | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/battlemap/game-logic/bm_turn_actions.erl b/src/battlemap/game-logic/bm_turn_actions.erl index 4bb6d0b..c3e091a 100644 --- a/src/battlemap/game-logic/bm_turn_actions.erl +++ b/src/battlemap/game-logic/bm_turn_actions.erl @@ -278,6 +278,8 @@ handle_attack (BattleAction, Update) -> TargetIX = bm_battle_action:get_target_ix(BattleAction), TargetCharacter = bm_battle:get_character(TargetIX, Battle), + true = bm_character:get_is_alive(TargetCharacter), + AttackSequence = get_attack_sequence(Character, TargetCharacter), {AttackEffects, RemainingAttackerHealth, RemainingDefenderHealth} = diff --git a/src/battlemap/game-logic/bm_victory.erl b/src/battlemap/game-logic/bm_victory.erl index 59be66b..3531739 100644 --- a/src/battlemap/game-logic/bm_victory.erl +++ b/src/battlemap/game-logic/bm_victory.erl @@ -29,7 +29,7 @@ mark_players_characters_as_defeated (PlayerIX, Characters) -> (bm_character:get_player_index(Character) == PlayerIX) end, fun (Character) -> - bm_character:set_rank(defeated, Character) + bm_character:set_is_defeated(true, Character) end, Characters ). @@ -50,8 +50,8 @@ add_db_query_to_mark_character_as_defeated (IX, Update) -> [ sh_db_query:set_field ( - bm_character:get_rank_field(), - defeated + bm_character:get_is_defeated_field(), + true ) ] ), @@ -175,7 +175,5 @@ handle_character_lost_health (CharIX, _Health, Update) -> case StillHasAliveChar of true -> Update; _ -> handle_player_defeat(CharacterPlayerIX, Update) - end; - - defeated -> Update + end end. |