| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-10-27 21:14:25 +0100 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-10-27 21:14:25 +0100 |
| commit | 95f112f827ffef5605c384b86a9d718c74e9bbbc (patch) | |
| tree | e7304271b9226b2981dc8d89b5e4db33efc1fd93 /src/battle/mechanic/action | |
| parent | 86147b01bd6a240fa713dbf3368e324987664f7a (diff) | |
...
Diffstat (limited to 'src/battle/mechanic/action')
| -rw-r--r-- | src/battle/mechanic/action/btl_action_switch_weapons.erl (renamed from src/battle/mechanic/action/btl_action_switch_weapon.erl) | 2 | ||||
| -rw-r--r-- | src/battle/mechanic/action/btl_action_use_skill.erl (renamed from src/battle/mechanic/action/btl_action_skill.erl) | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/battle/mechanic/action/btl_action_switch_weapon.erl b/src/battle/mechanic/action/btl_action_switch_weapons.erl index 10348bc..693c258 100644 --- a/src/battle/mechanic/action/btl_action_switch_weapon.erl +++ b/src/battle/mechanic/action/btl_action_switch_weapons.erl @@ -1,4 +1,4 @@ --module(btl_action_switch_weapon). +-module(btl_action_switch_weapons). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/battle/mechanic/action/btl_action_skill.erl b/src/battle/mechanic/action/btl_action_use_skill.erl index 7e6579b..154d7db 100644 --- a/src/battle/mechanic/action/btl_action_skill.erl +++ b/src/battle/mechanic/action/btl_action_use_skill.erl @@ -1,4 +1,4 @@ --module(btl_action_skill). +-module(btl_action_use_skill). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -22,7 +22,7 @@ non_neg_integer(), btl_character_turn_update:type() ) - -> btl_character_turn_update:type(). + -> {btl_character_turn_update:type(), shr_skill:type()}. pay_for_cast (ActorIX, S0Update) -> S0Battle = btl_character_turn_update:get_battle(S0Update), S0Actor = btl_battle:get_character(ActorIX, S0Battle), @@ -51,7 +51,7 @@ pay_for_cast (ActorIX, S0Update) -> ), S1Update = - btl_character_turn:ataxia_set_battle + btl_character_turn_update:ataxia_set_battle ( S1Battle, BattleAtaxiaUpdate, @@ -82,7 +82,7 @@ cast_skill (Action, S0Update) -> btl_condition:apply_to_character ( ActorIX, - ?CONDITION_TRIGGER_HAS_CAST_SKILL, + ?CONDITION_TRIGGER_HAS_USED_THEIR_SKILL, Action, none, S2Update @@ -91,7 +91,7 @@ cast_skill (Action, S0Update) -> {none, S3Update} = btl_condition:apply_to_battle ( - ?CONDITION_TRIGGER_A_CHARACTER_HAS_CAST_SKILL, + ?CONDITION_TRIGGER_A_CHARACTER_HAS_USED_THEIR_SKILL, Action, none, S2Update @@ -118,7 +118,7 @@ handle (S0Action, S0Update) -> btl_condition:apply_to_character ( ActorIX, - ?CONDITION_TRIGGER_ABOUT_TO_CAST_SKILL, + ?CONDITION_TRIGGER_ABOUT_TO_USE_THEIR_SKILL, none, {S0Action, S0PerformAction}, S0Update @@ -127,7 +127,7 @@ handle (S0Action, S0Update) -> {{S2Action, S2PerformAction}, S2Update} = btl_condition:apply_to_battle ( - ?CONDITION_TRIGGER_A_CHARACTER_IS_ABOUT_TO_CAST_SKILL, + ?CONDITION_TRIGGER_A_CHARACTER_IS_ABOUT_TO_USE_THEIR_SKILL, none, {S1Action, S1PerformAction}, S1Update |