summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-09-06 17:44:29 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-09-06 17:44:29 +0200
commit2d859e80c3e034b9f312df2cd9b2e70cd8766655 (patch)
treec38bf3fe3c495d0c3fcad280ef2fa659dd8f87c9 /src
parentb07f636ea1e905f494c57fd2de03e8f36a4d5061 (diff)
Quick removal of omnimods from glyph boards.
Diffstat (limited to 'src')
-rw-r--r--src/roster-editor/src/View/CharacterCard.elm4
-rw-r--r--src/roster-editor/src/View/GlyphBoardSelection.elm3
-rw-r--r--src/shared/battle-characters/BattleCharacters/Struct/GlyphBoard.elm13
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