...

6 files changed, 23 insertions, 27 deletions

diff --git a/src/battle/mechanic/action/btl_action_attack.erl b/src/battle/mechanic/action/btl_action_attack.erl
index ea7857a..8ddd119 100644
--- a/src/battle/mechanic/action/btl_action_attack.erl
+++ b/src/battle/mechanic/action/btl_action_attack.erl
@@ -61,7 +61,7 @@ apply_mirror_conditions
       end,
 
    {S1VolatileContext, S1Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          OwnTriggerName,
@@ -71,7 +71,7 @@ apply_mirror_conditions
       ),
 
    {S2VolatileContext, S2Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          TargetIX,
          OtherTriggerName,
@@ -81,7 +81,7 @@ apply_mirror_conditions
       ),
 
    {S3VolatileContext, S3Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          GlobalTriggerName,
          ReadOnlyContext,
diff --git a/src/battle/mechanic/action/btl_action_move.erl b/src/battle/mechanic/action/btl_action_move.erl
index 756ebca..9bbbf7a 100644
--- a/src/battle/mechanic/action/btl_action_move.erl
+++ b/src/battle/mechanic/action/btl_action_move.erl
@@ -462,7 +462,7 @@ handle (Action, S0Update) ->
    S0Path = btl_action:get_path(Action),
 
    {{S1MovementPoints, S1Path}, S2Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_ABOUT_TO_MOVE,
@@ -472,7 +472,7 @@ handle (Action, S0Update) ->
       ),
 
    {{S2MovementPoints, S2Path}, S3Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          ?CONDITION_TRIGGER_A_CHARACTER_IS_ABOUT_TO_MOVE,
          Action,
@@ -503,7 +503,7 @@ handle (Action, S0Update) ->
       commit_move(ActorIX, S1Actor, S4Update, HandledPath, NewLocation),
 
    {_V0Nothing, S5Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_HAS_MOVED,
@@ -513,7 +513,7 @@ handle (Action, S0Update) ->
       ),
 
    {_V1Nothing, S6Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_A_CHARACTER_HAS_MOVED,
diff --git a/src/battle/mechanic/action/btl_action_switch_weapons.erl b/src/battle/mechanic/action/btl_action_switch_weapons.erl
index 693c258..3d1035d 100644
--- a/src/battle/mechanic/action/btl_action_switch_weapons.erl
+++ b/src/battle/mechanic/action/btl_action_switch_weapons.erl
@@ -34,7 +34,7 @@ handle (Action, S0Update) ->
    S0PerformSwitch = true,
 
    {S1PerformSwitch, S1Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_ABOUT_TO_SWITCH_WEAPONS,
@@ -44,7 +44,7 @@ handle (Action, S0Update) ->
       ),
 
    {S2PerformSwitch, S2Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          ?CONDITION_TRIGGER_A_CHARACTER_IS_ABOUT_TO_SWITCH_WEAPONS,
          Action,
@@ -96,7 +96,7 @@ handle (Action, S0Update) ->
             ),
 
          {_V0Nothing, S5Update} =
-            btl_condition:apply_to_character
+            btl_conditions:apply_to_character
             (
                ActorIX,
                ?CONDITION_TRIGGER_HAS_SWITCHED_WEAPONS,
@@ -106,7 +106,7 @@ handle (Action, S0Update) ->
             ),
 
          {_V1Nothing, S6Update} =
-            btl_condition:apply_to_battle
+            btl_conditions:apply_to_battle
             (
                ?CONDITION_TRIGGER_A_CHARACTER_HAS_SWITCHED_WEAPONS,
                Action,
diff --git a/src/battle/mechanic/action/btl_action_use_skill.erl b/src/battle/mechanic/action/btl_action_use_skill.erl
index 154d7db..1501539 100644
--- a/src/battle/mechanic/action/btl_action_use_skill.erl
+++ b/src/battle/mechanic/action/btl_action_use_skill.erl
@@ -79,7 +79,7 @@ cast_skill (Action, S0Update) ->
       ),
 
    {none, S3Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_HAS_USED_THEIR_SKILL,
@@ -89,7 +89,7 @@ cast_skill (Action, S0Update) ->
       ),
 
    {none, S3Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          ?CONDITION_TRIGGER_A_CHARACTER_HAS_USED_THEIR_SKILL,
          Action,
@@ -115,7 +115,7 @@ handle (S0Action, S0Update) ->
    S0PerformAction = true,
 
    {{S1Action, S1PerformAction}, S1Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_ABOUT_TO_USE_THEIR_SKILL,
@@ -125,7 +125,7 @@ handle (S0Action, S0Update) ->
       ),
 
    {{S2Action, S2PerformAction}, S2Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          ?CONDITION_TRIGGER_A_CHARACTER_IS_ABOUT_TO_USE_THEIR_SKILL,
          none,
diff --git a/src/battle/mechanic/btl_victory_progression.erl b/src/battle/mechanic/btl_victory_progression.erl
index 45a6e89..1959731 100644
--- a/src/battle/mechanic/btl_victory_progression.erl
+++ b/src/battle/mechanic/btl_victory_progression.erl
@@ -114,7 +114,7 @@ handle_player_defeat (PlayerIX, S0Update) ->
       ),
 
    {_V3Nothing, S3Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          ?CONDITION_TRIGGER_PLAYER_DEFEAT,
          PlayerIX,
@@ -135,7 +135,7 @@ handle_player_defeat (PlayerIX, S0Update) ->
    -> btl_character_turn_update:type().
 handle_character_loss (ActorIX, S0Update) ->
    {_V0Nothing, S1Update} =
-      btl_condition:apply_to_character
+      btl_conditions:apply_to_character
       (
          ActorIX,
          ?CONDITION_TRIGGER_HAS_DIED,
@@ -145,7 +145,7 @@ handle_character_loss (ActorIX, S0Update) ->
       ),
 
    {_V1Nothing, S2Update} =
-      btl_condition:apply_to_battle
+      btl_conditions:apply_to_battle
       (
          ?CONDITION_TRIGGER_A_CHARACTER_HAS_DIED,
          ActorIX,
diff --git a/src/battle/mechanic/condition/btl_cond_heal.erl b/src/battle/mechanic/condition/btl_cond_heal.erl
index fd3d94f..c677d32 100644
--- a/src/battle/mechanic/condition/btl_cond_heal.erl
+++ b/src/battle/mechanic/condition/btl_cond_heal.erl
@@ -11,7 +11,7 @@
 -export
 (
    [
-      apply/4
+      apply/3
    ]
 ).
 
@@ -25,15 +25,11 @@
 -spec apply
    (
       shr_condition:context(any(), VolatileDataType),
-      btl_condition:ref(),
-      btl_condition:type(),
+      btl_conditions:ref(),
       btl_character_turn_update:type()
-   ) ->
-   {
-      VolatileDataType,
-      btl_character_turn_update:type()
-   }.
-apply (S0Context, _SelfRef, _S0Condition, S0Update) ->
+   )
+   -> {VolatileDataType, btl_character_turn_update:type()}.
+apply (S0Context, _SelfRef, S0Update) ->
    {_Trigger, _ReadOnlyData, VolatileData} = S0Context,
 
    {VolatileData, S0Update, none}.