| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle/struct')
| -rw-r--r-- | src/battle/struct/btl_character.erl | 46 | ||||
| -rw-r--r-- | src/battle/struct/btl_condition.erl | 131 |
2 files changed, 135 insertions, 42 deletions
diff --git a/src/battle/struct/btl_character.erl b/src/battle/struct/btl_character.erl index 6dffd6b..7771b1a 100644 --- a/src/battle/struct/btl_character.erl +++ b/src/battle/struct/btl_character.erl @@ -7,7 +7,7 @@ -define(IS_ACTIVE_FIELD, <<"ena">>). -define(IS_DEFEATED_FIELD, <<"dea">>). -define(BASE_CHAR_FIELD, <<"bas">>). --define(CONDITION_FIELD, <<"con">>). +-define(CONDITIONS_FIELD, <<"con">>). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -25,7 +25,7 @@ is_active :: boolean(), is_defeated :: boolean(), base :: shr_character:unresolved(), - conditions :: list(btl_condition:type()) + conditions :: orddict:orddict(non_neg_integer(), btl_condition:type()) } ). @@ -40,7 +40,7 @@ is_active :: boolean(), is_defeated :: boolean(), base :: shr_character:type(), - conditions :: list(btl_condition:type()) + conditions :: orddict:orddict(non_neg_integer(), btl_condition:type()) } ). @@ -105,7 +105,7 @@ -export ( [ - new/4, + new/5, resolve/2, is_unresolved/1, to_unresolved/1, @@ -194,8 +194,8 @@ get_base_character (#btl_char{ base = R }) -> R; get_base_character (#btl_char_ref{ base = R }) -> R. -spec get_conditions - (type()) -> list(btl_condition:type()); - (unresolved()) -> list(btl_conditions:type()). + (type()) -> orddict:orddict(non_neg_integer(), btl_condition:type()); + (unresolved()) -> orddict:orddict(non_neg_integer(), btl_conditions:type()). get_conditions (#btl_char{ conditions = R }) -> R; get_conditions (#btl_char_ref{ conditions = R }) -> R. @@ -204,11 +204,11 @@ get_conditions (#btl_char_ref{ conditions = R }) -> R. shr_condition:trigger(), either() ) - -> list(btl_condition:type()). + -> orddict:orddict(non_neg_integer(), btl_condition:type()). get_conditions_on (Trigger, Char) -> - lists:filter + orddict:filter ( - fun (Condition) -> + fun (_IX, Condition) -> btl_condition:triggers_on(Trigger, Condition) end, get_conditions(Char) @@ -448,8 +448,16 @@ ataxia_set_base_character (NewBaseCharacter, Char) -> ). -spec set_conditions - (list(btl_condition:type()), type()) -> type(); - (list(btl_condition:type()), unresolved()) -> unresolved(). + ( + orddict:orddict(non_neg_integer(), btl_condition:type()), + type() + ) + -> type(); + ( + orddict:orddict(non_neg_integer(), btl_condition:type()), + unresolved() + ) + -> unresolved(). set_conditions (Conditions, Char) when is_record(Char, btl_char) -> Char#btl_char{ conditions = Conditions }; set_conditions (Conditions, Char) when is_record(Char, btl_char_ref) -> @@ -458,13 +466,13 @@ set_conditions (Conditions, Char) when is_record(Char, btl_char_ref) -> -spec ataxia_set_conditions ( - list(btl_condition:type()), + orddict:orddict(non_neg_integer(), btl_condition:type()), ataxic:basic(), type() ) -> {type(), ataxic:basic()}; ( - list(btl_condition:type()), + orddict:orddict(non_neg_integer(), btl_condition:type()), ataxic:basic(), unresolved() ) -> {unresolved(), ataxic:basic()}. @@ -479,8 +487,16 @@ ataxia_set_conditions (Conditions, Update, Char) -> }. -spec ataxia_set_conditions - (list(btl_condition:type()), type()) -> {type(), ataxic:basic()}; - (list(btl_condition:type()), unresolved()) -> {unresolved(), ataxic:basic()}. + ( + orddict:orddict(non_neg_integer(), btl_condition:type()), + type() + ) + -> {type(), ataxic:basic()}; + ( + orddict:orddict(non_neg_integer(), btl_condition:type()), + unresolved() + ) + -> {unresolved(), ataxic:basic()}. ataxia_set_conditions (Conditions, Char) -> ataxia_set_conditions ( diff --git a/src/battle/struct/btl_condition.erl b/src/battle/struct/btl_condition.erl index 24ef084..fee7279 100644 --- a/src/battle/struct/btl_condition.erl +++ b/src/battle/struct/btl_condition.erl @@ -5,7 +5,12 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -include("tacticians/conditions.hrl"). --type update_action() :: (none, remove, {update, ataxic:basic()}). +-type update_action() :: + ( + none + | remove + | {update, type(), ataxic:basic()} + ). -record ( @@ -61,7 +66,9 @@ [ triggers_on/2, apply/3, - recursive_apply/3 + recursive_apply/3, + apply_updates/2, + ataxia_apply_updates/2 ] ). @@ -234,47 +241,117 @@ get_parameters_field () -> #btl_cond.parameters. shr_condition:context(), btl_character_turn_update:type() ) - -> {shr_condition:context(), btl_character_turn_update:type()}. -apply (S0Condition, S0Context, S0Update) -> - Module = shr_condition_selector:get_module(get_category(S0Condition)), - - {S1Condition, UpdateAction, S1Context, S1Update} = - erlang:apply(Module, apply, [S0Context, S0Condition, S0Update]), + -> + { + shr_condition:context(), + btl_character_turn_update:type(), + update_action() + }. +apply (Condition, S0Context, S0Update) -> + Module = shr_condition_selector:get_module(get_category(Condition)), - case UpdateAction of - none -> {S1Context, S1Update}; - remove -> - % TODO - {S1Context, S1Update}; + {S1Context, S1Update, UpdateAction} = + erlang:apply(Module, apply, [S0Context, Condition, S0Update]), - {update, ConditionUpdate} -> - % TODO - {S1Context, S1Update} + {S1Context, S1Update, UpdateAction}. - end. -spec recursive_apply ( - list(type()), + orddict:orddict(IndexType, type()), shr_condition:context(), btl_character_turn_update:type() ) - -> {shr_condition:context(), btl_character_turn_update:type()}. + -> + { + shr_condition:context(), + btl_character_turn_update:type(), + list({IndexType, update_action()}) + }. recursive_apply (Conditions, S0Context, S0Update) -> - [LastContext, LastUpdate] = - lists:foldl + {[LastContext, LastUpdate], AllUpdateActions} = + orddict:fold ( - fun (Condition, Parameters) -> - {NextContext, NextUpdate} = + fun (IX, Condition, {Parameters, UpdateActions}) -> + {NextContext, NextUpdate, UpdateAction} = erlang:apply(btl_condition, apply, [Condition|Parameters]), - [NextContext, NextUpdate] + { + [NextContext, NextUpdate], + case UpdateAction of + none -> UpdateActions; + _ -> [{IX, UpdateAction}|UpdateActions] + end + } end, - [S0Context, S0Update], + [S0Context, S0Update, []], Conditions ), - {LastContext, LastUpdate}. + {LastContext, LastUpdate, AllUpdateActions}. + +-spec apply_updates + ( + list({IndexType, update_action()}), + orddict:orddict(IndexType, type()) + ) + -> orddict:orddict(IndexType, type()). +apply_updates (Updates, Conditions) -> + lists:foldl + ( + fun ({IX, Update}, CurrentConditions) -> + case Update of + none -> CurrentConditions; + remove -> orddict:erase(IX, CurrentConditions); + {update, Val, _Ataxic} -> orddict:store(IX, Val, CurrentConditions) + end + end, + Conditions, + Updates + ). + +-spec ataxia_apply_updates + ( + list({IndexType, update_action()}), + orddict:orddict(IndexType, type()) + ) + -> {orddict:orddict(IndexType, type()), ataxic:basic()}. +ataxia_apply_updates (Updates, Conditions) -> + {FinalConditions, AtaxicSequence} = + lists:foldl + ( + fun ({IX, Update}, {CurrentConditions, AtaxicUpdates}) -> + case Update of + none -> {CurrentConditions, AtaxicUpdates}; + remove -> + { + orddict:erase(IX, CurrentConditions), + [ + ataxic:apply_function + ( + orddict, + erase, + [ataxic:constant(IX), ataxic:current_value()] + ) + |AtaxicUpdates + ] + }; + + {update, Val, Ataxic} -> + { + orddict:store(IX, Val, CurrentConditions), + [ + ataxic_sugar:update_orddict_element(IX, Ataxic) + |AtaxicUpdates + ] + } + end + end, + Conditions, + Updates + ), + + {FinalConditions, ataxic:sequence(AtaxicSequence)}. -spec encode (type()) -> {list({binary(), any()})}. -encode (Condition) -> {[]} % TODO. +encode (Condition) -> {[]}. % TODO |