| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/mechanic/action/btl_action_attack.erl | 4 | ||||
| -rw-r--r-- | src/battle/mechanic/action/btl_action_move.erl | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/battle/mechanic/action/btl_action_attack.erl b/src/battle/mechanic/action/btl_action_attack.erl index bfeafcc..47bdd93 100644 --- a/src/battle/mechanic/action/btl_action_attack.erl +++ b/src/battle/mechanic/action/btl_action_attack.erl @@ -115,11 +115,11 @@ get_character_abilities (Action, Character, TargetCharacter) -> ( IsNotOpportunistic and (TargetDefenseRange == 0) - and (TargetAttackRange =< RequiredRange) + and (TargetAttackRange >= RequiredRange) ), ( IsNotOpportunistic - and (TargetAttackRange =< RequiredRange) + and (TargetAttackRange >= RequiredRange) ) }. diff --git a/src/battle/mechanic/action/btl_action_move.erl b/src/battle/mechanic/action/btl_action_move.erl index f4ef7da..643912c 100644 --- a/src/battle/mechanic/action/btl_action_move.erl +++ b/src/battle/mechanic/action/btl_action_move.erl @@ -40,7 +40,12 @@ generate_attacks_of_opportunity_candidates orddict:fold ( fun (CandidateIX, Candidate, Results) -> - case (btl_character:get_player_index(Candidate) == PlayerIX) of + case + ( + (btl_character:get_player_index(Candidate) == PlayerIX) + or (not btl_character:get_is_alive(Candidate)) + ) + of true -> Results; false -> CandidateWeapon = |