From 18bd70b35597a0581cfe59f07927e03492a8be81 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Thu, 12 Sep 2019 12:49:38 +0200
Subject: Adds min values when displaying omnimods in battle.

---
 src/shared/battle/Battle/View/Omnimods.elm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/shared/battle/Battle/View/Omnimods.elm')

diff --git a/src/shared/battle/Battle/View/Omnimods.elm b/src/shared/battle/Battle/View/Omnimods.elm
index 7af5709..b914bca 100644
--- a/src/shared/battle/Battle/View/Omnimods.elm
+++ b/src/shared/battle/Battle/View/Omnimods.elm
@@ -144,14 +144,18 @@ get_user_friendly_html : (
    )
 get_user_friendly_html omnimods =
    let
-      -- TODO: Add minimal values to omnimods (e.g. +1 to health).
+      omnimods_with_mins =
+         (Battle.Struct.Omnimods.merge_attributes
+            (Battle.Struct.Attributes.default)
+            omnimods
+         )
       scaled_omnimods =
          (Battle.Struct.Omnimods.apply_damage_modifier
             (Battle.Struct.Omnimods.get_attribute_mod
                Battle.Struct.Attributes.DamageModifier
-               omnimods
+               omnimods_with_mins
             )
-            omnimods
+            omnimods_with_mins
          )
    in
       (Html.div
@@ -167,7 +171,7 @@ get_user_friendly_html omnimods =
                   (\(k, v) ->
                      (Battle.View.DamageType.get_html
                         (Battle.Struct.DamageType.decode k)
-                        v
+                        (max 0 v)
                      )
                   )
                   (Battle.Struct.Omnimods.get_attack_mods scaled_omnimods)
@@ -181,10 +185,10 @@ get_user_friendly_html omnimods =
                   (\(k, v) ->
                      (Battle.View.DamageType.get_html
                         (Battle.Struct.DamageType.decode k)
-                        v
+                        (max 0 v)
                      )
                   )
-                  (Battle.Struct.Omnimods.get_defense_mods omnimods)
+                  (Battle.Struct.Omnimods.get_defense_mods scaled_omnimods)
                )
             ),
             (Html.div
@@ -195,10 +199,10 @@ get_user_friendly_html omnimods =
                   (\(k, v) ->
                      (Battle.View.Attribute.get_html
                         (Battle.Struct.Attributes.decode_category k)
-                        v
+                        (max 0 v)
                      )
                   )
-                  (Battle.Struct.Omnimods.get_attribute_mods omnimods)
+                  (Battle.Struct.Omnimods.get_attribute_mods scaled_omnimods)
                )
             )
          ]
-- 
cgit v1.2.3-70-g09d2