From 48d576fc30487769fb0fc980533d85a80f6f4f13 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Thu, 31 Jan 2019 18:54:52 +0100 Subject: Adds a few more icons... --- src/asset/www/svg/damage_type/2hits.svg | 92 ++++++++++++++++++++++ src/asset/www/svg/damage_type/accuracy.svg | 86 ++++++++++++++++++++ src/asset/www/svg/damage_type/damage.svg | 78 ++++++++++++++++++ src/asset/www/svg/damage_type/impact.svg | 16 ++-- src/asset/www/svg/damage_type/parry.svg | 92 ++++++++++++++++++++++ src/asset/www/svg/damage_type/piercing.svg | 7 +- src/asset/www/svg/damage_type/slash.svg | 79 +++++++++++++++++++ src/battle/src/View/Controlled/CharacterCard.elm | 14 ++-- src/css/src/battle.scss | 1 + src/css/src/battle/info-card/character.scss | 10 +++ src/css/src/roster-editor.scss | 1 + src/css/src/roster-editor/info-card/character.scss | 10 +++ src/css/src/shared/omnimod-icons.scss | 29 +++++++ src/roster-editor/src/View/CharacterCard.elm | 14 ++-- 14 files changed, 509 insertions(+), 20 deletions(-) create mode 100644 src/asset/www/svg/damage_type/2hits.svg create mode 100644 src/asset/www/svg/damage_type/accuracy.svg create mode 100644 src/asset/www/svg/damage_type/damage.svg create mode 100644 src/asset/www/svg/damage_type/parry.svg create mode 100644 src/asset/www/svg/damage_type/slash.svg create mode 100644 src/css/src/shared/omnimod-icons.scss (limited to 'src') diff --git a/src/asset/www/svg/damage_type/2hits.svg b/src/asset/www/svg/damage_type/2hits.svg new file mode 100644 index 0000000..e457600 --- /dev/null +++ b/src/asset/www/svg/damage_type/2hits.svg @@ -0,0 +1,92 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/asset/www/svg/damage_type/accuracy.svg b/src/asset/www/svg/damage_type/accuracy.svg new file mode 100644 index 0000000..576de93 --- /dev/null +++ b/src/asset/www/svg/damage_type/accuracy.svg @@ -0,0 +1,86 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/asset/www/svg/damage_type/damage.svg b/src/asset/www/svg/damage_type/damage.svg new file mode 100644 index 0000000..4fa0728 --- /dev/null +++ b/src/asset/www/svg/damage_type/damage.svg @@ -0,0 +1,78 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/asset/www/svg/damage_type/impact.svg b/src/asset/www/svg/damage_type/impact.svg index f5fe339..6709857 100644 --- a/src/asset/www/svg/damage_type/impact.svg +++ b/src/asset/www/svg/damage_type/impact.svg @@ -13,6 +13,7 @@ height="16mm" viewBox="0 0 16 16" version="1.1" + shape-rendering="optimizeQuality" id="svg8" inkscape:version="0.92.2 2405546, 2018-03-11" sodipodi:docname="impact.svg"> @@ -25,9 +26,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.82843" - inkscape:cx="-122.709" - inkscape:cy="31.755" + inkscape:zoom="4" + inkscape:cx="-10.7734" + inkscape:cy="25.7162" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -38,7 +39,8 @@ inkscape:window-height="1029" inkscape:window-x="1" inkscape:window-y="516" - inkscape:window-maximized="0" /> + inkscape:window-maximized="0" + inkscape:pagecheckerboard="true" /> @@ -47,7 +49,7 @@ image/svg+xml - + @@ -57,13 +59,13 @@ id="layer1" transform="translate(0,-281)"> + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/asset/www/svg/damage_type/piercing.svg b/src/asset/www/svg/damage_type/piercing.svg index ba8d992..88182a5 100644 --- a/src/asset/www/svg/damage_type/piercing.svg +++ b/src/asset/www/svg/damage_type/piercing.svg @@ -15,6 +15,7 @@ version="1.1" id="svg8" inkscape:version="0.92.2 2405546, 2018-03-11" + shape-rendering="optimizeQuality" sodipodi:docname="piercing.svg"> @@ -26,7 +27,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8" - inkscape:cx="-3.29987" + inkscape:cx="-7.3203" inkscape:cy="28.2475" inkscape:document-units="mm" inkscape:current-layer="layer1" @@ -58,13 +59,13 @@ id="layer1" transform="translate(0,-281)"> + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm index b659606..b9874f5 100644 --- a/src/battle/src/View/Controlled/CharacterCard.elm +++ b/src/battle/src/View/Controlled/CharacterCard.elm @@ -267,12 +267,16 @@ get_multiplied_mod_html multiplier mod = (Html.Attributes.class "character-card-mod") ] [ + (Html.div + [ + (Html.Attributes.class "omnimod-icon"), + (Html.Attributes.class ("omnimod-icon-" ++ category)) + ] + [ + ] + ), (Html.text - ( - category - ++ ": " - ++ (String.fromInt (ceiling ((toFloat value) * multiplier))) - ) + (String.fromInt (ceiling ((toFloat value) * multiplier))) ) ] ) diff --git a/src/css/src/battle.scss b/src/css/src/battle.scss index c9a7d00..3ba177a 100644 --- a/src/css/src/battle.scss +++ b/src/css/src/battle.scss @@ -1,4 +1,5 @@ @import 'shared/battleview'; +@import 'shared/omnimod-icons'; @import 'battle/controlled-panel'; @import 'battle/info-card'; diff --git a/src/css/src/battle/info-card/character.scss b/src/css/src/battle/info-card/character.scss index 92e4558..114e54d 100644 --- a/src/css/src/battle/info-card/character.scss +++ b/src/css/src/battle/info-card/character.scss @@ -138,3 +138,13 @@ background-size: 200% 100%; background-position: 100% 0; } + +.character-card-mod +{ + display: inline-block; +} + +.info-card-mod +{ + display: inline-block; +} diff --git a/src/css/src/roster-editor.scss b/src/css/src/roster-editor.scss index 2dcf067..a35188e 100644 --- a/src/css/src/roster-editor.scss +++ b/src/css/src/roster-editor.scss @@ -1,4 +1,5 @@ @import 'shared/battleview'; +@import 'shared/omnimod-icons'; @import 'roster-editor/controlled-panel'; @import 'roster-editor/info-card'; diff --git a/src/css/src/roster-editor/info-card/character.scss b/src/css/src/roster-editor/info-card/character.scss index 5e4a958..cb00546 100644 --- a/src/css/src/roster-editor/info-card/character.scss +++ b/src/css/src/roster-editor/info-card/character.scss @@ -145,3 +145,13 @@ background-size: 200% 100%; background-position: 100% 0; } + +.character-card-mod +{ + display: inline-block; +} + +.info-card-mod +{ + display: inline-block; +} diff --git a/src/css/src/shared/omnimod-icons.scss b/src/css/src/shared/omnimod-icons.scss new file mode 100644 index 0000000..b782165 --- /dev/null +++ b/src/css/src/shared/omnimod-icons.scss @@ -0,0 +1,29 @@ +.omnimod-icon +{ + display: inline-block; + height: 1em; + width: 1em; + background-size: 100%; + background-repeat: no-repeat; + vertical-align: middle; +} + +.omnimod-icon-dmg +{ + background-image: url(/asset/svg/damage_type/damage.svg); +} + +.omnimod-icon-slh +{ + background-image: url(/asset/svg/damage_type/slash.svg); +} + +.omnimod-icon-blu +{ + background-image: url(/asset/svg/damage_type/impact.svg); +} + +.omnimod-icon-pie +{ + background-image: url(/asset/svg/damage_type/piercing.svg); +} diff --git a/src/roster-editor/src/View/CharacterCard.elm b/src/roster-editor/src/View/CharacterCard.elm index 10348ad..7ae2338 100644 --- a/src/roster-editor/src/View/CharacterCard.elm +++ b/src/roster-editor/src/View/CharacterCard.elm @@ -194,12 +194,16 @@ get_multiplied_mod_html multiplier mod = (Html.Attributes.class "character-card-mod") ] [ + (Html.div + [ + (Html.Attributes.class "omnimod-icon"), + (Html.Attributes.class ("omnimod-icon-" ++ category)) + ] + [ + ] + ), (Html.text - ( - category - ++ ": " - ++ (String.fromInt (ceiling ((toFloat value) * multiplier))) - ) + (String.fromInt (ceiling ((toFloat value) * multiplier))) ) ] ) -- cgit v1.2.3-70-g09d2