From 2d859e80c3e034b9f312df2cd9b2e70cd8766655 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 6 Sep 2019 17:44:29 +0200 Subject: Quick removal of omnimods from glyph boards. --- src/roster-editor/src/View/CharacterCard.elm | 4 ---- src/roster-editor/src/View/GlyphBoardSelection.elm | 3 --- .../BattleCharacters/Struct/GlyphBoard.elm | 13 +++---------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/roster-editor/src/View/CharacterCard.elm b/src/roster-editor/src/View/CharacterCard.elm index 8dc985f..4fca090 100644 --- a/src/roster-editor/src/View/CharacterCard.elm +++ b/src/roster-editor/src/View/CharacterCard.elm @@ -347,10 +347,6 @@ get_glyph_board_details damage_multiplier board = (Html.text (BattleCharacters.Struct.GlyphBoard.get_name board)) ] ), - (Battle.View.Omnimods.get_html_with_modifier - damage_multiplier - (BattleCharacters.Struct.GlyphBoard.get_omnimods board) - ), (Html.div [ (Html.Attributes.class "clickable"), diff --git a/src/roster-editor/src/View/GlyphBoardSelection.elm b/src/roster-editor/src/View/GlyphBoardSelection.elm index f661809..803b362 100644 --- a/src/roster-editor/src/View/GlyphBoardSelection.elm +++ b/src/roster-editor/src/View/GlyphBoardSelection.elm @@ -61,9 +61,6 @@ get_glyph_board_html glyph_board = (BattleCharacters.Struct.GlyphBoard.get_name glyph_board) ) ] - ), - (Battle.View.Omnimods.get_html - (BattleCharacters.Struct.GlyphBoard.get_omnimods glyph_board) ) ] ) diff --git a/src/shared/battle-characters/BattleCharacters/Struct/GlyphBoard.elm b/src/shared/battle-characters/BattleCharacters/Struct/GlyphBoard.elm index e8fa0f6..a8373e7 100644 --- a/src/shared/battle-characters/BattleCharacters/Struct/GlyphBoard.elm +++ b/src/shared/battle-characters/BattleCharacters/Struct/GlyphBoard.elm @@ -6,7 +6,6 @@ module BattleCharacters.Struct.GlyphBoard exposing get_name, get_id, get_slots, - get_omnimods, get_omnimods_with_glyphs, decoder, none, @@ -36,8 +35,7 @@ type alias Type = { id : String, name : String, - slots : (List Int), - omnimods : Battle.Struct.Omnimods.Type + slots : (List Int) } type alias Ref = String @@ -64,9 +62,6 @@ get_name g = g.name get_slots : Type -> (List Int) get_slots g = g.slots -get_omnimods : Type -> Battle.Struct.Omnimods.Type -get_omnimods g = g.omnimods - get_omnimods_with_glyphs : ( (Array.Array BattleCharacters.Struct.Glyph.Type) -> Type -> @@ -75,7 +70,7 @@ get_omnimods_with_glyphs : ( get_omnimods_with_glyphs glyphs board = (List.foldl (Battle.Struct.Omnimods.merge) - board.omnimods + (Battle.Struct.Omnimods.none) (List.map2 (Battle.Struct.Omnimods.scale) (List.map (\e -> ((toFloat e) / 100.0)) board.slots) @@ -95,7 +90,6 @@ decoder = "slot" (Json.Decode.list (Json.Decode.int)) ) - |> (Json.Decode.Pipeline.required "omni" Battle.Struct.Omnimods.decoder) ) none : Type @@ -103,8 +97,7 @@ none = { id = "", name = "None", - slots = [], - omnimods = (Battle.Struct.Omnimods.none) + slots = [] } default : Type -- cgit v1.2.3-70-g09d2