From 944ce62360fe4c195b80d45ce529586cc78c6341 Mon Sep 17 00:00:00 2001
From: nsensfel <SpamShield0@noot-noot.org>
Date: Mon, 11 Jun 2018 18:25:04 +0200
Subject: Displayed nav goes away more easily.

Also, I am trying to find nice ways to convey the "attack", "go to", and
"can't defend" tiles, so that it look okay when superposing the
navigator of the controlled character with the one of the focused
character.
---
 src/asset/www/svg/redshield.svg         | 164 ++++++++++++++++++++++++++++++++
 src/battlemap/src/Struct/Model.elm      |   5 +-
 src/battlemap/src/Update/SelectTile.elm |  36 ++++---
 3 files changed, 189 insertions(+), 16 deletions(-)
 create mode 100644 src/asset/www/svg/redshield.svg

diff --git a/src/asset/www/svg/redshield.svg b/src/asset/www/svg/redshield.svg
new file mode 100644
index 0000000..ad3679b
--- /dev/null
+++ b/src/asset/www/svg/redshield.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg1980"
+   sodipodi:docname="redshield.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
+  <defs
+     id="defs1974">
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleInS"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2842"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(-0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2727"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker3045"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path3043"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2851"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondSstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="DiamondSstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2797"
+         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.2) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path2706"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="56.947905"
+     inkscape:cy="64.370248"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-width="1678"
+     inkscape:window-height="1029"
+     inkscape:window-x="1"
+     inkscape:window-y="516"
+     inkscape:window-maximized="0"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-text-baseline="false" />
+  <metadata
+     id="metadata1977">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-265)">
+    <g
+       id="g3772">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3734"
+         d="m 2.9196617,266.50677 c 6.0803644,3.49359 7.3059343,3.18213 13.0803383,0 5.81995,3.36015 7.779992,3.95293 13.080338,0 C 29.080338,280.01903 24.577,293.90805 16,296.20625 7.4230009,293.90805 2.9196617,279.80266 2.9196617,266.50677 Z"
+         style="fill:#501616;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3734-0"
+         d="m 30.580078,263.51758 -2.396484,1.78711 c -2.550338,1.90201 -3.992365,2.50034 -5.388672,2.44531 -1.396307,-0.055 -3.165015,-0.88025 -6.044922,-2.54297 l -0.732422,-0.42187 -0.742187,0.4082 c -2.866033,1.5794 -4.412911,2.28764 -5.7343754,2.31641 -1.321464,0.0288 -2.8892601,-0.58722 -5.875,-2.30274 l -2.2460937,-1.29297 v 2.5918 c 0,6.8173 1.1385316,13.82056 3.4316406,19.5332 2.293109,5.71265 5.7936045,10.28456 10.7597655,11.61524 L 16,297.75977 16.388672,297.6543 c 4.954794,-1.32764 8.465102,-5.84297 10.759766,-11.53125 2.294663,-5.68829 3.43164,-12.69442 3.43164,-19.61719 z m -14.59375,4.67773 c 2.534044,1.44158 4.54717,2.4683 6.689453,2.55274 1.543982,0.0609 3.068571,-0.54359 4.667969,-1.42774 -0.27246,5.63778 -1.180055,11.22145 -2.978516,15.67969 -2.022431,5.01344 -4.920159,8.45705 -8.363281,9.57812 -3.434932,-1.12092 -6.3426649,-4.61271 -8.3671874,-9.65624 -1.8262182,-4.54952 -2.7475636,-10.21978 -3,-15.8711 1.7978884,0.87972 3.4061787,1.49309 4.9726563,1.45899 2.0361141,-0.0443 3.9095751,-0.96999 6.3789061,-2.31446 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2b0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="crack" />
+</svg>
diff --git a/src/battlemap/src/Struct/Model.elm b/src/battlemap/src/Struct/Model.elm
index e49ab1c..b954c68 100644
--- a/src/battlemap/src/Struct/Model.elm
+++ b/src/battlemap/src/Struct/Model.elm
@@ -99,7 +99,10 @@ reset characters model =
    {model |
       characters = characters,
       error = Nothing,
-      ui = (Struct.UI.set_previous_action Nothing model.ui),
+      ui =
+         (Struct.UI.reset_displayed_nav
+            (Struct.UI.set_previous_action Nothing model.ui)
+         ),
       char_turn = (Struct.CharacterTurn.new)
    }
 
diff --git a/src/battlemap/src/Update/SelectTile.elm b/src/battlemap/src/Update/SelectTile.elm
index fc6db27..7081d16 100644
--- a/src/battlemap/src/Update/SelectTile.elm
+++ b/src/battlemap/src/Update/SelectTile.elm
@@ -64,11 +64,13 @@ go_to_tile model navigator loc_ref =
          (
             {model |
                ui =
-                  (Struct.UI.set_displayed_tab
-                     Struct.UI.StatusTab
-                     (Struct.UI.set_previous_action
-                        (Just (Struct.UI.SelectedLocation loc_ref))
-                        model.ui
+                  (Struct.UI.reset_displayed_nav
+                     (Struct.UI.set_displayed_tab
+                        Struct.UI.StatusTab
+                        (Struct.UI.set_previous_action
+                           (Just (Struct.UI.SelectedLocation loc_ref))
+                           model.ui
+                        )
                      )
                   )
             },
@@ -99,11 +101,13 @@ go_to_tile model navigator loc_ref =
                               model.char_turn
                            ),
                         ui =
-                           (Struct.UI.set_displayed_tab
-                              Struct.UI.StatusTab
-                              (Struct.UI.set_previous_action
-                                 (Just (Struct.UI.SelectedLocation loc_ref))
-                                 model.ui
+                           (Struct.UI.reset_displayed_nav
+                              (Struct.UI.set_displayed_tab
+                                 Struct.UI.StatusTab
+                                 (Struct.UI.set_previous_action
+                                    (Just (Struct.UI.SelectedLocation loc_ref))
+                                    model.ui
+                                 )
                               )
                            )
                      },
@@ -142,11 +146,13 @@ apply_to model loc_ref =
          (
             {model |
                ui =
-                  (Struct.UI.set_displayed_tab
-                     Struct.UI.StatusTab
-                     (Struct.UI.set_previous_action
-                        (Just (Struct.UI.SelectedLocation loc_ref))
-                        model.ui
+                  (Struct.UI.reset_displayed_nav
+                     (Struct.UI.set_displayed_tab
+                        Struct.UI.StatusTab
+                        (Struct.UI.set_previous_action
+                           (Just (Struct.UI.SelectedLocation loc_ref))
+                           model.ui
+                        )
                      )
                   )
             },
-- 
cgit v1.2.3-70-g09d2