[Broken] ... 'battle' compiles again ...

10 files changed, 144 insertions, 74 deletions

diff --git a/src/battle/src/View/Character.elm b/src/battle/src/View/Character.elm
index d9c2b31..1213dc9 100644
--- a/src/battle/src/View/Character.elm
+++ b/src/battle/src/View/Character.elm
@@ -13,6 +13,8 @@ import Html.Events
 import Util.Html
 
 -- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Character
+import BattleCharacters.Struct.Equipment
 import BattleCharacters.Struct.Portrait
 
 import BattleCharacters.View.Portrait
@@ -121,7 +123,11 @@ get_icon_head_html char =
                "asset-character-icon-"
                ++
                (BattleCharacters.Struct.Portrait.get_icon_id
-                  (Struct.Character.get_portrait char)
+                  (BattleCharacters.Struct.Equipment.get_portrait
+                     (BattleCharacters.Struct.Character.get_equipment
+                        (Struct.Character.get_base_character char)
+                     )
+                  )
                )
             )
          )
@@ -190,7 +196,9 @@ get_portrait_html viewer_ix char =
             (Struct.Event.LookingForCharacter (Struct.Character.get_index char))
          )
       ]
-      char
+      (BattleCharacters.Struct.Character.get_equipment
+         (Struct.Character.get_base_character char)
+      )
    )
 
 get_icon_html : (
diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm
index 680e3fc..c3d1daf 100644
--- a/src/battle/src/View/Controlled/CharacterCard.elm
+++ b/src/battle/src/View/Controlled/CharacterCard.elm
@@ -16,6 +16,7 @@ import Html.Events
 import Util.Html
 
 -- Battle ----------------------------------------------------------------------
+import Battle.Struct.DamageType
 import Battle.Struct.Omnimods
 import Battle.Struct.Statistics
 
@@ -25,6 +26,8 @@ import Battle.View.DamageType
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.Armor
+import BattleCharacters.Struct.Character
+import BattleCharacters.Struct.Equipment
 import BattleCharacters.Struct.Weapon
 
 -- Local Module ----------------------------------------------------------------
@@ -51,7 +54,11 @@ get_name char =
          (Html.Attributes.class "character-card-name")
       ]
       [
-         (Html.text (Struct.Character.get_name char))
+         (Html.text
+            (BattleCharacters.Struct.Character.get_name
+               (Struct.Character.get_base_character char)
+            )
+         )
       ]
    )
 
@@ -64,7 +71,9 @@ get_health_bar char =
       current = (Struct.Character.get_sane_current_health char)
       max =
          (Battle.Struct.Statistics.get_max_health
-            (Struct.Character.get_statistics char)
+            (BattleCharacters.Struct.Character.get_statistics
+               (Struct.Character.get_base_character char)
+            )
          )
    in
       (Battle.View.Gauge.get_html
@@ -82,7 +91,7 @@ get_rank_status rank =
          (Html.Attributes.class "character-card-status"),
          (Html.Attributes.class "clickable"),
          (Html.Events.onClick
-            (Struct.Event.RequestedHelp (Struct.HelpRequest.HelpOnRank rank))
+            (Struct.Event.RequestedHelp (Struct.HelpRequest.Rank rank))
          ),
          (Html.Attributes.class
             (
@@ -125,7 +134,9 @@ get_active_movement_bar maybe_navigator char =
    let
       max =
          (Battle.Struct.Statistics.get_movement_points
-            (Struct.Character.get_statistics char)
+            (BattleCharacters.Struct.Character.get_statistics
+               (Struct.Character.get_base_character char)
+            )
          )
       current =
          case maybe_navigator of
@@ -151,19 +162,13 @@ get_inactive_movement_bar char =
    let
       max =
          (Battle.Struct.Statistics.get_movement_points
-            (Struct.Character.get_statistics char)
+            (BattleCharacters.Struct.Character.get_statistics
+               (Struct.Character.get_base_character char)
+            )
          )
    in
       (Battle.View.Gauge.get_html
-         (
-            "MP: "
-            ++
-            (String.fromInt
-               (Battle.Struct.Statistics.get_movement_points
-                  (Struct.Character.get_statistics char)
-               )
-            )
-         )
+         ( "MP: " ++ (String.fromInt max))
          100.0
          [(Html.Attributes.class "character-card-movement")]
          []
@@ -319,14 +324,17 @@ get_armor_details omnimods armor =
                (Html.text (BattleCharacters.Struct.Armor.get_name armor))
             ]
          ),
-         (List.map
-            (\(k, v) ->
-               (Battle.View.DamageType.get_html
-                  (Battle.Struct.DamageType.decode k)
-                  v
+         (Html.div
+            []
+            (List.map
+               (\(k, v) ->
+                  (Battle.View.DamageType.get_html
+                     (Battle.Struct.DamageType.decode k)
+                     v
+                  )
                )
+               (Battle.Struct.Omnimods.get_defense_mods omnimods)
             )
-            (Battle.Struct.Omnimods.get_defense_mods omnimods)
          )
       ]
    )
@@ -379,23 +387,15 @@ get_summary_html : (
    )
 get_summary_html char_turn player_ix char =
    let
-      is_using_primary = (Struct.Character.get_is_using_primary char)
-      active_weapon =
-         (
-            if (is_using_primary)
-            then (Struct.Character.get_primary_weapon char)
-            else (Struct.Character.get_secondary_weapon char)
-         )
-      inactive_weapon =
-         (
-            if (is_using_primary)
-            then (Struct.Character.get_secondary_weapon char)
-            else (Struct.Character.get_primary_weapon char)
-         )
-      char_statistics = (Struct.Character.get_statistics char)
+      base_char = (Struct.Character.get_base_character char)
+      char_statistics =
+         (BattleCharacters.Struct.Character.get_statistics base_char)
       damage_modifier =
-         (Battle.Struct.Statistics.get_damage_modifier char_statistics)
-      omnimods = (Struct.Character.get_current_omnimods char)
+         (Battle.Struct.Statistics.get_damage_modifier
+            char_statistics
+         )
+      omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char)
+      equipment = (BattleCharacters.Struct.Character.get_equipment base_char)
    in
       (Html.div
          [
@@ -422,15 +422,29 @@ get_summary_html char_turn player_ix char =
                   (get_statuses char)
                ]
             ),
-            (get_weapon_details omnimods damage_modifier active_weapon),
-            (get_armor_details omnimods (Struct.Character.get_armor char)),
+            (get_weapon_details
+               omnimods
+               damage_modifier
+               (BattleCharacters.Struct.Character.get_active_weapon
+                  base_char
+               )
+            ),
+            (get_armor_details
+               omnimods
+               (BattleCharacters.Struct.Equipment.get_armor equipment)
+            ),
             (Html.div
                []
                (Battle.View.Statistic.get_all_but_gauges_html
                   char_statistics
                )
             ),
-            (get_weapon_summary damage_modifier inactive_weapon)
+            (get_weapon_summary
+               damage_modifier
+               (BattleCharacters.Struct.Character.get_inactive_weapon
+                  base_char
+               )
+            )
          ]
       )
 
@@ -441,24 +455,15 @@ get_full_html : (
    )
 get_full_html player_ix char =
    let
-      is_using_primary = (Struct.Character.get_is_using_primary char)
-      active_weapon =
-         (
-            if (is_using_primary)
-            then (Struct.Character.get_primary_weapon char)
-            else (Struct.Character.get_secondary_weapon char)
-         )
-      inactive_weapon =
-         (
-            if (is_using_primary)
-            then (Struct.Character.get_secondary_weapon char)
-            else (Struct.Character.get_primary_weapon char)
-         )
-      char_statistics = (Struct.Character.get_statistics char)
+      base_char = (Struct.Character.get_base_character char)
+      char_statistics =
+         (BattleCharacters.Struct.Character.get_statistics base_char)
       damage_modifier =
-         (Battle.Struct.Statistics.get_damage_modifier char_statistics)
-      omnimods = (Struct.Character.get_current_omnimods char)
-      armor = (Struct.Character.get_armor char)
+         (Battle.Struct.Statistics.get_damage_modifier
+            char_statistics
+         )
+      omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char)
+      equipment = (BattleCharacters.Struct.Character.get_equipment base_char)
    in
       (Html.div
          [
@@ -486,14 +491,28 @@ get_full_html player_ix char =
                   (get_statuses char)
                ]
             ),
-            (get_weapon_details omnimods damage_modifier active_weapon),
-            (get_armor_details omnimods armor),
+            (get_weapon_details
+               omnimods
+               damage_modifier
+               (BattleCharacters.Struct.Character.get_active_weapon
+                  base_char
+               )
+            ),
+            (get_armor_details
+               omnimods
+               (BattleCharacters.Struct.Equipment.get_armor equipment)
+            ),
             (Html.div
                []
                (Battle.View.Statistic.get_all_but_gauges_html
                   char_statistics
                )
             ),
-            (get_weapon_summary damage_modifier inactive_weapon)
+            (get_weapon_summary
+               damage_modifier
+               (BattleCharacters.Struct.Character.get_inactive_weapon
+                  base_char
+               )
+            )
          ]
       )
diff --git a/src/battle/src/View/Map/Character.elm b/src/battle/src/View/Map/Character.elm
index 6031cff..65c1f03 100644
--- a/src/battle/src/View/Map/Character.elm
+++ b/src/battle/src/View/Map/Character.elm
@@ -10,6 +10,8 @@ import Util.Html
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.Portrait
+import BattleCharacters.Struct.Character
+import BattleCharacters.Struct.Equipment
 
 -- Local Module ----------------------------------------------------------------
 import Constants.UI
@@ -151,7 +153,11 @@ get_head_html char =
          (Html.Attributes.class
             ("asset-character-icon-" ++
                (BattleCharacters.Struct.Portrait.get_icon_id
-                  (Struct.Character.get_portrait char)
+                  (BattleCharacters.Struct.Equipment.get_portrait
+                     (BattleCharacters.Struct.Character.get_equipment
+                        (Struct.Character.get_base_character char)
+                     )
+                  )
                )
             )
          )
diff --git a/src/battle/src/View/MessageBoard/Animator/Attack.elm b/src/battle/src/View/MessageBoard/Animator/Attack.elm
index 93a5e8a..9fd419c 100644
--- a/src/battle/src/View/MessageBoard/Animator/Attack.elm
+++ b/src/battle/src/View/MessageBoard/Animator/Attack.elm
@@ -6,6 +6,9 @@ import Array
 import Html
 import Html.Attributes
 
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Character
+
 -- Local Module ----------------------------------------------------------------
 import Struct.Attack
 import Struct.Character
@@ -61,8 +64,14 @@ get_attack_html : (
    )
 get_attack_html attacker defender attack =
    let
-      attacker_name = (Struct.Character.get_name attacker)
-      defender_name = (Struct.Character.get_name defender)
+      attacker_name =
+         (BattleCharacters.Struct.Character.get_name
+            (Struct.Character.get_base_character attacker)
+         )
+      defender_name =
+         (BattleCharacters.Struct.Character.get_name
+            (Struct.Character.get_base_character defender)
+         )
    in
       (Html.div
          [
diff --git a/src/battle/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm
index 6b8480f..68d6136 100644
--- a/src/battle/src/View/MessageBoard/Help.elm
+++ b/src/battle/src/View/MessageBoard/Help.elm
@@ -31,7 +31,9 @@ get_html model =
             Struct.HelpRequest.None ->
                (View.MessageBoard.Help.Guide.get_html_contents model)
 
-            (Struct.HelpRequest.HelpOnRank rank) ->
+            (Struct.HelpRequest.Rank rank) ->
                (View.MessageBoard.Help.Rank.get_html_contents rank)
+
+            _ -> [(Html.text "Help is not available for this, yet.")]
       )
    )
diff --git a/src/battle/src/View/SubMenu/Timeline/Attack.elm b/src/battle/src/View/SubMenu/Timeline/Attack.elm
index 9bd7e57..7301126 100644
--- a/src/battle/src/View/SubMenu/Timeline/Attack.elm
+++ b/src/battle/src/View/SubMenu/Timeline/Attack.elm
@@ -6,6 +6,9 @@ import Array
 import Html
 import Html.Attributes
 
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Character
+
 -- Local Module ----------------------------------------------------------------
 import Struct.Attack
 import Struct.Event
@@ -30,9 +33,14 @@ get_title_html attacker defender =
       [
          (Html.text
             (
-               (Struct.Character.get_name attacker)
+               (BattleCharacters.Struct.Character.get_name
+                  (Struct.Character.get_base_character attacker)
+               )
                ++ " attacked "
-               ++ (Struct.Character.get_name defender)
+               ++
+               (BattleCharacters.Struct.Character.get_name
+                  (Struct.Character.get_base_character defender)
+               )
                ++ "!"
             )
          )
@@ -74,8 +82,14 @@ get_attack_html : (
    )
 get_attack_html attacker defender attack =
    let
-      attacker_name = (Struct.Character.get_name attacker)
-      defender_name = (Struct.Character.get_name defender)
+      attacker_name =
+         (BattleCharacters.Struct.Character.get_name
+            (Struct.Character.get_base_character attacker)
+         )
+      defender_name =
+         (BattleCharacters.Struct.Character.get_name
+            (Struct.Character.get_base_character defender)
+         )
    in
    (Html.div
       []
diff --git a/src/battle/src/View/SubMenu/Timeline/Movement.elm b/src/battle/src/View/SubMenu/Timeline/Movement.elm
index 7235026..3ef305e 100644
--- a/src/battle/src/View/SubMenu/Timeline/Movement.elm
+++ b/src/battle/src/View/SubMenu/Timeline/Movement.elm
@@ -6,6 +6,9 @@ import Array
 import Html
 import Html.Attributes
 
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Character
+
 -- Local Module ----------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
@@ -38,7 +41,9 @@ get_html characters player_ix movement =
                (View.Character.get_portrait_html player_ix char),
                (Html.text
                   (
-                     (Struct.Character.get_name char)
+                     (BattleCharacters.Struct.Character.get_name
+                        (Struct.Character.get_base_character char)
+                     )
                      ++ " moved to ("
                      ++ (String.fromInt movement.destination.x)
                      ++ ", "
diff --git a/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
index 025c2b9..50fd702 100644
--- a/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
+++ b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
@@ -6,6 +6,9 @@ import Array
 import Html
 import Html.Attributes
 
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Character
+
 -- Local Module ----------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
@@ -38,7 +41,9 @@ get_html characters player_ix weapon_switch =
                (View.Character.get_portrait_html player_ix char),
                (Html.text
                   (
-                     (Struct.Character.get_name char)
+                     (BattleCharacters.Struct.Character.get_name
+                        (Struct.Character.get_base_character char)
+                     )
                      ++ " switched weapons."
                   )
                )
diff --git a/src/shared/battle-characters/BattleCharacters/View/Portrait.elm b/src/shared/battle-characters/BattleCharacters/View/Portrait.elm
index 50c5c4c..37b6d1f 100644
--- a/src/shared/battle-characters/BattleCharacters/View/Portrait.elm
+++ b/src/shared/battle-characters/BattleCharacters/View/Portrait.elm
@@ -57,7 +57,7 @@ get_portrait_armor_html equipment =
                "asset-armor-"
                ++
                (BattleCharacters.Struct.Armor.get_image_id
-                  (BattleCharacters.Equipment.get_armor equipment)
+                  (BattleCharacters.Struct.Equipment.get_armor equipment)
                )
             )
          ),
@@ -80,7 +80,7 @@ get_portrait_armor_html equipment =
 --------------------------------------------------------------------------------
 get_html : (
       (List (Html.Attribute Struct.Event.Type)) ->
-      BattleCharacters.Equipment.Type ->
+      BattleCharacters.Struct.Equipment.Type ->
       (Html.Html Struct.Event.Type)
    )
 get_html extra_attributes equipment =
diff --git a/src/shared/battle/Battle/View/Statistic.elm b/src/shared/battle/Battle/View/Statistic.elm
index a3ac669..0ced0dc 100644
--- a/src/shared/battle/Battle/View/Statistic.elm
+++ b/src/shared/battle/Battle/View/Statistic.elm
@@ -2,8 +2,10 @@ module Battle.View.Statistic exposing
    (
       get_html,
       get_all_html,
+      get_all_but_gauges_html,
       get_signed_html,
-      get_all_signed_html
+      get_all_signed_html,
+      get_all_but_gauges_signed_html
    )
 
 -- Elm -------------------------------------------------------------------------