summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-06-14 11:17:07 +0200 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-06-14 11:17:07 +0200 |
commit | 3f928c81070ab3c9efa5b0dfd2ae97ca7f7efcf6 (patch) | |
tree | 4b339592db77ae83eb27ed9f5d7c83c3f293eb87 /src/shared/struct/shr_omnimods.erl | |
parent | 6d6232f352b033797ffd339666699c2b84251f84 (diff) |
Makes it pass Dialyzer's checks again.attributes_removal
Diffstat (limited to 'src/shared/struct/shr_omnimods.erl')
-rw-r--r-- | src/shared/struct/shr_omnimods.erl | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/src/shared/struct/shr_omnimods.erl b/src/shared/struct/shr_omnimods.erl index 081477d..fd35a94 100644 --- a/src/shared/struct/shr_omnimods.erl +++ b/src/shared/struct/shr_omnimods.erl @@ -10,7 +10,6 @@ ( omnimods, { - attmods :: mods(), stamods :: mods(), atkmods :: mods(), defmods :: mods() @@ -29,7 +28,7 @@ ( [ default/0, - new/4 + new/3 ] ). @@ -46,7 +45,6 @@ -export ( [ - apply_to_attributes/2, apply_to_statistics/2, get_attack_damage/3 ] @@ -90,32 +88,23 @@ encode_mods (Mods) -> %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% Creation --spec new -( - list(entry()), - list(entry()), - list(entry()), - list(entry()) - ) - -> type(). -new (AttributeMods, StatisticMods, AttackMods, DefenseMods) -> +-spec new (list(entry()), list(entry()), list(entry())) -> type(). +new (StatisticMods, AttackMods, DefenseMods) -> #omnimods { - attmods = dict:from_list(AttributeMods), stamods = dict:from_list(StatisticMods), atkmods = dict:from_list(AttackMods), defmods = dict:from_list(DefenseMods) }. -spec default () -> type(). -default () -> new([], [], [], []). +default () -> new([], [], []). %%% Modification -spec merge (type(), type()) -> type(). merge (OmniA, OmniB) -> OmniA#omnimods { - attmods = merge_mods(OmniA#omnimods.attmods, OmniB#omnimods.attmods), stamods = merge_mods(OmniA#omnimods.stamods, OmniB#omnimods.stamods), atkmods = merge_mods(OmniA#omnimods.atkmods, OmniB#omnimods.atkmods), defmods = merge_mods(OmniA#omnimods.defmods, OmniB#omnimods.defmods) @@ -125,27 +114,11 @@ merge (OmniA, OmniB) -> apply_coefficient (Coef, Omnimods) -> Omnimods#omnimods { - attmods = apply_coefficient_to_mods(Coef, Omnimods#omnimods.attmods), stamods = apply_coefficient_to_mods(Coef, Omnimods#omnimods.stamods), atkmods = apply_coefficient_to_mods(Coef, Omnimods#omnimods.atkmods), defmods = apply_coefficient_to_mods(Coef, Omnimods#omnimods.defmods) }. -%%% Access --spec apply_to_attributes - ( - type(), - shr_attributes:type() - ) - -> shr_attributes:type(). -apply_to_attributes (Omnimods, Attributes) -> - dict:fold - ( - fun shr_attributes:apply_mod/3, - Attributes, - Omnimods#omnimods.attmods - ). - -spec apply_to_statistics ( type(), @@ -223,7 +196,6 @@ get_attack_damage (AttackModifier, AttackerOmnimods, DefenderOmnimods) -> encode (Omnimods) -> { [ - {<<"attm">>, encode_mods(Omnimods#omnimods.attmods)}, {<<"stam">>, encode_mods(Omnimods#omnimods.stamods)}, {<<"atkm">>, encode_mods(Omnimods#omnimods.atkmods)}, {<<"defm">>, encode_mods(Omnimods#omnimods.defmods)} |