| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-10-20 20:59:34 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-10-20 20:59:34 +0200 |
| commit | 08fab636c981574a703baffad9ebb52ff4308f17 (patch) | |
| tree | 6fd3742f4b374fb948ecd017be88e5923dc9d611 /src/battle/mechanic/action | |
| parent | 4aaf3670c0ff4bc46092e909bb450b6336417ed9 (diff) | |
...
Diffstat (limited to 'src/battle/mechanic/action')
| -rw-r--r-- | src/battle/mechanic/action/btl_action_attack.erl | 1 | ||||
| -rw-r--r-- | src/battle/mechanic/action/btl_action_move.erl | 3 | ||||
| -rw-r--r-- | src/battle/mechanic/action/btl_action_switch_weapon.erl | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/battle/mechanic/action/btl_action_attack.erl b/src/battle/mechanic/action/btl_action_attack.erl index 91c886b..d155197 100644 --- a/src/battle/mechanic/action/btl_action_attack.erl +++ b/src/battle/mechanic/action/btl_action_attack.erl @@ -1129,6 +1129,7 @@ handle_attack_sequence ([AttackCategory|S0NextElements], Action, S0Update) -> ) -> btl_character_turn_update:type(). handle (Action, S0Update) -> + % TODO: assert target & actor are alive. S0Sequence = [first, counter, second], {S1Sequence, S1Update} = diff --git a/src/battle/mechanic/action/btl_action_move.erl b/src/battle/mechanic/action/btl_action_move.erl index 897525f..756ebca 100644 --- a/src/battle/mechanic/action/btl_action_move.erl +++ b/src/battle/mechanic/action/btl_action_move.erl @@ -450,6 +450,7 @@ commit_move (CharacterIX, Character, S0Update, Path, NewLocation) -> ) -> btl_character_turn_update:type(). handle (Action, S0Update) -> + % TODO: assert actor is alive. ActorIX = btl_action:get_actor_index(Action), S0Battle = btl_character_turn_update:get_battle(S0Update), @@ -526,7 +527,7 @@ handle (Action, S0Update) -> _ -> btl_character_turn_update:add_actions ( - false, + true, ( Interruptions ++ diff --git a/src/battle/mechanic/action/btl_action_switch_weapon.erl b/src/battle/mechanic/action/btl_action_switch_weapon.erl index 354c328..10348bc 100644 --- a/src/battle/mechanic/action/btl_action_switch_weapon.erl +++ b/src/battle/mechanic/action/btl_action_switch_weapon.erl @@ -28,6 +28,7 @@ ) -> btl_character_turn_update:type(). handle (Action, S0Update) -> + % TODO: assert actor is alive. ActorIX = btl_action:get_actor_index(Action), S0PerformSwitch = true, |


