| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/src/Update/HandleServerReply.elm | 62 | ||||
| -rw-r--r-- | src/battle/src/View/Controlled/CharacterCard.elm | 6 |
2 files changed, 8 insertions, 60 deletions
diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm index 9d1aa24..f13118e 100644 --- a/src/battle/src/Update/HandleServerReply.elm +++ b/src/battle/src/Update/HandleServerReply.elm @@ -52,58 +52,6 @@ import Struct.UI -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- -weapon_getter : ( - Struct.Model.Type -> - BattleCharacters.Struct.Weapon.Ref -> - BattleCharacters.Struct.Weapon.Type - ) -weapon_getter model ref = - case (Dict.get ref model.weapons) of - (Just w) -> w - Nothing -> BattleCharacters.Struct.Weapon.none - -armor_getter : ( - Struct.Model.Type -> - BattleCharacters.Struct.Armor.Ref -> - BattleCharacters.Struct.Armor.Type - ) -armor_getter model ref = - case (Dict.get ref model.armors) of - (Just w) -> w - Nothing -> BattleCharacters.Struct.Armor.none - -portrait_getter : ( - Struct.Model.Type -> - BattleCharacters.Struct.Portrait.Ref -> - BattleCharacters.Struct.Portrait.Type - ) -portrait_getter model ref = - case (Dict.get ref model.portraits) of - (Just w) -> w - Nothing -> BattleCharacters.Struct.Portrait.default - -glyph_board_getter : ( - Struct.Model.Type -> - BattleCharacters.Struct.GlyphBoard.Ref -> - BattleCharacters.Struct.GlyphBoard.Type - ) -glyph_board_getter model ref = - case (Dict.get ref model.glyph_boards) of - (Just w) -> w - Nothing -> BattleCharacters.Struct.GlyphBoard.default - -glyph_getter : ( - Struct.Model.Type -> - BattleCharacters.Struct.Glyph.Ref -> - BattleCharacters.Struct.Glyph.Type - ) -glyph_getter model ref = - case (Dict.get ref model.glyphs) of - (Just w) -> w - Nothing -> BattleCharacters.Struct.Glyph.default - ------------ - disconnected : ( (Struct.Model.Type, (List (Cmd Struct.Event.Type))) -> (Struct.Model.Type, (List (Cmd Struct.Event.Type))) @@ -204,11 +152,11 @@ add_character unresolved_char current_state = (Struct.Character.resolve (Struct.Model.tile_omnimods_fun model) (BattleCharacters.Struct.Equipment.resolve - (weapon_getter model) - (armor_getter model) - (portrait_getter model) - (glyph_board_getter model) - (glyph_getter model) + (BattleCharacters.Struct.Weapon.find model.weapons) + (BattleCharacters.Struct.Armor.find model.armors) + (BattleCharacters.Struct.Portrait.find model.portraits) + (BattleCharacters.Struct.GlyphBoard.find model.glyph_boards) + (BattleCharacters.Struct.Glyph.find model.glyphs) ) unresolved_char ) diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm index 785cc02..e64b7f8 100644 --- a/src/battle/src/View/Controlled/CharacterCard.elm +++ b/src/battle/src/View/Controlled/CharacterCard.elm @@ -46,7 +46,7 @@ get_name : ( BattleCharacters.Struct.Character.Type -> (Html.Html Struct.Event.Type) ) -get_name char = +get_name base_char = (Html.div [ (Html.Attributes.class "info-card-name"), @@ -54,7 +54,7 @@ get_name char = (Html.Attributes.class "character-card-name") ] [ - (Html.text (BattleCharacters.Struct.Character.get_name char)) + (Html.text (BattleCharacters.Struct.Character.get_name base_char)) ] ) @@ -399,7 +399,7 @@ get_summary_html char_turn player_ix char = (Html.Attributes.class "character-card") ] [ - (get_name char), + (get_name base_char), (Html.div [ (Html.Attributes.class "info-card-top"), |