| summaryrefslogtreecommitdiff | 
diff options
Diffstat (limited to 'src/roster-editor')
| -rw-r--r-- | src/roster-editor/src/Struct/HelpRequest.elm | 2 | ||||
| -rw-r--r-- | src/roster-editor/src/View/CharacterCard.elm | 38 | ||||
| -rw-r--r-- | src/roster-editor/src/View/MessageBoard/Help.elm | 4 | 
3 files changed, 10 insertions, 34 deletions
| diff --git a/src/roster-editor/src/Struct/HelpRequest.elm b/src/roster-editor/src/Struct/HelpRequest.elm index 6fa0af2..5bfa96f 100644 --- a/src/roster-editor/src/Struct/HelpRequest.elm +++ b/src/roster-editor/src/Struct/HelpRequest.elm @@ -1,7 +1,6 @@  module Struct.HelpRequest exposing (Type(..))  -- Battle ---------------------------------------------------------------------- -import Battle.Struct.Attributes  import Battle.Struct.Statistics  import Battle.Struct.DamageType @@ -10,6 +9,5 @@ import Battle.Struct.DamageType  --------------------------------------------------------------------------------  type Type =     None -   | Attribute Battle.Struct.Attributes.Category     | Statistic Battle.Struct.Statistics.Category     | DamageType Battle.Struct.DamageType.Type diff --git a/src/roster-editor/src/View/CharacterCard.elm b/src/roster-editor/src/View/CharacterCard.elm index f7c9513..8a0eb71 100644 --- a/src/roster-editor/src/View/CharacterCard.elm +++ b/src/roster-editor/src/View/CharacterCard.elm @@ -12,13 +12,11 @@ import Html.Attributes  import Html.Events  -- Battle ---------------------------------------------------------------------- -import Battle.Struct.Attributes  import Battle.Struct.Omnimods  import Battle.Struct.Statistics  import Battle.View.Omnimods  import Battle.View.Statistic -import Battle.View.Attribute  -- Battle Characters -----------------------------------------------------------  import BattleCharacters.Struct.Armor @@ -301,7 +299,7 @@ get_armor_details : (        BattleCharacters.Struct.Armor.Type ->        (Html.Html Struct.Event.Type)     ) -get_armor_details damage_modifier armor = +get_armor_details damage_multiplier armor =     (Html.div        [           (Html.Attributes.class "character-card-armor"), @@ -320,7 +318,7 @@ get_armor_details damage_modifier armor =              ]           ),           (Battle.View.Omnimods.get_html_with_modifier -            damage_modifier +            damage_multiplier              (BattleCharacters.Struct.Armor.get_omnimods armor)           )        ] @@ -331,7 +329,7 @@ get_glyph_board_details : (        BattleCharacters.Struct.GlyphBoard.Type ->        (Html.Html Struct.Event.Type)     ) -get_glyph_board_details damage_modifier board = +get_glyph_board_details damage_multiplier board =     (Html.div        [           (Html.Attributes.class "character-card-glyph-board") @@ -350,7 +348,7 @@ get_glyph_board_details damage_modifier board =              ]           ),           (Battle.View.Omnimods.get_html_with_modifier -            damage_modifier +            damage_multiplier              (BattleCharacters.Struct.GlyphBoard.get_omnimods board)           ),           (Html.div @@ -380,19 +378,6 @@ get_relevant_stats stats =        (Battle.View.Statistic.get_all_but_gauges_html stats)     ) -get_attributes : ( -      Battle.Struct.Attributes.Type -> -      (Html.Html Struct.Event.Type) -   ) -get_attributes atts = -   (Html.div -      [ -         (Html.Attributes.class "character-card-atts") -      ] -      (Battle.View.Attribute.get_all_html atts) -   ) - -  --------------------------------------------------------------------------------  -- EXPORTED --------------------------------------------------------------------  -------------------------------------------------------------------------------- @@ -445,8 +430,8 @@ get_full_html 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 +      damage_multiplier = +         (Battle.Struct.Statistics.get_damage_multiplier              char_statistics           )        omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char) @@ -487,24 +472,21 @@ get_full_html char =                 ]              ),              (get_weapon_details -               damage_modifier +               damage_multiplier                 (BattleCharacters.Struct.Equipment.get_primary_weapon equipment)                 (not is_using_secondary)              ),              (get_armor_details -               damage_modifier +               damage_multiplier                 (BattleCharacters.Struct.Equipment.get_armor equipment)              ),              (get_glyph_board_details -               damage_modifier +               damage_multiplier                 (BattleCharacters.Struct.Equipment.get_glyph_board equipment)              ),              (get_relevant_stats char_statistics), -            (get_attributes -               (BattleCharacters.Struct.Character.get_attributes base_char) -            ),              (get_weapon_details -               damage_modifier +               damage_multiplier                 (BattleCharacters.Struct.Equipment.get_secondary_weapon                    equipment                 ) diff --git a/src/roster-editor/src/View/MessageBoard/Help.elm b/src/roster-editor/src/View/MessageBoard/Help.elm index 4c64601..b6d29a2 100644 --- a/src/roster-editor/src/View/MessageBoard/Help.elm +++ b/src/roster-editor/src/View/MessageBoard/Help.elm @@ -5,7 +5,6 @@ import Html  import Html.Attributes  -- Battle ---------------------------------------------------------------------- -import Battle.View.Help.Attribute  import Battle.View.Help.DamageType  import Battle.View.Help.Statistic @@ -35,9 +34,6 @@ get_html model =              Struct.HelpRequest.None ->                 (View.MessageBoard.Help.Guide.get_html_contents model) -            (Struct.HelpRequest.Attribute att_cat) -> -               (Battle.View.Help.Attribute.get_html_contents att_cat) -              (Struct.HelpRequest.Statistic stat_cat) ->                 (Battle.View.Help.Statistic.get_html_contents stat_cat) | 


