| summaryrefslogtreecommitdiff | 
diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/battle/Battle/Struct/Omnimods.elm | 11 | ||||
| -rw-r--r-- | src/shared/battle/Battle/View/Omnimods.elm | 69 | 
2 files changed, 76 insertions, 4 deletions
| diff --git a/src/shared/battle/Battle/Struct/Omnimods.elm b/src/shared/battle/Battle/Struct/Omnimods.elm index 2b3c011..e9c3089 100644 --- a/src/shared/battle/Battle/Struct/Omnimods.elm +++ b/src/shared/battle/Battle/Struct/Omnimods.elm @@ -195,9 +195,14 @@ scale multiplier omnimods =           (Dict.map (scale_dict_value multiplier) omnimods.defense)     } -get_attribute_mod : String -> Type -> Int -get_attribute_mod att_name omnimods = -   case (Dict.get att_name omnimods.attributes) of +get_attribute_mod : Battle.Struct.Attributes.Category -> Type -> Int +get_attribute_mod att omnimods = +   case +      (Dict.get +         (Battle.Struct.Attributes.encode_category att) +         omnimods.attributes +      ) +   of        (Just e) -> e        Nothing -> 0 diff --git a/src/shared/battle/Battle/View/Omnimods.elm b/src/shared/battle/Battle/View/Omnimods.elm index 8d8c4ce..7af5709 100644 --- a/src/shared/battle/Battle/View/Omnimods.elm +++ b/src/shared/battle/Battle/View/Omnimods.elm @@ -1,7 +1,8 @@  module Battle.View.Omnimods exposing     (        get_html_with_modifier, -      get_html +      get_html, +      get_user_friendly_html     )  -- Elm ------------------------------------------------------------------------- @@ -136,3 +137,69 @@ get_html omnimods =           )        ]     ) + +get_user_friendly_html : ( +      Battle.Struct.Omnimods.Type -> +      (Html.Html Struct.Event.Type) +   ) +get_user_friendly_html omnimods = +   let +      -- TODO: Add minimal values to omnimods (e.g. +1 to health). +      scaled_omnimods = +         (Battle.Struct.Omnimods.apply_damage_modifier +            (Battle.Struct.Omnimods.get_attribute_mod +               Battle.Struct.Attributes.DamageModifier +               omnimods +            ) +            omnimods +         ) +   in +      (Html.div +         [ +            (Html.Attributes.class "omnimod-listing") +         ] +         [ +            (Html.div +               [ +                  (Html.Attributes.class "omnimod-attack-mods") +               ] +               (List.map +                  (\(k, v) -> +                     (Battle.View.DamageType.get_html +                        (Battle.Struct.DamageType.decode k) +                        v +                     ) +                  ) +                  (Battle.Struct.Omnimods.get_attack_mods scaled_omnimods) +               ) +            ), +            (Html.div +               [ +                  (Html.Attributes.class "omnimod-defense-mods") +               ] +               (List.map +                  (\(k, v) -> +                     (Battle.View.DamageType.get_html +                        (Battle.Struct.DamageType.decode k) +                        v +                     ) +                  ) +                  (Battle.Struct.Omnimods.get_defense_mods omnimods) +               ) +            ), +            (Html.div +               [ +                  (Html.Attributes.class "omnimod-attributes-mods") +               ] +               (List.map +                  (\(k, v) -> +                     (Battle.View.Attribute.get_html +                        (Battle.Struct.Attributes.decode_category k) +                        v +                     ) +                  ) +                  (Battle.Struct.Omnimods.get_attribute_mods omnimods) +               ) +            ) +         ] +      ) | 


