...

3 files changed, 111 insertions, 107 deletions

diff --git a/include/tacticians/skills.hrl.m4 b/include/tacticians/skills.hrl.m4
deleted file mode 100644
index 5e3e407..0000000
--- a/include/tacticians/skills.hrl.m4
+++ /dev/null
@@ -1,67 +0,0 @@
-m4_include(__MAKEFILE_DATA_DIR/skill/variant.m4.conf)
-
--define(SKILL_VARIANT_ALPHA_0, __SKILL_VAR_ALPHA_0).
--define(SKILL_VARIANT_ALPHA_1, __SKILL_VAR_ALPHA_1).
--define(SKILL_VARIANT_ALPHA_2, __SKILL_VAR_ALPHA_2).
--define(SKILL_VARIANT_ALPHA_3, __SKILL_VAR_ALPHA_3).
--define(SKILL_VARIANT_ALPHA_4, __SKILL_VAR_ALPHA_4).
--define(SKILL_VARIANT_ALPHA_5, __SKILL_VAR_ALPHA_5).
--define(SKILL_VARIANT_ALPHA_6, __SKILL_VAR_ALPHA_6).
--define(SKILL_VARIANT_ALPHA_7, __SKILL_VAR_ALPHA_7).
--define(SKILL_VARIANT_ALPHA_8, __SKILL_VAR_ALPHA_8).
--define(SKILL_VARIANT_ALPHA_9, __SKILL_VAR_ALPHA_9).
-
--define(SKILL_VARIANT_BETA_0, __SKILL_VAR_BETA_0).
--define(SKILL_VARIANT_BETA_1, __SKILL_VAR_BETA_1).
--define(SKILL_VARIANT_BETA_2, __SKILL_VAR_BETA_2).
--define(SKILL_VARIANT_BETA_3, __SKILL_VAR_BETA_3).
--define(SKILL_VARIANT_BETA_4, __SKILL_VAR_BETA_4).
--define(SKILL_VARIANT_BETA_5, __SKILL_VAR_BETA_5).
--define(SKILL_VARIANT_BETA_6, __SKILL_VAR_BETA_6).
--define(SKILL_VARIANT_BETA_7, __SKILL_VAR_BETA_7).
--define(SKILL_VARIANT_BETA_8, __SKILL_VAR_BETA_8).
--define(SKILL_VARIANT_BETA_9, __SKILL_VAR_BETA_9).
-
--define(SKILL_VARIANT_GAMMA_0, __SKILL_VAR_GAMMA_0).
--define(SKILL_VARIANT_GAMMA_1, __SKILL_VAR_GAMMA_1).
--define(SKILL_VARIANT_GAMMA_2, __SKILL_VAR_GAMMA_2).
--define(SKILL_VARIANT_GAMMA_3, __SKILL_VAR_GAMMA_3).
--define(SKILL_VARIANT_GAMMA_4, __SKILL_VAR_GAMMA_4).
--define(SKILL_VARIANT_GAMMA_5, __SKILL_VAR_GAMMA_5).
--define(SKILL_VARIANT_GAMMA_6, __SKILL_VAR_GAMMA_6).
--define(SKILL_VARIANT_GAMMA_7, __SKILL_VAR_GAMMA_7).
--define(SKILL_VARIANT_GAMMA_8, __SKILL_VAR_GAMMA_8).
--define(SKILL_VARIANT_GAMMA_9, __SKILL_VAR_GAMMA_9).
-
--define(SKILL_VARIANT_PHI_0, __SKILL_VAR_PHI_0).
--define(SKILL_VARIANT_PHI_1, __SKILL_VAR_PHI_1).
--define(SKILL_VARIANT_PHI_2, __SKILL_VAR_PHI_2).
--define(SKILL_VARIANT_PHI_3, __SKILL_VAR_PHI_3).
--define(SKILL_VARIANT_PHI_4, __SKILL_VAR_PHI_4).
--define(SKILL_VARIANT_PHI_5, __SKILL_VAR_PHI_5).
--define(SKILL_VARIANT_PHI_6, __SKILL_VAR_PHI_6).
--define(SKILL_VARIANT_PHI_7, __SKILL_VAR_PHI_7).
--define(SKILL_VARIANT_PHI_8, __SKILL_VAR_PHI_8).
--define(SKILL_VARIANT_PHI_9, __SKILL_VAR_PHI_9).
-
--define(SKILL_VARIANT_CHI_0, __SKILL_VAR_CHI_0).
--define(SKILL_VARIANT_CHI_1, __SKILL_VAR_CHI_1).
--define(SKILL_VARIANT_CHI_2, __SKILL_VAR_CHI_2).
--define(SKILL_VARIANT_CHI_3, __SKILL_VAR_CHI_3).
--define(SKILL_VARIANT_CHI_4, __SKILL_VAR_CHI_4).
--define(SKILL_VARIANT_CHI_5, __SKILL_VAR_CHI_5).
--define(SKILL_VARIANT_CHI_6, __SKILL_VAR_CHI_6).
--define(SKILL_VARIANT_CHI_7, __SKILL_VAR_CHI_7).
--define(SKILL_VARIANT_CHI_8, __SKILL_VAR_CHI_8).
--define(SKILL_VARIANT_CHI_9, __SKILL_VAR_CHI_9).
-
--define(SKILL_VARIANT_PSI_0, __SKILL_VAR_PSI_0).
--define(SKILL_VARIANT_PSI_1, __SKILL_VAR_PSI_1).
--define(SKILL_VARIANT_PSI_2, __SKILL_VAR_PSI_2).
--define(SKILL_VARIANT_PSI_3, __SKILL_VAR_PSI_3).
--define(SKILL_VARIANT_PSI_4, __SKILL_VAR_PSI_4).
--define(SKILL_VARIANT_PSI_5, __SKILL_VAR_PSI_5).
--define(SKILL_VARIANT_PSI_6, __SKILL_VAR_PSI_6).
--define(SKILL_VARIANT_PSI_7, __SKILL_VAR_PSI_7).
--define(SKILL_VARIANT_PSI_8, __SKILL_VAR_PSI_8).
--define(SKILL_VARIANT_PSI_9, __SKILL_VAR_PSI_9).
diff --git a/src/battle/mechanic/condition/blt_cond_heal.erl b/src/battle/mechanic/condition/blt_cond_heal.erl
index edb01fd..021739f 100644
--- a/src/battle/mechanic/condition/blt_cond_heal.erl
+++ b/src/battle/mechanic/condition/blt_cond_heal.erl
@@ -1,7 +1,9 @@
 -module(btl_cond_heal).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-include("tacticians/conditions.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -24,14 +26,14 @@
    ->
    {
       btl_condition:type(),
-      btl_condition:update_order(),
+      btl_condition:update_action(),
       [{btl_character:type(), ataxic:basic()}]
    }.
 apply_to_character (Condition, S0Character) ->
-   {_, Amount} = btl_condition:get_parameters(Condition),
+   {_TargetIX, Amount} = btl_condition:get_parameters(Condition),
 
    case btl_character:get_is_alive(S0Character) of
-      false -> {Condition, btl_condition:do_nothing(), []};
+      false -> {Condition, none, []};
       true ->
          RemainingUses = btl_condition:get_remaining_uses(Condition),
          CurrentHealth = btl_character:get_current_health(S0Character),
@@ -39,7 +41,7 @@ apply_to_character (Condition, S0Character) ->
             shr_attributes:get_health
             (
                shr_character:get_attributes
-               j(
+               (
                   btl_character:get_base_character(S0Character)
                )
             ),
@@ -54,7 +56,7 @@ apply_to_character (Condition, S0Character) ->
             (RemainingUses == -1) ->
                {
                   Condition,
-                  btl_condition:do_nothing(),
+                  do_nothing,
                   [{S1Character, CharacterUpdate}]
                };
 
@@ -65,14 +67,14 @@ apply_to_character (Condition, S0Character) ->
                      UpdatedRemainingUses,
                      Condition
                   ),
-                  btl_condition:remove(),
+                  remove,
                   [{S1Character, CharacterUpdate}]
                };
 
             (RemainingUses == 0) ->
                {
                   Condition,
-                  btl_condition:remove(),
+                  remove,
                   [{S1Character, CharacterUpdate}]
                };
 
@@ -85,52 +87,95 @@ apply_to_character (Condition, S0Character) ->
                   ),
                {
                   UpdatedCondition,
-                  btl_condition:update(ConditionUpdate),
+                  {update, ConditionUpdate},
                   [{S1Character, CharacterUpdate}]
                }
          end
    end.
 
+-spec handle_trigger
+   (
+      btl_condition:trigger(),
+      btl_condition:type()
+   )
+   -> btl_condition:trigger().
+handle_trigger ({TriggerType, S0TriggerData}, Condition) ->
+   {TargetIX, _Amount} = btl_condition:get_parameters(Condition),
+
+   case
+      (
+         (TriggerType == ?CONDITION_TRIGGER_START_OF_OWN_ATTACK)
+         or (TriggerType == ?CONDITION_TRIGGER_END_OF_OWN_ATTACK)
+         or (TriggerType == ?CONDITION_TRIGGER_START_OF_OWN_HIT)
+         or (TriggerType == ?CONDITION_TRIGGER_END_OF_OWN_HIT)
+         or (TriggerType == ?CONDITION_TRIGGER_OWN_DODGE)
+         or (TriggerType == ?CONDITION_TRIGGER_OWN_CRITICAL)
+         or (TriggerType == ?CONDITION_TRIGGER_OWN_DOUBLE_HIT)
+         or (TriggerType == ?CONDITION_TRIGGER_OWN_DAMAGE)
+         or (TriggerType == ?CONDITION_TRIGGER_START_OF_TARGET_ATTACK)
+         or (TriggerType == ?CONDITION_TRIGGER_END_OF_TARGET_ATTACK)
+         or (TriggerType == ?CONDITION_TRIGGER_START_OF_TARGET_HIT)
+         or (TriggerType == ?CONDITION_TRIGGER_END_OF_TARGET_HIT)
+         or (TriggerType == ?CONDITION_TRIGGER_TARGET_DODGE)
+         or (TriggerType == ?CONDITION_TRIGGER_TARGET_CRITICAL)
+         or (TriggerType == ?CONDITION_TRIGGER_TARGET_DOUBLE_HIT)
+         or (TriggerType == ?CONDITION_TRIGGER_TARGET_DAMAGE)
+      )
+   of
+      false -> {TriggerType, S0TriggerData};
+      true ->
+         {Char0IX, Char0, Char1IX, Char1} = TriggerData,
+         if
+            (Char0IX == TargetIX) ->
+               {_UpdatedCondition, _UpdateOrder, UpdatedChar} =
+                  apply_to_character(Condition, Char0),
+
+               {
+                  TriggerType,
+                  {
+                     Char0IX
+                     UpdatedChar,
+                     Char1IX,
+                     Char1
+                  }
+               };
+
+            (Char1IX == TargetIX) ->
+               {_UpdatedCondition, _UpdateOrder, UpdatedChar} =
+                  apply_to_character(Condition, Char0),
+
+               {
+                  TriggerType,
+                  {
+                     Char0IX
+                     Char0,
+                     Char1IX,
+                     UpdatedChar
+                  }
+               };
+
+            true -> {TriggerType, S0TriggerData}
+         end
+   end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec apply
    (
       btl_condition:trigger(),
-      tuple(),
       btl_condition:type(),
       btl_character_turn_update:type()
    ) ->
    {
-      [{btl_condition:type(), ataxic:basic()}],
-      tuple(),
+      btl_condition:type(),
+      btl_condition:update_action(),
+      btl_condition:trigger(),
       btl_character_turn_update:type()
    }.
-apply(?CONDITION_TRIGGER_START_OF_PLAYER_TURN, {PlayerIX}, Condition, Update) ->
-apply(?CONDITION_TRIGGER_END_OF_PLAYER_TURN, {PlayerIX}, Condition, Update) ->
-apply
-(
-   ?CONDITION_TRIGGER_START_OF_CHARACTER_TURN,
-   {CharacterIX},
-   Condition,
-   Update
-) ->
-apply
-(
-   ?CONDITION_TRIGGER_END_OF_CHARACTER_TURN,
-   {CharacterIX},
-   Condition,
-   Update
-) ->
-apply
-(
-   ?CONDITION_TRIGGER_END_OF_CHARACTER_TURN,
-   {CharacterIX},
-   Condition,
-   Update
-) ->
+apply (S0Trigger, Condition, Update) ->
+   S1Trigger = handle_trigger(S0Trigger, Condition),
 
-   Trigger,
    Parameters,
    Condition,
    Update) ->
@@ -139,6 +184,4 @@ apply
          {StoredTargetIX, StoredAmount} -> {StoredTargetIX, StoredAmount};
          Other -> error({condition, parameter, Other})
       end,
-
-   % TODO
    {[{Condition, []}], Update}.
diff --git a/src/battle/struct/btl_condition.erl b/src/battle/struct/btl_condition.erl
index 1f8228f..4697a3c 100644
--- a/src/battle/struct/btl_condition.erl
+++ b/src/battle/struct/btl_condition.erl
@@ -51,7 +51,7 @@
                non_neg_integer(),
                btl_character:type(),
                non_neg_integer(),
-               btl_character:type(),
+               btl_character:type()
             }
          }
 
@@ -77,6 +77,8 @@
          }
    ).
 
+-type update_action() :: (none, remove, {update, ataxic:basic()}).
+
 -record
 (
    btl_cond,
@@ -91,7 +93,7 @@
 
 -opaque type() :: #btl_cond{}.
 
--export_type([type/0, trigger/0]).
+-export_type([type/0, trigger/0, update_action/0]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +131,8 @@
 -export
 (
    [
-      triggers_on/2
+      triggers_on/2,
+      apply/3
    ]
 ).
 
@@ -296,5 +299,30 @@ get_duration_field () -> #btl_cond.duration.
 -spec get_parameters_field () -> non_neg_integer().
 get_parameters_field () -> #btl_cond.parameters.
 
+-spec apply
+   (
+      type(),
+      trigger(),
+      btl_character_turn_update()
+   )
+   -> {trigger(), btl_character_turn_update:type()}.
+apply (S0Condition, S0Trigger, S0Update) ->
+   Module = shr_condition_selector:get_module(get_category(S0Condition)),
+
+   {S1Condition, UpdateAction, S1Trigger, S1Update} =
+      erlang:apply(Module, apply, [S0Trigger, S0Condition, S0Update]),
+
+   case UpdateAction of
+      none -> {S1Trigger, S1Update};
+      remove ->
+         % TODO
+         {S1Trigger, S1Update};
+
+      {update, ConditionUpdate} ->
+         % TODO
+         {S1Trigger, S1Update}
+
+   end.
+
 -spec encode (type()) -> {list({binary(), any()})}.
 encode (Condition) -> {[]} % TODO.