From 23ae0047e1f6b3ef29506bb740a97e52d7497e6f Mon Sep 17 00:00:00 2001 From: nsensfel Date: Thu, 26 Apr 2018 15:17:47 +0200 Subject: Character icon bodies are now team uniforms. --- src/asset/www/characters.css | 8 ++++ src/asset/www/svg/icon/body_team_0.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_1.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_2.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_3.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_4.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_5.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_6.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/body_team_7.svg | 66 ++++++++++++++++++++++++++ src/asset/www/svg/icon/cat.svg | 19 ++------ src/asset/www/svg/icon/grey_cat.svg | 19 ++------ src/asset/www/svg/icon/orange_cat.svg | 23 +++------ src/battlemap/src/View/Battlemap/Character.elm | 33 +++++++++++-- src/battlemap/www/style.css | 12 +++++ 14 files changed, 592 insertions(+), 50 deletions(-) create mode 100644 src/asset/www/svg/icon/body_team_0.svg create mode 100644 src/asset/www/svg/icon/body_team_1.svg create mode 100644 src/asset/www/svg/icon/body_team_2.svg create mode 100644 src/asset/www/svg/icon/body_team_3.svg create mode 100644 src/asset/www/svg/icon/body_team_4.svg create mode 100644 src/asset/www/svg/icon/body_team_5.svg create mode 100644 src/asset/www/svg/icon/body_team_6.svg create mode 100644 src/asset/www/svg/icon/body_team_7.svg diff --git a/src/asset/www/characters.css b/src/asset/www/characters.css index a118036..612fb61 100644 --- a/src/asset/www/characters.css +++ b/src/asset/www/characters.css @@ -46,3 +46,11 @@ .asset-character-icon-15{background-image: url(/asset/svg/icon/cat.svg);} .asset-character-portrait-15{background-image: url(/asset/svg/portrait/cat.svg);} +.asset-character-team-body-0{background-image: url(/asset/svg/icon/body_team_0.svg);} +.asset-character-team-body-1{background-image: url(/asset/svg/icon/body_team_1.svg);} +.asset-character-team-body-2{background-image: url(/asset/svg/icon/body_team_2.svg);} +.asset-character-team-body-3{background-image: url(/asset/svg/icon/body_team_3.svg);} +.asset-character-team-body-4{background-image: url(/asset/svg/icon/body_team_4.svg);} +.asset-character-team-body-5{background-image: url(/asset/svg/icon/body_team_5.svg);} +.asset-character-team-body-6{background-image: url(/asset/svg/icon/body_team_6.svg);} +.asset-character-team-body-7{background-image: url(/asset/svg/icon/body_team_7.svg);} diff --git a/src/asset/www/svg/icon/body_team_0.svg b/src/asset/www/svg/icon/body_team_0.svg new file mode 100644 index 0000000..ae6c93f --- /dev/null +++ b/src/asset/www/svg/icon/body_team_0.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_1.svg b/src/asset/www/svg/icon/body_team_1.svg new file mode 100644 index 0000000..fbf0d7d --- /dev/null +++ b/src/asset/www/svg/icon/body_team_1.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_2.svg b/src/asset/www/svg/icon/body_team_2.svg new file mode 100644 index 0000000..5c1eec0 --- /dev/null +++ b/src/asset/www/svg/icon/body_team_2.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_3.svg b/src/asset/www/svg/icon/body_team_3.svg new file mode 100644 index 0000000..e9ecd4b --- /dev/null +++ b/src/asset/www/svg/icon/body_team_3.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_4.svg b/src/asset/www/svg/icon/body_team_4.svg new file mode 100644 index 0000000..48a5714 --- /dev/null +++ b/src/asset/www/svg/icon/body_team_4.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_5.svg b/src/asset/www/svg/icon/body_team_5.svg new file mode 100644 index 0000000..08e80a9 --- /dev/null +++ b/src/asset/www/svg/icon/body_team_5.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_6.svg b/src/asset/www/svg/icon/body_team_6.svg new file mode 100644 index 0000000..1be7b0d --- /dev/null +++ b/src/asset/www/svg/icon/body_team_6.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/body_team_7.svg b/src/asset/www/svg/icon/body_team_7.svg new file mode 100644 index 0000000..4cb909b --- /dev/null +++ b/src/asset/www/svg/icon/body_team_7.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/asset/www/svg/icon/cat.svg b/src/asset/www/svg/icon/cat.svg index e9a94a0..2a89f87 100644 --- a/src/asset/www/svg/icon/cat.svg +++ b/src/asset/www/svg/icon/cat.svg @@ -29,7 +29,7 @@ inkscape:cx="139.14694" inkscape:cy="167.8204" inkscape:document-units="mm" - inkscape:current-layer="layer3" + inkscape:current-layer="layer6" showgrid="false" inkscape:window-width="1678" inkscape:window-height="1029" @@ -48,26 +48,15 @@ image/svg+xml - + - + inkscape:label="armor" + style="display:none"> - + inkscape:label="armor" + style="display:none"> image/svg+xml - + - + inkscape:label="armor" + style="display:none"> (Html.Html Struct.Event.Type) +get_body_html char = + (Html.div + [ + (Html.Attributes.class "battlemap-character-icon-body"), + (Html.Attributes.class + ( + "asset-character-team-body-" + ++ (Struct.Character.get_player_id char) + ) + ) + ] + [ + ] + ) + +get_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) +get_head_html char = + (Html.div + [ + (Html.Attributes.class "battlemap-character-icon-head"), + (Html.Attributes.class + ("asset-character-icon-" ++ (Struct.Character.get_icon_id char)) + ) + ] + [ + ] + ) get_actual_html : ( Struct.Model.Type -> @@ -96,15 +124,14 @@ get_actual_html model char = (get_alliance_class model char), (get_position_style char), (get_focus_class model char), - (Html.Attributes.class - ("asset-character-icon-" ++ (Struct.Character.get_icon_id char)) - ), (Html.Attributes.class "clickable"), (Html.Events.onClick (Struct.Event.CharacterSelected (Struct.Character.get_ref char)) ) ] [ + (get_body_html char), + (get_head_html char) ] ) diff --git a/src/battlemap/www/style.css b/src/battlemap/www/style.css index 96c7317..5fc6ae5 100644 --- a/src/battlemap/www/style.css +++ b/src/battlemap/www/style.css @@ -310,9 +310,21 @@ { box-sizing: border-box; border-radius: 5px; +} + +.battlemap-character-icon * +{ + position: absolute; + left: 0; + top: 0; background-size: 100% 100%; + width: inherit; + height: inherit; } +.battlemap-character-icon-head { z-index: 1; } +.battlemap-character-icon-body { z-index: 0; } + .battlemap-character-ally { } -- cgit v1.2.3-70-g09d2