| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle/mechanic')
| -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 | ||||
| -rw-r--r-- | src/battle/mechanic/btl_actions_management.erl | 6 | ||||
| -rw-r--r-- | src/battle/mechanic/skill/btl_skill_static_heal.erl | 8 |
4 files changed, 14 insertions, 16 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 diff --git a/src/battle/mechanic/btl_actions_management.erl b/src/battle/mechanic/btl_actions_management.erl index a3f9365..6305de7 100644 --- a/src/battle/mechanic/btl_actions_management.erl +++ b/src/battle/mechanic/btl_actions_management.erl @@ -30,9 +30,9 @@ handle (S0Update) -> case btl_action:get_category(Action) of move -> btl_action_move:handle(Action, S1Update); attack -> btl_action_attack:handle(Action, S1Update); - skill -> btl_action_skill:handle(Action, S1Update); - switch_weapon -> - btl_action_switch_weapon:handle(Action, S1Update) + skill -> btl_action_use_skill:handle(Action, S1Update); + switch_weapons -> + btl_action_switch_weapons:handle(Action, S1Update) end, handle(S2Update) diff --git a/src/battle/mechanic/skill/btl_skill_static_heal.erl b/src/battle/mechanic/skill/btl_skill_static_heal.erl index b1b7018..90d3154 100644 --- a/src/battle/mechanic/skill/btl_skill_static_heal.erl +++ b/src/battle/mechanic/skill/btl_skill_static_heal.erl @@ -10,7 +10,7 @@ -export ( [ - cast/5 + cast/3 ] ). @@ -24,11 +24,9 @@ -spec cast ( shr_skill:type(), - non_neg_integer(), - list(non_neg_integer()), - list(shr_location:type()), + btl_action:type(), btl_character_turn_update:type() ) -> btl_character_turn_update:type(). -cast (_Skill, _UserIX, _TargetIXs, _Locations, S0Update) -> +cast (_Skill, _Action, S0Update) -> S0Update. |