Merge pull request 'v11.2.0 - Les Terres médianes d'Akarlikarlikar' (#683) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: #683

changelog.md

@@ -1,4 +1,18 @@
-# v11.0
+# v11.2
+## v11.2.0 - Les Terres médianes d'Akarlikarlikar
+- Les TMRs sont redimensionables
+- Nouveaux graphismes plus lisibles dans les TMRs
+- Nouveau code couleur des icônes dans les TMR:
+  - noir: case innaccessible
+  - rouge: empêche l'usage du haut-rêve
+  - vert: bonus de tête de dragon permanent
+  - bleu: la case doit être vaincue
+  - blanc: effet temporaire (sort en réserve, présent des cités)
+- Fix: les déplacements aléatoires prennent bien compte des colonnes paires/impaires
+- Fix: Le Tricollet prend deux "L"
+- Fix: Les jets d'encaissement forcés par le gardien à un résultat inférieur à 11 ne peuvent plus donner un deuxième d10 négatif
+
+# v11.1
 ## v11.1.6 - Les dissections de Werther de Zloth
 - Fix: on peut de nouveau donner des compétences aux créatures
 - Fix: le délai de guérison d'une blessure rétrogradée est correctement appliqué
@@ -53,6 +67,7 @@
   - certaines macros ne marchaient pas pour les créatures/entités/véhicules/commerces
   - en cas de charge, les particulières sont toujours en force (p125)
 
+# v11.0
 ## v11.0.28 - les fractures de Khrachtchoum
 - La gravité de la blessure est affichée dans le résumé de l'encaissement
 - Lors du changement d'acteur pendant le round

icons/tmr/attache.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-3" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M90.53 23c-18.345 0-36.688 7.002-50.686 21-27.996 27.996-27.994 73.38 0 101.375 21.776 21.776 54.08 26.603 80.53 14.5l53.69 53.688c-21.425 19.696-44 38.257-67.44 55.937l30.126 30.125c18.734-22.545 37.953-44.474 57.844-65.53l169.594 169.593c-51.845 40.444-120.866 53.838-192.813 42.562L173 424.906 72.47 404.47l95.405 88.405 1.97-26c86.593 36.97 177.603 34.61 241.343-11.75l63.062 21.313-21.47-63.594c44.61-63.62 46.408-153.412 9.908-238.875l26.03-1.97-88.406-95.375 20.438 100.53 21.344-1.624c11.278 71.983-2.168 141.017-42.656 192.876l-169.782-169.75c21.075-20.34 42.93-39.665 65.78-57.72l-30.123-30.124c-17.015 24.154-35.673 46.66-55.688 67.813l-53.97-53.97C167.834 98.183 163.032 65.814 141.22 44c-14-13.998-32.343-21-50.69-21zm0 27.03c11.434.002 22.872 4.34 31.595 13.064 17.447 17.447 17.446 45.742 0 63.187-17.446 17.447-45.71 17.447-63.156 0-17.447-17.444-17.448-45.74 0-63.186C67.69 54.37 79.097 50.03 90.53 50.03z" fill="#8eff09" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

icons/tmr/conquete.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M27.084 18.248C-17.903 146.478 143.15 277.92 314.496 381.074c-4.645 13.767-5.585 27.628-3.394 40.635 4.44 26.355 20.974 48.997 42.86 62.425 21.884 13.428 49.776 17.57 75.645 5.765 25.87-11.804 48.69-38.923 62.737-84.654l-17.865-5.488c-13 42.318-32.806 64.094-52.63 73.14-19.825 9.047-40.69 5.998-58.116-4.693-17.425-10.69-30.75-29.095-34.205-49.6-3.455-20.507 2.232-43.318 24.677-65.218 20.743-20.24 32.068-41.615 30.434-61.24l-18.622 1.552c.74 8.89-4.35 22.76-16.684 37.486C222.057 230.8 73.838 128.622 27.084 18.248zm458.05 0C451.34 98.03 364.527 173.53 270.93 247.166c19.492 15.878 39.56 31.622 59.195 45.012 110.756-84.836 187.878-180.243 155.01-273.93zM127.58 292.146c-1.634 19.626 9.69 41 30.434 61.24 22.445 21.9 28.132 44.712 24.677 65.218-3.455 20.506-16.78 38.91-34.206 49.6-17.425 10.692-38.29 13.74-58.115 4.694-19.825-9.046-39.632-30.822-52.63-73.14l-17.865 5.488c14.046 45.73 36.867 72.85 62.736 84.654 25.87 11.805 53.763 7.663 75.648-5.765 21.885-13.428 38.42-36.07 42.86-62.426 2.19-13.005 1.25-26.863-3.393-40.628 13.986-8.42 27.905-17.022 41.648-25.803l-56.967-39.387c-6.55 5.103-13.063 10.2-19.52 15.293C150.55 316.46 145.46 302.59 146.2 293.7l-18.622-1.554zm18.1 73.614c-26.1 8.6-62.087 36.255-77.104 60.324 4.948 8.63 10.393 15.223 16.05 20.14 25.846-8.953 59.85-37.406 74.733-60.257-3.007-6.6-7.454-13.386-13.68-20.207zm220.863 0c-6.225 6.822-10.67 13.61-13.68 20.21 14.886 22.85 48.89 51.3 74.736 60.255 5.656-4.918 11.1-11.51 16.05-20.14-15.018-24.07-51.004-51.724-77.105-60.325z" fill="#b41e00" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

icons/tmr/debordement.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(255, 255, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="10" result="blur"></feGaussianBlur><feOffset dx="0" dy="10" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-3" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M400.9 104.8c-12 30-41 47.9-99.7 43.9-13.7-1.8-27.6-4.1-41.6-6.7-119.1-37.2-236.24-37.2-236.24 37.2 33.48-37.2 117.74-30.8 225.04-4 116.8 29.2 241.8 41.2 241.8-51.8-18.4 19.3-53.4 28.6-96.6 30.4 10-10.4 12.5-26.7 7.3-49zM147 187.5c-70.75-.3-123.64 16.1-123.64 66.1 33.48-37.2 117.74-34.8 225.04-8 116.8 29.2 241.8 45.2 241.8-47.8-35.4 37.2-130.2 39.6-230.6 8-37.7-11.9-78-18.2-112.6-18.3zm-23.9 69.6c-58.44-.2-99.74 15.6-99.74 70.9 33.48-37.2 122.34-44.3 225.04-18.6 121 30.2 241.8 37.2 241.8-37.2-35.4 37.2-132.1 22.6-230.6 4-48.4-7.5-96.5-19.1-136.5-19.1zm0 74.3c-58.44-.1-99.74 15.8-99.74 71 19.03-21.1 55.52-30.3 102.54-30.8-10.4 10.4-12.9 26.9-7.7 49.4 13.9-34.8 52-51.8 130.3-37.2 122.6 22.8 241.7 37.2 241.7-37.2-35.4 37.2-132.1 18.6-230.6 0-48.4-7.6-96.5-15.1-136.5-15.2z" fill="#48baff" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

icons/tmr/demi-reve.svg

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 512 512"
+   style="height: 512px; width: 512px;"
+   version="1.1"
+   id="svg30"
+   sodipodi:docname="demi-reve.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata34">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2014"
+     inkscape:window-height="1404"
+     id="namedview32"
+     showgrid="false"
+     inkscape:zoom="2.2094112"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg30" />
+  <defs
+     id="defs24">
+    <filter
+       id="shadow-6"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood2" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite4" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur6" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset8" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite10" />
+    </filter>
+    <filter
+       id="shadow-7"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood13" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite15" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur17" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset19" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite21" />
+    </filter>
+  </defs>
+  <g
+     class=""
+     transform="translate(-2.1627108,-0.3)"
+     id="g28">
+    <path
+       d="m 342.5,17.9 c -3.1,11.63 -2.2,21.56 -23.8,25.11 20.3,-2.7 22.3,9.58 24.8,21.49 -2.8,1.94 -5.5,4.11 -8.1,6.49 -21.9,20.84 -33,41.11 -49,61.61 -6.3,1.2 5.3,-53.52 31.1,-79.87 C 225.1,40.92 207.6,268.4 236.4,275 184.7,293.4 163.8,176.7 177,117.7 c -37.1,3.9 -62,39.8 -67.9,60 2.8,27.1 6.1,55.1 38.7,80.9 -32.1,3.6 -42,-27.8 -55.31,-54 -78.59,104.9 105.91,106.8 136.01,94.5 -93,70.5 -149.62,52.3 -196.77,39 -40.48,85.1 61.46,56 107.57,35.7 -18.4,30.7 -72.25,37.6 -88.92,41 61.62,51.3 174.42,-67 200.02,-106.5 2.5,65.7 -74.3,134.4 -122.8,171.7 43.6,2.2 83.2,-17.9 102.4,-55.5 0,10.1 -4.1,22.6 -9.6,35.8 15,-2.1 39.6,-6.2 48.8,-24.2 25,-54.1 37.8,-93.1 15.3,-138.2 29.9,33.5 63.6,65.3 58.4,114.5 26.9,-15.6 48.8,-33.6 24.7,-60.1 14.1,1.4 23.6,7.7 32.8,13.7 13.9,-2.8 34.4,-19.9 33.7,-33 -31.6,-29.8 -83.4,-43.7 -133.8,-55.9 72.1,-19.8 136.9,-10.1 175.6,5.6 5,-11.7 9.4,-29.6 5.9,-41.9 -16.4,-9.7 -62.7,-7.8 -83.3,-5.6 17.7,-15.7 56.8,-21.1 81.3,-21.2 -2,-67.7 -162.6,27.8 -182.2,42.8 32.7,-59.1 123.2,-112.7 178.7,-121.1 -13.2,-31.1 -37.2,-34 -64.3,-22.4 2.4,-9.5 6.7,-17.49 23.4,-15.29 -21.6,-3.51 -20.7,-13.44 -23.8,-25.07 -2.4,13.55 -4.1,17.11 -19.4,26.67 14.3,-2.17 16.4,6.69 17.4,14.69 -53.5,24.4 -117.8,102.8 -135.1,132.5 -22.1,-24 51,-121.5 107.7,-187.46 -3.1,-9.48 -21.8,-6.31 -38.2,4.81 1.1,-8.63 0.7,-22.16 17.9,-19.54 -15.3,-9.6 -17,-13.16 -19.4,-26.71 z m -166.3,0.3 c 5.4,10.73 12.7,17.53 -1,34.56 13.8,-16.07 23.7,-7.13 33.9,0.22 -4.6,-7.19 -16.3,-17.67 -0.7,-27.86 -17.8,3.09 -21.4,1.57 -32.2,-6.92 z M 47.71,26.61 C 44.63,38.24 45.58,48.17 23.95,51.66 44.97,48.92 46.34,62.21 49.01,74.47 50.44,66.04 48.73,50.5 67.15,53.31 51.88,43.72 50.17,40.16 47.71,26.61 Z m 419.39,5.5 c 1.6,10.83 1.3,13.93 -7.8,25.07 13.1,-6.8 15.9,5.39 19.1,11.38 C 477.2,58.59 475,48.2 491.5,44.92 474.3,47.79 472.4,40.07 467.1,32.11 Z M 125.3,84.28 c -0.6,18.02 -12,17.32 -22.7,17.92 7,2.4 20.3,3 15.3,18.2 10.2,-11.6 13.3,-12.5 25.2,-12.6 -9.4,-4.3 -17.8,-4.9 -17.8,-23.52 z M 71.21,153.9 c -8.61,8.5 -12.85,17.5 -33.24,9.6 19.47,8.3 13.98,20.4 10.08,32.4 5.46,-6.6 11.9,-20.9 26.35,-9.1 -8.38,-16 -8.02,-19.9 -3.19,-32.9 z M 453.9,282.7 c -2.4,8.9 -1.7,16.5 -18.2,19.2 16,-2.1 17.1,8.1 19.2,17.5 1.1,-6.5 -0.2,-18.4 13.8,-16.3 -11.7,-7.3 -13,-10 -14.8,-20.4 z M 69.25,293.8 c -12.82,12.7 -16.72,13.5 -30.41,12.7 10.55,5.7 20.39,7.1 18.72,29 2.3,-21.1 15.46,-19.4 28.05,-19.1 -7.83,-3.3 -23.4,-5.3 -16.36,-22.6 z m 394.55,50.7 c 3.1,11.6 8.9,19.7 -8,33.6 16.8,-12.9 24.6,-2.2 33.2,7.1 -3.1,-8 -12.4,-20.6 4.9,-27.4 -18,-0.5 -21.3,-2.8 -30.1,-13.3 z m -139.2,72.1 c -2.7,12.3 -4.1,25.5 -25.1,22.8 21.6,3.5 20.7,13.4 23.8,25 2.4,-13.5 4.1,-17.1 19.4,-26.6 C 324.3,440.6 326,425 324.6,416.6 Z M 83.9,438.2 c -2.83,16 -4.84,20.2 -22.86,31.5 21.68,-3.3 19.67,15.1 21.33,25 3.19,-14.5 4.84,-30.1 29.63,-26.9 -25.5,-4.2 -24.43,-15.9 -28.1,-29.6 z m 366.2,11.4 c -7.3,9.6 -10.2,19.1 -31.5,14.2 20.4,5.4 16.8,18.1 14.6,30.6 4.5,-7.3 8.8,-22.4 24.8,-12.8 -10.6,-14.6 -10.8,-18.6 -7.9,-32 z"
+       fill="#ffffff"
+       fill-opacity="1"
+       id="path26" />
+  </g>
+</svg>

icons/tmr/desorientation.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 512 512"
+   style="height: 512px; width: 512px;"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="desorientation.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1599"
+     inkscape:window-height="932"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="1.3119567"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="m 203.97,23 -18.032,4.844 11.656,43.468 c -25.837,8.076 -50.32,21.653 -71.594,40.75 l -31.47,-31.468 -13.218,13.22 31.376,31.374 c -19.467,21.125 -33.414,45.53 -41.813,71.343 l -42.313,-11.343 -4.843,18.063 42.25,11.313 c -6.057,27.3 -6.157,55.656 -0.345,83 l -41.904,11.216 4.843,18.064 41.812,-11.22 c 6.693,21.225 17.114,41.525 31.25,59.876 l -29.97,52.688 -16.81,29.593 29.56,-16.842 52.657,-29.97 c 18.41,14.216 38.784,24.69 60.094,31.407 l -11.22,41.844 18.033,4.81 11.218,-41.905 c 27.345,5.808 55.698,5.686 83,-0.375 l 11.312,42.28 18.063,-4.81 -11.344,-42.376 c 25.812,-8.4 50.217,-22.315 71.342,-41.78 l 31.375,31.373 13.22,-13.218 -31.47,-31.47 c 19.09,-21.266 32.643,-45.738 40.72,-71.563 l 43.53,11.657 4.813,-18.063 -43.625,-11.686 c 5.68,-27.044 5.576,-55.06 -0.344,-82.063 l 43.97,-11.78 -4.813,-18.063 L 440.908,197 c -6.73,-20.866 -17.08,-40.79 -31.032,-58.844 l 29.97,-52.656 16.842,-29.563 -29.593,16.844 -52.656,29.97 C 356.441,88.876 336.565,78.553 315.782,71.845 l 11.783,-44 L 309.5,23 297.72,66.97 c -27,-5.925 -55.02,-6.05 -82.064,-0.376 z m 201.56,85 -108.28,190.313 -0.75,0.437 -40.844,-40.875 -148.72,148.72 -2.186,1.25 109.125,-191.75 41.78,41.78 L 405.532,108 Z m -149.686,10.594 c 21.858,0 43.717,5.166 63.594,15.47 l -116.625,66.342 -2.22,1.28 -1.28,2.22 -66.25,116.406 c -26.942,-52.04 -18.616,-117.603 25.03,-161.25 26.99,-26.988 62.38,-40.468 97.75,-40.468 z m 122.72,74.594 c 26.994,52.054 18.67,117.672 -25.002,161.343 -43.66,43.662 -109.263,52.005 -161.312,25.033 l 116.438,-66.282 2.25,-1.25 1.25,-2.25 66.375,-116.592 z"
+     fill="#d0021b"
+     fill-opacity="1"
+     id="path2"
+     style="fill:#401060;fill-opacity:1" />
+</svg>

icons/tmr/fermeture.svg

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 512 512"
+   style="height: 512px; width: 512px;"
+   version="1.1"
+   id="svg52"
+   sodipodi:docname="fermeture.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata56">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="1083"
+     id="namedview54"
+     showgrid="false"
+     inkscape:zoom="1.5990661"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg52" />
+  <defs
+     id="defs46">
+    <filter
+       id="shadow-1"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(248, 231, 28, 1)"
+         result="flood"
+         id="feFlood2" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite4" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="40"
+         result="blur"
+         id="feGaussianBlur6" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset8" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite10" />
+    </filter>
+    <filter
+       id="shadow-3"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(248, 231, 28, 1)"
+         result="flood"
+         id="feFlood13" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite15" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="40"
+         result="blur"
+         id="feGaussianBlur17" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset19" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite21" />
+    </filter>
+    <filter
+       id="shadow-6"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood24" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite26" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur28" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset30" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite32" />
+    </filter>
+    <filter
+       id="shadow-7"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood35" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite37" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur39" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset41" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite43" />
+    </filter>
+  </defs>
+  <g
+     class=""
+     id="g50"
+     transform="matrix(1.1287777,0,0,1.1287777,-32.967091,-40.026839)">
+    <path
+       d="M 72.877,31.904 C 71.887,31.89 70.919,31.91 69.889,32.002 43.67,35.408 22.545,61.005 18,93.775 v 26.15 c 2.296,16.266 8.804,30.665 17.848,41.565 -6.58,1.237 -12.504,3.53 -17.848,6.717 v 23.813 c 22.983,0.386 43.265,14.03 57.31,34.318 C 89.56,246.92 98,274.598 98,305 98,335.402 89.56,363.08 75.31,383.662 61.266,403.95 40.984,417.592 18,417.98 v 8.577 L 23.03,494 H 30.7 L 138.904,332.176 140,304 c 0.732,-41.132 16.536,-59.598 32,-48 4.26,3.195 8.3,6.024 12.135,8.533 l 23.574,-35.258 c -21.607,-17.4 -59.103,-43.23 -90.68,-68.658 10.89,-13.647 17.894,-32.612 17.894,-53.627 C 134.924,65.494 108.478,32 76,32 74.88,31.964 73.867,31.918 72.877,31.904 Z m 366.246,0 c -0.99,0.014 -2.002,0.06 -3.123,0.096 -32.478,0 -58.924,33.494 -58.924,74.99 0,21.015 7.005,39.98 17.895,53.627 -31.577,25.43 -69.073,51.26 -90.68,68.658 l 23.577,35.258 A 232.03,232.03 0 0 0 340,256 c 15.464,-11.598 31.268,6.868 32,48 l 1.096,28.174 L 481.3,494 h 7.67 L 494,426.557 v -8.578 C 471.017,417.591 450.735,403.949 436.69,383.661 422.44,363.08 414,335.402 414,305 c 0,-30.402 8.44,-58.08 22.69,-78.662 14.045,-20.288 34.327,-33.932 57.31,-34.318 v -23.813 c -5.344,-3.187 -11.27,-5.48 -17.848,-6.717 9.044,-10.9 15.552,-25.3 17.848,-41.566 V 93.774 C 489.454,61.004 468.33,35.408 442.11,32.002 a 28.52,28.52 0 0 0 -2.987,-0.098 z m -290.365,14.854 40.068,110.215 47.34,-31.653 z m 214.484,0 -87.408,78.562 47.34,31.653 z M 230.25,150.93 213.625,162.047 435.588,494 h 24.057 z m 51.5,0 -14.922,22.316 12.03,17.99 19.517,-29.19 z M 18,210.018 v 189.964 c 15.993,-0.38 30.943,-9.855 42.512,-26.566 C 72.322,356.356 80,332.036 80,305 80,277.965 72.322,253.643 60.512,236.584 48.942,219.874 33.992,210.398 18,210.018 Z m 476,0 c -15.993,0.38 -30.943,9.855 -42.512,26.566 C 439.678,253.644 432,277.964 432,305 c 0,27.035 7.678,51.357 19.488,68.416 11.57,16.71 26.52,26.186 42.512,26.566 z M 233.145,223.62 52.355,494 H 76.412 L 245.174,241.61 Z M 134.748,439.14 98.066,494 h 34.55 z m 242.504,0 2.13,54.86 h 34.552 z"
+       fill="#003fb2"
+       fill-opacity="1"
+       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
+       filter="url(#shadow-1)"
+       id="path48" />
+  </g>
+</svg>

icons/tmr/maitrisee.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-3" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><g transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"><path d="M256 20C198.562 20 152 66.562 152 124C152 181.438 198.562 228 256 228C313.438 228 360 181.438 360 124C360 66.562 313.438 20 256 20Z" class="" fill="#087505" fill-opacity="0"></path><path d="M16 256L16 496L64 496C128 336 384 336 448 496L496 496L496 256L448 256L448 320L388 320L388 256L340 256L340 320L280 320L280 256L232 256L232 320L172 320L172 256L124 256L124 320L64 320L64 256L16 256Z" class="selected" fill="#087505" fill-opacity="1" filter="url(#shadow-3)"></path></g></g></svg>

icons/tmr/pelerinage.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M259.844 73.406l1.625 214.47-18.69.155-1.655-214.342C206.358 75.24 172.012 82.588 141 95.78c36.116 61.6 59.493 126.474 75.813 196.5l-18.22 4.25C182.46 227.29 159.504 163.924 124 103.78c-37.016 19.19-67.986 47.49-87.156 84.97 57.884 24.66 105.126 67.86 140.937 118.688l-15.28 10.75c-34.284-48.66-79.092-89.328-133.28-112.344-8.57 22.082-13.345 46.943-13.345 74.594 95.028 17.855 145.516 75.937 151.406 92 3.752 10.228-27.905 21.074-27.905 38.156 0 12.34 25.52 20.537 59.668 24.67-3.846-4.94-7.694-10.374-11.59-16.31l15.625-10.255c9.802 14.937 18.996 25.865 27.354 32.73 8.358 6.864 15.493 9.632 22.423 9.68 13.862.094 31.592-12.316 53.723-42.776l15.12 10.984c-4.31 5.93-8.553 11.385-12.76 16.35 36.362-4.006 64.125-12.375 64.125-25.074 0-17.92-35.487-28.412-33.72-39.97 2.31-15.09 55.528-74.91 156.626-90.187 0-28.807-5.284-54.622-14.72-77.437-57.322 22.41-104.478 64.46-140.22 115.188l-15.28-10.75c37.145-52.72 86.607-97.216 147.47-121.344-20.457-37.87-53.207-66.233-92.064-85.03-36.426 60.947-59.84 125.186-76.22 195.467l-18.186-4.25c16.523-70.893 40.278-136.5 77.156-198.78-32.42-12.835-68.166-19.55-104.062-20.094z" fill="#b41e00" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

icons/tmr/periple.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-3" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M149.9 27.2L34.25 56.74v76.76L157.8 93.85l46.7-44.67-54.6-21.98zm132.8 57c-7.4.18-10.1 1.88.9 7.13C346.9 121.6 441.7 206.8 391.3 216.9 232.2 249 130.4 292.3 48.51 390.8 25.42 418.6 18 494.8 18 494.8h432.6s-139-21.1-147.8-75.7c-14.9-92.2 194.5-102.7 196.5-199.9.9-43.2-88.3-124.99-184.4-132.52-5.6-.44-22.7-2.71-32.2-2.48zm-163.5 40.9l-32.69 10.5v122.2l35.99-10-3.3-122.7z" fill="#b41e00" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

icons/tmr/present.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><path d="M0 0h512v512H0z" fill="#4a4a4a" fill-opacity="0.5"></path><g class="" transform="translate(1,-1)" style=""><path d="M149.518 78.38c-6.55.117-12.45 1.736-17.35 4.91-7.465 4.84-11.765 12.904-13.063 21.34-2.595 16.874 4.747 36.355 19.862 52.31C154.08 172.893 177.643 185 208 185h2.438l-9.118-18.234c-22.194-1.554-38.46-10.777-49.287-22.205-11.885-12.545-16.543-28.064-15.138-37.19.702-4.564 2.402-7.25 5.062-8.974 2.66-1.724 7.113-2.875 14.756-1.326 13.078 2.65 34.233 13.948 62.205 39.284L220.27 135h23.408c-35.31-34.8-62.215-51.278-83.39-55.57-2.715-.55-5.363-.887-7.925-1.006-.96-.045-1.91-.06-2.845-.043zm212.964 0c-.935-.016-1.885 0-2.845.044-2.562.12-5.21.455-7.924 1.006-21.176 4.292-48.082 20.77-83.39 55.57h23.406l1.352 1.354c27.972-25.336 49.127-36.633 62.205-39.284 7.643-1.55 12.096-.398 14.756 1.326 2.66 1.725 4.36 4.41 5.062 8.973 1.405 9.126-3.253 24.645-15.138 37.19-10.827 11.43-27.093 20.652-49.287 22.206L301.562 185H304c30.357 0 53.92-12.106 69.033-28.06 15.115-15.955 22.457-35.436 19.862-52.31-1.298-8.436-5.598-16.5-13.063-21.34-4.9-3.174-10.8-4.793-17.35-4.91zM227.73 153l-8.78 8.777L229.564 183h52.875l10.61-21.223-8.777-8.777h-56.54zM73 201v46h142v-46H73zm160 0v270h46V201h-46zm64 0v46h142v-46H297zm-192 64v206h110V265H105zm192 0v206h110V265H297z" fill="#ffffff" fill-opacity="1"></path></g></svg>

icons/tmr/rencontre.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M324.97 17.54c.03.034.057.07.087.106l-34.924 32.428 36.904-3.752-15.396 30.12 38.048-16.075c26.147 69.965.623 154.277-52.555 166.262-6.554-25.37-34.13-37.945-36.055-57.382.303.093.604.187.912.27 4.833 1.295 9.736 1.183 14.274-.07l25.138 22.89 20.653-16.377c-7.363 2.836-28.588-1.402-33.25-13.923 3.154-3.24 5.55-7.284 6.793-11.922.485-1.813.757-3.635.86-5.445l11.524 22.777 5.22-16.94c7.625 5.575 12.474 13.605 11.49 21.136l16.673-29.4-72.14-29.56-58.057-48.03 17.1 31.25-48.206-19.753 35.14 31.237c-40.602 28.158-22.085 85.04-1.796 119.29-57.5-9.685-103.128-77.435-95.763-145.03l49.21-21.366-31.08-5.14 29.207-33.417-32.015 11.54c.037-.067.07-.135.107-.202-168.36 66.33-116.413 367-63.728 417.99-.19-1.317-.364-2.58-.54-3.855-14.922-56.244-20.375-125.624-17.5-190.53 3.02-68.237 14.834-131.16 36.794-169.522l16.22 9.283c-18.894 33.008-31.4 94.563-34.345 161.064-1.942 43.86.106 90.022 6.275 132.082 6.124 1.892 15.046 9.615 27.295 23.24-4.818-13.35-6.78-26.5-6.482-38.28 20.286 41.665 67.34 69.234 104.633 62.308 22.444-4.17 41.803-12.73 57.81-24.475l7.31 15.418c-20.068 5.036-22.807 32.635-14.737 55.112 1.748-19.882 11.36-29.794 21.73-32.303-6.598 15.867-4.698 30.623-3.117 44.158 10.15-12.147 21.47-23.793 23.628-39.354 8.738 7.332 12.317 21.49 1.194 39.057 26.32-15.473 31.565-41.994 7.978-57.685l-32.07-34.297c5.918-5.55 11.24-11.6 15.947-18.066l39.28 15.776c-3.942 13.69 5.833 31.512 19.77 43.31-8.055-17.288-4.826-30.08 2.562-37.103 1.63 17.39 10.64 29.193 18.733 40.064 2.73-15.665 6.79-31.493-.213-45.987 11.016 1.56 21.2 11.568 20.338 31.877 14.362-25.313 6.11-49.702-20.742-51.52l-71.135-9.892c12.757-22.982 18.676-49.823 17.015-77.475 14.188-34.708 50.058-11.816 54.523 49.16C394.924 262.27 434.58 304 426.324 367.13c11.808-23.38 21.835-35.013 29.862-36.247-10.772-91.925-40.458-191.57-77.637-250.748l15.823-9.942c50.328 80.106 85.112 220.65 84.88 331.547 42.403-115.912-2.347-356.61-154.282-384.2zm-29.458 476.913l-.026.016-.015.05c.015-.02.027-.044.042-.067zm26.543-318.492h.01v-.007l-.01.008zm-53.348-41.716c.866-.027 1.757.073 2.652.313 4.774 1.28 7.467 5.945 6.187 10.72-1.28 4.776-5.943 7.47-10.72 6.19-4.775-1.28-7.468-5.943-6.188-10.72.96-3.584 3.823-5.993 7.21-6.435.282-.036.568-.06.857-.068zM204.904 297.13c11.878-.2 22.637 6.756 26.172 22.487-.008 35.88-9.557 68.823-42.137 77.412-27.624 7.283-69.725-11.398-84.12-53.663 12.28-21.078 37.362-21.986 62.838 22.592-12.583-41.596 14.386-68.444 37.246-68.83z" fill="#003fb2" fill-opacity="1" filter="url(#shadow-1)" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>

icons/tmr/reserve.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M149.688 85.625c-1.234.005-2.465.033-3.72.063-33.913.806-75.48 10.704-127.25 33.718V362.78c60.77-28.82 106.718-37.067 144.22-33.092 33.502 3.55 59.685 16.66 83.562 31.187v-242.97c-23.217-17.744-50.195-30.04-85.97-32-3.52-.192-7.142-.296-10.843-.28zm211.968 0c-3.7-.016-7.322.088-10.844.28-35.773 1.96-62.75 14.256-85.968 32v242.97c23.876-14.527 50.06-27.637 83.562-31.188 37.502-3.974 83.45 4.272 144.22 33.094V119.407c-51.77-23.014-93.337-32.912-127.25-33.72-1.255-.028-2.486-.056-3.72-.06zm5.72 261.78c-1.038-.002-2.074.017-3.095.033-4.808.075-9.43.37-13.905.843-33.932 3.597-59.603 17.976-85.53 34.44v.28c-6.554-1.99-13.02-2.37-19.408-.97-25.566-16.177-51.003-30.202-84.468-33.75-5.595-.592-11.44-.883-17.564-.842-32.04.213-71.833 9.778-124.687 35.937v42.53c60.77-28.823 106.714-37.067 144.218-33.092 18.545 1.965 34.837 6.845 49.75 13.28-4.682 6.064-9.308 13.268-13.875 21.688h117.156c-5.93-8.22-11.798-15.414-17.626-21.56 14.996-6.503 31.39-11.43 50.062-13.408 37.503-3.974 83.448 4.27 144.22 33.094v-42.53c-53.16-26.31-93.115-35.863-125.25-35.97z" fill="#087505" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

icons/tmr/sort-reserve.svg

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 512 512"
+   style="height: 512px; width: 512px;"
+   version="1.1"
+   id="svg32"
+   sodipodi:docname="sort-reserve.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2318"
+     inkscape:window-height="1268"
+     id="namedview34"
+     showgrid="false"
+     inkscape:zoom="1.9888504"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg32" />
+  <defs
+     id="defs24">
+    <filter
+       id="shadow-6"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood2" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite4" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur6" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset8" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite10" />
+    </filter>
+    <filter
+       id="shadow-7"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood13" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite15" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur17" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset19" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite21" />
+    </filter>
+  </defs>
+  <path
+     d="M 0,0 H 512 V 512 H 0 Z"
+     fill="#4a4a4a"
+     fill-opacity="0.5"
+     id="path26"
+     style="stroke-width:1;fill:#4a4a4a;fill-opacity:0.01" />
+  <g
+     class=""
+     transform="translate(1,-1)"
+     id="g30"
+     style="fill:#f4e3d7">
+    <path
+       d="m 373.563,18.406 c -15.616,-0.167 -27.91,4.622 -32.563,14.75 -22.778,49.605 -48.743,87.14 -79.094,117.28 3.047,1.015 6.046,2.29 8.938,3.783 12.987,6.708 25.268,17.78 35.312,30.843 10.044,13.062 17.85,28.114 20.78,43.5 0.746,3.908 1.16,7.885 1.158,11.843 38.97,-24.36 85.058,-41.223 140.875,-51.312 14.91,-2.697 23.652,-28.632 21.405,-58.656 l -35.156,-1 30.56,-24.813 C 481.63,90.117 474.765,75.87 464.623,63.904 449.095,45.59 428.193,32.528 407.903,25.218 l -25.963,15.594 2.812,-21.5 c -3.875,-0.55 -7.61,-0.87 -11.188,-0.907 z M 246.938,166.562 c -1.063,0.052 -2.06,0.226 -3,0.47 -11.976,10.254 -24.61,19.597 -37.938,28.28 0.842,0.33 1.67,0.667 2.5,1.032 14.123,6.192 27.438,17.145 38.47,30.625 13.356,16.322 23.62,36.94 25.624,57.75 10.334,-10.367 21.24,-19.943 32.844,-28.72 4.096,-6.555 4.93,-14.468 3.125,-23.938 -2.184,-11.46 -8.642,-24.43 -17.25,-35.625 -8.61,-11.194 -19.38,-20.622 -29.063,-25.625 -6.052,-3.126 -11.154,-4.45 -15.313,-4.25 z m -61.907,43.282 c -1.385,0.053 -2.69,0.27 -3.968,0.562 -37,20.762 -79.088,37.985 -127.312,56 0.574,0.042 1.14,0.093 1.72,0.156 10.627,1.156 21.076,5.008 31.155,10.875 L 124.313,261 108.5,293.72 c 5.995,5.432 11.803,11.477 17.344,18 20.76,24.434 37.964,55.865 47.094,88.092 0.002,0.01 -0.003,0.022 0,0.032 2.98,10.508 5.11,20.916 6.312,31 20.99,-48.438 44.38,-89.26 72.344,-123 7.3,-21.48 -2.186,-48.408 -19.063,-69.03 -9.44,-11.538 -20.976,-20.718 -31.53,-25.345 -5.936,-2.604 -11.27,-3.808 -15.97,-3.626 z m 141.626,54.844 c -7.31,5.05 -14.462,10.51 -21.437,16.312 39.16,9.26 60.953,35.722 80.655,62.156 10.464,14.04 20.598,28.11 33.125,40.688 24.19,9.147 43.17,6.38 63.906,-14.938 -92.165,-27.78 -96.11,-92.61 -156.25,-104.22 z M 48.594,284.906 c -10.873,0.225 -18.26,5.755 -23.344,16.594 -5.81,12.387 -7.114,32.47 0.438,57.063 5.75,18.73 16.52,37.718 28.75,51.625 12.23,13.906 25.9,22.076 35.374,22.406 h 0.032 c 3.717,0.13 6.553,-0.682 8.812,-2.75 l -0.187,-0.188 2.093,-2.094 c 0.793,-1.168 1.52,-2.548 2.187,-4.187 2.81,-6.9 3.28,-18.552 -1.844,-33 -6.885,-19.417 -19.12,-31.932 -33.375,-34.78 l -22.968,-4.564 19.813,-12.5 38.47,-24.186 c -16.65,-16.822 -34.55,-27.607 -49.376,-29.22 -1.7,-0.184 -3.323,-0.25 -4.876,-0.218 z m 236.25,5.406 -24.53,25.375 c 100.442,17.878 55.45,141.005 159.31,176.188 l -24.78,-57.28 c 32.766,16.15 67.39,22.623 97.72,12.03 -135.77,-41.948 -96.32,-126.983 -207.72,-156.313 z m -169.47,38.22 -25.968,16.343 c 13.18,8.5 23.21,22.565 29.125,39.25 2.57,7.244 4.133,14.205 4.75,20.78 l 23.44,-23.374 c -8.08,-19.19 -19.035,-37.566 -31.345,-53 z m 38.376,72.374 -42.063,42 -0.156,-0.156 c -4.255,3.942 -9.456,6.765 -15.186,7.938 23.268,14.873 44.644,19.346 56.812,9.562 4.26,-3.426 7.043,-8.36 8.47,-14.406 -0.41,-12.684 -2.602,-26.615 -6.657,-40.906 -0.382,-1.346 -0.806,-2.686 -1.22,-4.032 z"
+       fill="#ffffff"
+       fill-opacity="1"
+       id="path28"
+       style="fill:#f4e3d7" />
+  </g>
+</svg>

icons/tmr/trounoir.svg

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 512 512"
+   style="height: 512px; width: 512px;"
+   version="1.1"
+   id="svg32"
+   sodipodi:docname="trounoir.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1553"
+     inkscape:window-height="1145"
+     id="namedview34"
+     showgrid="false"
+     inkscape:zoom="1.4374483"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg32" />
+  <defs
+     id="defs24">
+    <filter
+       id="shadow-6"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood2" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite4" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur6" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset8" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite10" />
+    </filter>
+    <filter
+       id="shadow-7"
+       height="300%"
+       width="300%"
+       x="-100%"
+       y="-100%">
+      <feFlood
+         flood-color="rgba(72, 186, 255, 1)"
+         result="flood"
+         id="feFlood13" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite"
+         id="feComposite15" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="8"
+         result="blur"
+         id="feGaussianBlur17" />
+      <feOffset
+         dx="5"
+         dy="15"
+         result="offset"
+         id="feOffset19" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         id="feComposite21" />
+    </filter>
+  </defs>
+  <path
+     d="M0 0h512v512H0z"
+     fill="#4a4a4a"
+     fill-opacity="0.5"
+     id="path26"
+     style="fill:#333333;fill-opacity:0.69999999" />
+  <path
+     d="m 329.547,18.115 c -30.61,99.22 -47.583,151.205 -86.88,156.778 -18.626,2.642 -42.988,-19.225 -70.16,-50.29 15.47,30.702 21.275,55.265 10.845,61.348 -15.787,9.21 -51.095,-6.94 -106.815,-30.837 31.653,20.827 83.667,50.18 77.358,58.63 -8.074,10.81 -77.23,-4.706 -130.866,-13.163 89.224,25.398 137.61,55.572 137.61,82.387 0,18.423 -48.845,62.18 -71.888,83.928 19.558,-11.397 64.736,-24.44 76.777,-2.99 13.335,23.758 -6.577,61.6 -28.5,128.027 31.39,-46.19 73.363,-108.122 90.734,-106.49 12.248,1.15 -4.805,60.692 -10.47,98.71 21.547,-80.082 46.534,-132.5 90.153,-131.015 29.665,1.01 58.022,30.762 88.99,52.047 -16.188,-19.81 -45.975,-47.99 -39.55,-53.243 8.9,-7.276 56.48,12.547 94.224,25.726 -24.982,-17.962 -68.644,-43.88 -61.653,-50.852 10.417,-10.387 72.436,1.332 117.49,7.178 C 419.2,303.266 370.1,289.807 359.616,255.461 c -5.283,-17.31 10.853,-40.3 40.89,-68.038 -31.377,17.197 -54.588,28.694 -63.737,12.392 -11.576,-20.622 11.374,-65.883 35.238,-126.06 -21.135,32.47 -48.532,83.487 -55.254,77.174 -8.972,-8.425 5.598,-77.597 12.795,-132.813 h -0.003 z M 21.45,18.27 V 41.63 C 69.97,69.067 116.703,104.02 162.783,144.416 129.015,102.731 95.443,60.626 68.758,18.27 Z m 175.79,0 c 18.465,37.356 34.503,76.96 48.475,117.97 -5.007,-39.79 -9.898,-79.367 -12.264,-117.97 h -36.21 z m 160.022,0 c -7.18,26.672 -15.416,53.437 -25.116,80.593 15.405,-27.34 30.698,-54.514 46.723,-80.593 H 357.26 Z m 105.123,0 c -27.895,50.718 -63.73,99.873 -105.707,147.755 46.514,-37.68 92.9,-75.343 140.164,-103.37 V 18.27 Z m 34.455,160.02 c -36.077,17.98 -74.843,34.036 -115.635,47.89 38.908,-6.17 77.882,-12.105 115.635,-15.77 z m -206.266,42.868 c 9.35,0 16.93,7.58 16.93,16.932 0,9.35 -7.58,16.93 -16.93,16.93 -9.35,0 -16.93,-7.58 -16.93,-16.93 0,-9.35 7.58,-16.932 16.93,-16.932 z m -52.06,1.598 c 15.508,0 28.082,12.57 28.082,28.08 0,9.718 -4.938,18.28 -12.44,23.322 3.614,3.843 5.842,9.002 5.842,14.694 0,11.86 -9.613,21.474 -21.473,21.474 -11.86,0 -21.474,-9.615 -21.474,-21.474 0,-5.687 2.228,-10.842 5.837,-14.684 -7.51,-5.04 -12.453,-13.608 -12.453,-23.332 0,-15.51 12.57,-28.08 28.08,-28.08 z M 21.45,234.078 v 38.547 c 31.87,-4.584 64.46,-5.693 97.532,-4.09 -33.727,-10.19 -67.407,-20.35 -97.53,-34.457 z m 265.82,28.377 c 9.35,0 16.93,7.58 16.93,16.932 0,9.35 -7.58,16.93 -16.93,16.93 -9.35,0 -16.932,-7.58 -16.932,-16.93 0,-9.35 7.58,-16.932 16.932,-16.932 z M 129.494,294.05 c -36.153,11.99 -72.24,20.293 -108.043,24.313 v 51.393 c 30.994,-28.64 69.426,-52.264 108.044,-75.703 v -0.002 z m 5.84,88.645 c -37.923,30.72 -75.607,61.482 -113.885,87.02 v 23.943 h 29.784 c 24.02,-37.76 52.365,-74.765 84.1,-110.963 z m 202.07,11.096 c 26.807,33.093 53.226,66.414 76.508,99.87 h 59.568 c -46.586,-27.078 -91.877,-61.12 -136.074,-99.87 z m -52.562,9.93 c -3.175,30.26 -6.39,60.5 -10.512,89.94 h 20.44 c -4.51,-29.083 -7.904,-59.17 -9.926,-89.94 z m 26.865,13.432 c 11.346,25.473 22.374,51.18 32.705,76.508 h 23.36 c -19.395,-23.9 -38.105,-49.64 -56.065,-76.508 z"
+     fill="#602000"
+     fill-opacity="1"
+     id="path28"
+     style="fill:#401060;fill-opacity:1" />
+</svg>

icons/tmr/urgence.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M103.432 17.844c-1.118.005-2.234.032-3.348.08-2.547.11-5.083.334-7.604.678-20.167 2.747-39.158 13.667-52.324 33.67-24.613 37.4 2.194 98.025 56.625 98.025.536 0 1.058-.012 1.583-.022v.704h60.565c-10.758 31.994-30.298 66.596-52.448 101.43-2.162 3.4-4.254 6.878-6.29 10.406l34.878 35.733-56.263 9.423c-32.728 85.966-27.42 182.074 48.277 182.074v-.002l9.31.066c23.83-.57 46.732-4.298 61.325-12.887 4.174-2.458 7.63-5.237 10.467-8.42h-32.446c-20.33 5.95-40.8-6.94-47.396-25.922-8.956-25.77 7.52-52.36 31.867-60.452 5.803-1.93 11.723-2.834 17.565-2.834v-.406h178.33c-.57-44.403 16.35-90.125 49.184-126 23.955-26.176 42.03-60.624 51.3-94.846l-41.225-24.932 38.272-6.906-43.37-25.807h-.005l.002-.002.002.002 52.127-8.85c-5.232-39.134-28.84-68.113-77.37-68.113C341.14 32.26 222.11 35.29 149.34 28.496c-14.888-6.763-30.547-10.723-45.908-10.652zm.464 18.703c13.137.043 27.407 3.804 41.247 10.63l.033-.07c4.667 4.735 8.542 9.737 11.68 14.985H82.92l10.574 14.78c10.608 14.83 19.803 31.99 21.09 42.024.643 5.017-.11 7.167-1.814 8.836-1.705 1.67-6.228 3.875-15.99 3.875-40.587 0-56.878-44.952-41.012-69.06C66.238 46.64 79.582 39.22 95.002 37.12c2.89-.395 5.863-.583 8.894-.573zM118.5 80.78h46.28c4.275 15.734 3.656 33.07-.544 51.51H131.52c1.9-5.027 2.268-10.574 1.6-15.77-1.527-11.913-7.405-24.065-14.62-35.74zm101.553 317.095c6.44 6.84 11.192 15.31 13.37 24.914 3.797 16.736 3.092 31.208-1.767 43.204-4.526 11.175-12.576 19.79-22.29 26h237.19c14.448 0 24.887-5.678 32.2-14.318 7.312-8.64 11.2-20.514 10.705-32.352-.186-4.473-.978-8.913-2.407-13.18l-69.91-8.205 42.017-20.528c-8.32-3.442-18.64-5.537-31.375-5.537H220.053zm-42.668.506c-1.152-.003-2.306.048-3.457.153-2.633.242-5.256.775-7.824 1.63-15.11 5.02-25.338 21.54-20.11 36.583 3.673 10.57 15.347 17.71 25.654 13.938l1.555-.57h43.354c.946-6.36.754-13.882-1.358-23.192-3.71-16.358-20.543-28.483-37.815-28.54z" fill="#b41e00" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>

module/actor.js

@@ -2476,7 +2476,8 @@ export class RdDActor extends RdDBaseActorSang {
     }
 
     this.tmrApp = await RdDTMRDialog.create(this, tmrFormData);
-    this.tmrApp.render(true);
+    await this.tmrApp.render(true);
+    await this.tmrApp.onDeplacement()
   }
 
   /* -------------------------------------------- */

module/rdd-dice.js

@@ -164,7 +164,7 @@ export class RdDDice {
     if (options.showDice == HIDE_DICE || !game.modules.get("dice-so-nice")?.active || !game.dice3d) {
       return;
     }
-    
+
     let { whisper, blind } = RdDDice._getWhisperBlind(options);
     if (options.forceDiceResult?.total) {
       let terms = await RdDDice._getForcedTerms(options);
@@ -197,48 +197,25 @@ export class RdDDice {
     function terms1d100(total) {
       const unites = total % 10;
       const dizaines = Math.floor(total / 10);
-      return [{
+      return [
-        resultLabel: dizaines * 10,
+        { type: "d100", result: dizaines, resultLabel: dizaines * 10, vectors: [], options: {}, d100Result: total },
-        d100Result: total,
+        { type: "d10", result: unites, resultLabel: unites, vectors: [], options: {}, d100Result: total }
-        result: dizaines,
+      ];
-        type: "d100",
-        vectors: [],
-        options: {}
-      },
-      {
-        resultLabel: unites,
-        d100Result: total,
-        result: unites,
-        type: "d10",
-        vectors: [],
-        options: {}
-      }];
     }
 
     async function terms2d10(total) {
-      if (total>20 || total<2) { return undefined }
+      if (total > 20 || total < 2) { return undefined }
-      let first = await RdDDice.d10();
+      const first = await RdDDice.fakeD10(Math.min(10, total - 1));
-      let second = Math.min(total-first, 10);
+      const second = total - first;
-      first = Math.max(first, total-second);
+      return [
-      return [{
+        { type: "d10", result: first, resultLabel: first, vectors: [], options: {} },
-        resultLabel:first,
+        { type: "d10", result: second, resultLabel: second, vectors: [], options: {} }
-        result: first,
+      ];
-        type: "d10",
-        vectors: [],
-        options: {}
-      },
-      {
-        resultLabel: second,
-        result: second,
-        type: "d10",
-        vectors: [],
-        options: {}
-      }];
     }
   }
 
-  static async d10() {
+  static async fakeD10(faces) {
-    let roll = new Roll('1d10');
+    let roll = new Roll(`1d${faces}`);
     await roll.evaluate({ async: true });
     return roll.total;
   }

module/rdd-main.js

@@ -63,6 +63,7 @@ import { AppAstrologie } from "./sommeil/app-astrologie.js";
 import { RdDItemArmure } from "./item/armure.js";
 import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-darkness.js";
 import { RdDCreature } from "./actor/creature.js";
+import { RdDTMRDialog } from "./rdd-tmr-dialog.js";
 
 /**
  * RdD system
@@ -201,6 +202,7 @@ export class SystemReveDeDragon {
     RdDCompendiumOrganiser.init();
     EffetsDraconiques.init()
     TMRUtility.init();
+    await RdDTMRDialog.init()
     RdDHotbar.initDropbar();
     RdDPossession.init();
     TMRRencontres.init();

module/rdd-tmr-dialog.js

@@ -1,4 +1,4 @@
-import { SHOW_DICE } from "./constants.js";
+import { SHOW_DICE, SYSTEM_RDD } from "./constants.js";
 import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { TMRUtility } from "./tmr-utility.js";
@@ -18,18 +18,40 @@ import { RdDRencontre } from "./item/rencontre.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { TYPES } from "./item.js";
 
-/* -------------------------------------------- */
+const TMR_DISPLAY_SIZE = {
+  code: 'tmr-display-size',
+  range: {
+    min: 32,
+    max: 128,
+    step: 8,
+  },
+  def: 64,
+  clamp: (size, inc = 0) => Math.max(TMR_DISPLAY_SIZE.range.min, Math.min(size + (inc * TMR_DISPLAY_SIZE.range.step), TMR_DISPLAY_SIZE.range.max)),
+  get: () => TMR_DISPLAY_SIZE.clamp(game.settings.get(SYSTEM_RDD, TMR_DISPLAY_SIZE.code) ?? TMR_DISPLAY_SIZE.def),
+  set: (size) => game.settings.set(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, TMR_DISPLAY_SIZE.clamp(size)),
+};
 
+/* -------------------------------------------- */
 export class RdDTMRDialog extends Dialog {
+  static async init() {
+    game.settings.register(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, {
+      name: 'Taille des cases des TMR',
+      hint: "Taille en pixel des cases des TMR (réglable directement dans la fenêtre des TMR)",
+      scope: "client",
+      config: true,
+      default: TMR_DISPLAY_SIZE.def,
+      type: Number,
+      range: TMR_DISPLAY_SIZE.range
+    })
+    await PixiTMR.init()
+  }
 
   static async create(actor, tmrData) {
     let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrData);
 
-    if (tmrData.mode != 'visu') {
+    if (tmrData.mode != 'visu' && !game.user.isGM) {
-      // Notification au MJ
       ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatMessage.getWhisperRecipients("GM") });
     }
-
     return new RdDTMRDialog(html, actor, tmrData);
   }
 
@@ -38,21 +60,16 @@ export class RdDTMRDialog extends Dialog {
     const dialogConf = {
       title: "Terres Médianes de Rêve",
       content: html,
-      buttons: {
+      buttons: {}
-        closeButton: {
-          label: "Fermer", callback: html => this.close()
-        }
-      },
-      default: "closeButton"
     }
-
     const dialogOptions = {
       classes: ["tmrdialog"],
-      width: 920, maxheight: 1024, height: 'fit-content',
+      width: 'fit-content',
+      height: 'fit-content',
+      'max-height': 1024,
       'z-index': 40
     }
     super(dialogConf, dialogOptions);
-
     this.tmrdata = duplicate(tmrData);
     this.actor = actor;
     this.actor.tmrApp = this; // reference this app in the actor structure
@@ -63,25 +80,97 @@ export class RdDTMRDialog extends Dialog {
     this.loadCasesSpeciales();
     this.allTokens = [];
     this.rencontreState = 'aucune';
-    this.pixiTMR = new PixiTMR(this);
-
     this.subdialog = undefined
-
+    this.displaySize = undefined
-    this.callbacksOnAnimate = [];
     if (!this.viewOnly) {
       this._tellToGM(this.actor.name + " monte dans les terres médianes (" + tmrData.mode + ")");
     }
+    this.callbacksOnAnimate = [];
+    this.resizePixiTMR(
+      TMR_DISPLAY_SIZE.clamp(game.settings.get(SYSTEM_RDD, TMR_DISPLAY_SIZE.code) ?? TMR_DISPLAY_SIZE.def)
+    )
+  }
 
-    // load the texture we need
+  resizePixiTMR(displaySize) {
-    this.pixiTMR.load((loader, resources) => this.createPixiSprites());
+    if (displaySize != this.displaySize) {
+      if (!this.pixiTMR) {
+        this.pixiTMR = new PixiTMR(this, displaySize);
+      }
+      this.displaySize = displaySize
+      this.pixiTMR.resizeTMR(displaySize);
+      this._removeTokens()
+      this.allTokens = []
+      this.createPixiSprites()
+      this.pixiTMR.loadAnimations();
+    }
+  }
+
+  /* -------------------------------------------- */
+  async activateListeners(html) {
+    super.activateListeners(html);
+    this.html = html;
+
+    // this.activateTMRSize()
+    this.addTMRMap()
+    this.html.find('div.tmr-size a.tmr-size-zoom-minus*').click(event => {
+      this.$changeTMRSize(-1)
+    });
+    this.html.find('div.tmr-size a.tmr-size-zoom-plus*').click(event => {
+      this.$changeTMRSize(1)
+    });
+
+
+    if (this.viewOnly) {
+      this.html.find('.lancer-sort').remove();
+      this.html.find('.lire-signe-draconique').remove();
+      return;
+    }
+
+    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
+    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(this._getCoordActor()));
+
+    this.html.find('form.tmr-dialog *').click(event => this.subdialog?.bringToTop());
+
+    // Roll Sort
+    this.html.find('.lancer-sort').click(event => this.actor.rollUnSort(this._getCoordActor()));
+    this.html.find('.lire-signe-draconique').click(event => this.actor.rollLireSigneDraconique(this._getCoordActor()));
+
+    this.html.find('img.tmr-move').click(event => this.deplacementTMR(this.html.find(event.currentTarget)?.data('move')));
+
+    // Gestion du cout de montée en points de rêve
+    await this.actor.reveActuelIncDec(this.calculCoutMonteeTMR());
+    this.cumulFatigue += this.fatigueParCase;
+
+    // Le reste...
+    this.updateValuesDisplay();
+  }
+  
+  async onDeplacement() {
+    await this.manageRencontre(TMRUtility.getTMR(this._getCoordActor()));
+  }
+
+  addTMRMap() {
+    const tmrCell = document.getElementsByClassName("tmr-map")[0];
+    tmrCell.childNodes.forEach(node => tmrCell.removeChild(node))
+    tmrCell.append(this.pixiTMR.view);
+  }
+
+  $changeTMRSize(inc) {
+    let displaySize = TMR_DISPLAY_SIZE.clamp(this.displaySize, inc)
+    if (displaySize != this.displaySize) {
+      game.settings.set(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, TMR_DISPLAY_SIZE.clamp(displaySize))
+      this.resizePixiTMR(displaySize)
+      this.render()
+    }
   }
 
   async forceTMRDisplay() {
-    this.bringToTop();
+    this.bringToTop()
-    if (this.subdialog) {
+    if (this.subdialog?.bringToTop) {
       this.subdialog.bringToTop();
     }
   }
+
   async restoreTMRAfterAction() {
     this.subdialog = undefined
     await this.maximize();
@@ -90,15 +179,15 @@ export class RdDTMRDialog extends Dialog {
 
   forceTMRContinueAction() {
     ui.notifications.warn('Vous devez finir votre action avant de continuer dans les TMR');
-    this.subdialog.bringToTop();
+    if (this.subdialog?.bringToTop) {
+      this.subdialog.bringToTop();
+    }
     return;
   }
 
   setTMRPendingAction(dialog) {
     this.subdialog = dialog
-    if (dialog instanceof Application) {
+    this.forceTMRDisplay()
-      dialog.bringToTop();
-    }
   }
 
   isDemiReveCache() {
@@ -130,8 +219,8 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   createPixiSprites() {
     this.pixiTMR.setup()
-    this.updateTokens();
+    this.updateTokens()
-    this.forceDemiRevePositionView();
+    this.forceDemiRevePositionView()
   }
 
   /* -------------------------------------------- */
@@ -188,78 +277,28 @@ export class RdDTMRDialog extends Dialog {
   }
 
   forceDemiRevePositionView() {
-    this.notifierResonanceSigneDraconique(this._getActorCoord());
+    this.notifierResonanceSigneDraconique(this._getCoordActor());
     this._trackToken(this.demiReve);
   }
 
-  _getActorCoord() {
+  _getCoordActor() {
     return this.actor.system.reve.tmrpos.coord;
   }
 
   /* -------------------------------------------- */
-  async moveFromKey(move) {
+  async deplacementTMR(move) {
     if (this.subdialog) {
       return this.forceTMRContinueAction();
     }
 
-    let oddq = TMRUtility.coordTMRToOddq(this._getActorCoord());
+    const coordOrig = this._getCoordActor();
-
+    const coordTarget = TMRUtility.deplacement(coordOrig, move);
-    if (move == 'top') oddq.row -= 1;
+    await this._deplacerDemiReve(coordTarget, 'normal');
-    if (move == 'bottom') oddq.row += 1;
-    if (move.includes('left')) oddq.col -= 1;
-    if (move.includes('right')) oddq.col += 1;
-    if (oddq.col % 2 == 1) {
-      if (move == 'top-left') oddq.row -= 1;
-      if (move == 'top-right') oddq.row -= 1;
-    } else {
-      if (move == 'bottom-left') oddq.row += 1;
-      if (move == 'bottom-right') oddq.row += 1;
-    }
-
-    let targetCoord = TMRUtility.oddqToCoordTMR(oddq);
-    await this._deplacerDemiReve(targetCoord, 'normal');
     this.checkQuitterTMR();
   }
 
-  /* -------------------------------------------- */
+  calculCoutMonteeTMR() {
-  async activateListeners(html) {
+    return ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
-    super.activateListeners(html);
-    this.html = html;
-
-    document.getElementsByClassName("tmr-row")
-      .item(0)
-      .insertCell(0)
-      .append(this.pixiTMR.view);
-
-    if (this.viewOnly) {
-      this.html.find('.lancer-sort').remove();
-      this.html.find('.lire-signe-draconique').remove();
-      return;
-    }
-
-    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
-    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(this._getActorCoord()));
-
-    this.html.find('tr.tmr-row *').click(event => this.subdialog?.bringToTop());
-
-    // Roll Sort
-    this.html.find('.lancer-sort').click(event => this.actor.rollUnSort(this._getActorCoord()));
-    this.html.find('.lire-signe-draconique').click(event => this.actor.rollLireSigneDraconique(this._getActorCoord()));
-    this.html.find('#dir-top').click(event=> this.moveFromKey("top"));
-    this.html.find('#dir-top-left').click(event=> this.moveFromKey("top-left"));
-    this.html.find('#dir-top-right').click(event=> this.moveFromKey("top-right"));
-    this.html.find('#dir-bottom-left').click(event=> this.moveFromKey("bottom-left"));
-    this.html.find('#dir-bottom-right').click(event=> this.moveFromKey("bottom-right"));
-    this.html.find('#dir-bottom').click(event=> this.moveFromKey("bottom"));
-
-    // Gestion du cout de montée en points de rêve
-    let reveCout = ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
-    await this.actor.reveActuelIncDec(reveCout);
-    this.cumulFatigue += this.fatigueParCase;
-    // Le reste...
-    this.updateValuesDisplay();
-    let tmr = TMRUtility.getTMR(this._getActorCoord());
-    await this.manageRencontre(tmr);
   }
 
   /* -------------------------------------------- */
@@ -267,7 +306,7 @@ export class RdDTMRDialog extends Dialog {
     if (!this.rendered) {
       return;
     }
-    const coord = this._getActorCoord();
+    const coord = this._getCoordActor();
 
     HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
 
@@ -295,11 +334,13 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async close() {
+    
     if (this.subdialog) {
       return this.forceTMRContinueAction()
     }
-
+    
     this.descenteTMR = true;
+    this.pixiTMR.close()
     if (this.actor.tmrApp) {
       this.actor.tmrApp = undefined; // Cleanup reference
       if (!this.viewOnly) {
@@ -425,7 +466,7 @@ export class RdDTMRDialog extends Dialog {
       nbRounds: 1,
       canClose: false,
       selectedCarac: { label: "reve-actuel" },
-      tmr: TMRUtility.getTMR(this._getActorCoord())
+      tmr: TMRUtility.getTMR(this._getCoordActor())
     }
 
     await this._tentativeMaitrise(rencontreData);
@@ -608,19 +649,18 @@ export class RdDTMRDialog extends Dialog {
     if (rencontre) {
       return game.system.rdd.rencontresTMR.calculRencontre(rencontre, tmr);
     }
-    let locTMR = (this.isDemiReveCache()
+    const coordTMR = (this.isDemiReveCache()
       ? TMRUtility.getTMRType(tmr.coord) + " ??"
       : tmr.label + " (" + tmr.coord + ")");
 
-    const fakeDialogRencontre = { bringToTop: () => { } };
+    this.setTMRPendingAction({ bringToTop: () => { } })
-    this.setTMRPendingAction(fakeDialogRencontre)
+    const myRoll = await RdDDice.rollTotal("1dt", { showDice: SHOW_DICE });
-    let myRoll = await RdDDice.rollTotal("1dt", { showDice: SHOW_DICE });
     this.restoreTMRAfterAction()
     if (myRoll == 7) {
-      this._tellToUser(myRoll + ": Rencontre en " + locTMR);
+      this._tellToUser(myRoll + ": Rencontre en " + coordTMR);
       return await game.system.rdd.rencontresTMR.getRencontreAleatoire(tmr, this.actor.isMauvaiseRencontre())
     } else {
-      this._tellToUser(myRoll + ": Pas de rencontre en " + locTMR);
+      this._tellToUser(myRoll + ": Pas de rencontre en " + coordTMR);
       return undefined;
     }
   }
@@ -934,19 +974,18 @@ export class RdDTMRDialog extends Dialog {
     if (this.subdialog) {
       return this.forceTMRContinueAction()
     }
-    let clickOddq = TMRUtility.computeEventOddq(event);
+    const currentCoord = this._getCoordActor()
-    let currentOddq = TMRUtility.coordTMRToOddq(this._getActorCoord());
+    const currentOddq = TMRUtility.coordTMRToOddq(currentCoord)
-
+    const targetOddq = this.pixiTMR.computeEventOddq(event)
-    let targetCoord = TMRUtility.oddqToCoordTMR(clickOddq);
+    const targetCoord = TMRUtility.oddqToCoordTMR(targetOddq)
-    let currentCoord = TMRUtility.oddqToCoordTMR(currentOddq);
 
     // Validation de la case de destination (gestion du cas des rencontres qui peuvent téléporter)
-    let deplacementType = this._calculDeplacement(targetCoord, currentCoord, currentOddq, clickOddq);
+    const typeDeplacement = this._calculDeplacement(targetCoord, currentCoord, currentOddq, targetOddq);
 
     if (this.isDemiReveCache()) {
       if (this.isTerreAttache(targetCoord)
         || this.isConnaissanceFleuve(currentCoord, targetCoord)
-        || deplacementType == 'changeur') {
+        || typeDeplacement == 'changeur') {
         // déplacement possible
         await this.actor.setTMRVisible(true);
         this.demiReve = this._tokenDemiReve();
@@ -961,11 +1000,11 @@ export class RdDTMRDialog extends Dialog {
       }
     }
 
-    switch (deplacementType) {
+    switch (typeDeplacement) {
       case 'normal':
       case 'changeur':
       case 'passeur':
-        await this._deplacerDemiReve(targetCoord, deplacementType);
+        await this._deplacerDemiReve(targetCoord, typeDeplacement);
         break;
       case 'messager':
         await this._messagerDemiReve(targetCoord);
@@ -1085,7 +1124,7 @@ export class RdDTMRDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  _removeTokens(filter) {
+  _removeTokens(filter = it => true) {
     this.allTokens.filter(filter).forEach(token => this.pixiTMR.removeToken(token))
   }
 

module/tmr-constants.js

@@ -1,27 +1,64 @@
 
-/* -------------------------------------------- */
+export class TMRConstants {
-export const tmrConstants = {
+  constructor({ size = 64 }) {
-  col1_y: 30,
+    // tailles
-  col2_y: 55,
+    this.size = size
-  cellw: 55,
+    this.half = this.size / 2
-  cellh: 55,
+    this.quarter = this.size / 4
-  gridx: 28,
+    this.third = this.size / 3
-  gridy: 28,
+    this.twoThird = this.size * 2 / 3
-  // tailles
+    this.full = this.size
-  third: 18,
+    // positions
-  half: 27.5,
+    this.col1_y = this.half
-  twoThird: 36,
+    this.col2_y = this.size
-  full: 55,
+    this.cellw = this.size
-  // decallages
+    this.cellh = this.size
-  center: { x: 0, y: 0 },
+    this.gridx = this.half
-  top: { x: 0, y: -11.5 },
+    this.gridy = this.half
-  topLeft: { x: -11.5, y: -11.5 },
+    // decallages
-  left: { x: -11.5, y: 0 },
+    this.center = { x: 0, y: 0 }
-  bottomLeft: { x: -11.5, y: 11.5 },
+    this.top = { x: 0, y: -this.quarter }
-  bottom: { x: 0, y: 11.5 },
+    this.topLeft = { x: -this.quarter, y: -this.quarter }
-  bottomRight: { x: 11.5, y: 11.5 },
+    this.left = { x: -this.quarter, y: 0 }
-  right: { x: 11.5, y: 0 },
+    this.bottomLeft = { x: -this.quarter, y: this.quarter }
-  topRight: { x: 11.5, y: -11.5 },
+    this.bottom = { x: 0, y: this.quarter }
+    this.bottomRight = { x: this.quarter, y: this.quarter }
+    this.right = { x: this.quarter, y: 0 }
+    this.topRight = { x: this.quarter, y: -this.quarter }
+    this.marginx = 1
+    this.marginy = 1
+  }
+
+  decallage(x, y) {
+    return {
+      x: x * this.third,
+      y: y * this.third
+    }
+  }
+
+  computeEventPosition(event) {
+    if (!event.nativeEvent.target.getBoundingClientRect) {
+      return { x: 0, y: 0 }
+    }
+    const canvasRect = event.nativeEvent.target.getBoundingClientRect();
+    return {
+      x: event.nativeEvent.clientX - canvasRect.left,
+      y: event.nativeEvent.clientY - canvasRect.top
+    }
+  }
+
+  computeEventOddq(event) {
+    var { x, y } = this.computeEventPosition(event);
+    return this.computeOddq(x, y);
+  }
+
+
+  computeOddq(x, y) {
+    const col = Math.floor(x / this.cellw)
+    const decallageColonne = col % 2 == 0 ? this.col1_y : this.col2_y
+    const row = Math.floor((y - decallageColonne) / this.cellh)
+    return { col, row, x, y }
+  }
 }
 
 // couleurs
@@ -35,13 +72,15 @@ export const tmrColors = {
   rencontre: 0xFF0000,
   casehumide: 0x1050F0,
 }
+
 export const tmrTokenZIndex = {
-  sort: 40,
-  tetes: 20,
   casehumide: 10,
-  conquete: 30,
+  tetes: 20,
+  sort: 30,
+  conquete: 40,
   rencontre: 50,
   trounoir: 60,
   demireve: 70,
   tooltip: 100,
 }
+

module/tmr-utility.js

@@ -1,7 +1,6 @@
 import { Misc } from "./misc.js";
 import { Grammar } from "./grammar.js";
 import { RdDDice } from "./rdd-dice.js";
-import { tmrConstants } from "./tmr-constants.js";
 
 /* -------------------------------------------- */
 const TMRMapping = {
@@ -228,16 +227,28 @@ export const TMRType = {
 }
 
 /* -------------------------------------------- */
-const tmrRandomMovePatten =
+const TMR_MOVE = {
-  [{ name: 'top', col: 0, row: -1 },
+  "top": { even: { row: -1, col: 0 }, odd: { row: -1, col: 0 }, },
-  { name: 'topright', col: 1, row: -1 },
+  "topleft": { even: { row: -1, col: -1 }, odd: { row: 0, col: -1 }, },
-  { name: 'botright', col: 1, row: 1 },
+  "topright": { even: { row: -1, col: 1 }, odd: { row: 0, col: 1 }, },
-  { name: 'bot', col: 0, row: 1 },
+  "bottomleft": { even: { row: 0, col: -1 }, odd: { row: 1, col: -1 }, },
-  { name: 'botleft', col: -1, row: 1 },
+  "bottomright": { even: { row: 0, col: 1 }, odd: { row: 1, col: 1 }, },
-  { name: 'topleft', col: -1, row: -1 }
+  "bottom": { even: { row: 1, col: 0 }, odd: { row: 1, col: 0 }, },
-  ]
+}
 
-/* -------------------------------------------- */
+/* --------------------------------------------
+ * Pour comprendre les conversions entre coordonnées
+ * - "TMR" A1, ... M15
+ * - oddq: {col, row}
+ * - axial: { q, r )
+ *
+ * Un site intéressant: https://www.redblobgames.com/grids/hexagons/#distances
+ *
+ * Pour être concis, le code TMR lettre(colonne)-ligne correspond à une grille hexagonale en coordonnées "odd-q"
+ * (lettre => col, ligne => row).
+ * 
+ * Pour les calculs de distance, les coordonnées axiales sont beaucoup plus pratiques.
+ */
 export class TMRUtility {
   static init() {
     for (let coord in TMRMapping) {
@@ -313,17 +324,33 @@ export class TMRUtility {
   }
 
   /* -------------------------------------------- */
-  static async getDirectionPattern() {
+  static deplacement(coordOrig, moveName) {
-    return await RdDDice.rollOneOf(tmrRandomMovePatten);
+    const tmrMove = TMR_MOVE[moveName];
+    if (! tmrMove) {
+      ui.notifications.error(`Le déplacement dans les TMR '${moveName}' est inconnu`)
+      return coordOrig
+    }
+    const fromOddq = TMRUtility.coordTMRToOddq(coordOrig);
+    const move = TMRUtility.getOddqMove(tmrMove, fromOddq);
+    const toOddq = TMRUtility.addOddq(fromOddq, move);
+    return TMRUtility.oddqToCoordTMR(toOddq);
+  }
+
+  static getOddqMove(tmrMove, oddq) {
+    return oddq.col % 2 == 1 ? tmrMove.odd : tmrMove.even;
+  }
+
+  static async getDirectionPattern(oddq) {
+    const tmrMove = await RdDDice.rollOneOf(Object.values(TMR_MOVE));
+    return TMRUtility.getOddqMove(tmrMove, oddq);
   }
 
   /* -------------------------------------------- */
   static async deplaceTMRAleatoire(actor, coord) {
-    const currentOddq = TMRUtility.coordTMRToOddq(coord);
+    const oddq = TMRUtility.coordTMRToOddq(coord);
-    const direction = await TMRUtility.getDirectionPattern();
+    const direction = await TMRUtility.getDirectionPattern(oddq);
-    currentOddq.col = currentOddq.col + direction.col;
+    const currentOddq = TMRUtility.addOddq(oddq, direction)
-    currentOddq.row = currentOddq.row + direction.row;
+    if (TMRUtility.isOddqInTMR(currentOddq)) { // Sortie de carte ! Ré-insertion aléatoire
-    if (this.isOddqInTMR(currentOddq)) { // Sortie de carte ! Ré-insertion aléatoire
       return TMRUtility.getTMR(TMRUtility.oddqToCoordTMR(currentOddq));
     } else {
       return await actor.reinsertionAleatoire('Sortie de carte');
@@ -360,15 +387,15 @@ export class TMRUtility {
    * 
    */
   static getTMRPortee(coord, portee) {
-    let centerOddq = this.coordTMRToOddq(coord);
+    let centerOddq = TMRUtility.coordTMRToOddq(coord);
     let caseList = [];
     for (let dcol = -portee; dcol <= portee; dcol++) { // rows
       for (let drow = -portee; drow <= portee; drow++) { // columns
         const currentOddq = { col: centerOddq.col + dcol, row: centerOddq.row + drow };
-        if (this.isOddqInTMR(currentOddq)) {
+        if (TMRUtility.isOddqInTMR(currentOddq)) {
-          let dist = this.distanceOddq(centerOddq, currentOddq);
+          let dist = TMRUtility.distanceOddq(centerOddq, currentOddq);
           if (dist <= portee) {
-            caseList.push(this.oddqToCoordTMR(currentOddq)); // Inside the area
+            caseList.push(TMRUtility.oddqToCoordTMR(currentOddq)); // Inside the area
           }
         }
       }
@@ -376,40 +403,6 @@ export class TMRUtility {
     return caseList;
   }
 
-  // /* -------------------------------------------- */
-  static computeEventPosition(event) {
-    if (!event.nativeEvent.target.getBoundingClientRect) {
-      return { x: 0, y: 0 }
-    }
-    const canvasRect = event.nativeEvent.target.getBoundingClientRect();
-    return {
-      x: event.nativeEvent.clientX - canvasRect.left,
-      y: event.nativeEvent.clientY - canvasRect.top
-    };
-  }
-
-  /* -------------------------------------------- */
-  static computeEventOddq(event) {
-    var { x, y } = TMRUtility.computeEventPosition(event);
-    return TMRUtility.computeOddq(x, y);
-  }
-
-  static computeOddq(x, y) {
-    const col = Math.floor(x / tmrConstants.cellw); //  [From 0 -> 12]
-    const decallageColonne = col % 2 == 0 ? tmrConstants.col1_y : tmrConstants.col2_y;
-    const row = Math.floor((y - decallageColonne) / tmrConstants.cellh); //  [From 0 -> 14]
-    return { col, row };
-  }
-
-  static computeEventCoord(event) {
-    const oddq = TMRUtility.computeEventOddq(event);
-    return TMRUtility.oddqToCoordTMR(oddq);
-  }
-
-  /* -------------------------------------------- */
-  // https://www.redblobgames.com/grids/hexagons/#distances
-  // TMR Letter-row correspond to "odd-q" grid (letter => col, numeric => row )
-
   /* -------------------------------------------- */
   static coordTMRToOddq(coordTMR) {
     let col = coordTMR.charCodeAt(0) - 65;
@@ -432,17 +425,13 @@ export class TMRUtility {
       row >= 0 &&
       (row + col % 2 <= 14)
     );
-    // if (x >= 0 && x < 13 && y >= 0 && y < 14) return true;
-    // if (x >= 0 && x < 13 && x % 2 == 0 && y == 14) return true;
-    // return false;
   }
 
-
   /* -------------------------------------------- */
   static distanceCoordTMR(coord1, coord2) {
-    let oddq1 = this.coordTMRToOddq(coord1);
+    let oddq1 = TMRUtility.coordTMRToOddq(coord1);
-    let oddq2 = this.coordTMRToOddq(coord2);
+    let oddq2 = TMRUtility.coordTMRToOddq(coord2);
-    return this.distanceOddq(oddq1, oddq2);
+    return TMRUtility.distanceOddq(oddq1, oddq2);
   }
 
   /* -------------------------------------------- */
@@ -450,13 +439,13 @@ export class TMRUtility {
     const axial1 = TMRUtility.oddqToAxial(oddq1);
     const axial2 = TMRUtility.oddqToAxial(oddq2);
     return TMRUtility.distanceAxial(axial1, axial2);
+  }
 
-    // const dx = oddq2.col - oddq1.col;
+  static addOddq(move, oddq) {
-    // const dy = oddq2.row - oddq1.row;
+    return {
-    // const abs_dx = Math.abs(dx);
+      row: oddq.row + move.row,
-    // const abs_dy = Math.abs(dy);
+      col: oddq.col + move.col
-    // const distance = Math.sign(dx) == Math.sign(dy) ? Math.max(abs_dx, abs_dy) : (abs_dx + abs_dy);
+    }
-    // return distance;
   }
 
   static oddqToAxial(pos) {
@@ -480,20 +469,4 @@ export class TMRUtility {
     };
   }
 
-  //   function axial_to_cube(hex):
-  //   var q = hex.q
-  // var r = hex.r
-  // var s = -q - r
-  // return Cube(q, r, s)
-  // }
-
-
-  // /* -------------------------------------------- */
-  // static computeRealPictureCoordinates(coordOddq) {
-  //   let decallagePairImpair = (coordOddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
-  //   return {
-  //     x: tmrConstants.gridx + (coordOddq.col * tmrConstants.cellw),
-  //     y: tmrConstants.gridy + (coordOddq.row * tmrConstants.cellh) + decallagePairImpair
-  //   }
-  // }
 }

module/tmr/animation.js

@@ -0,0 +1,107 @@
+// pixiTMR.animate(pixiApp => pixiApp.ticker.add((delta) => {
+//   if (!sprite.waveAnimation) {
+//     sprite.waveAnimation = {
+//       originx: sprite.x,
+//       movex: 0,
+//       step: 0.03
+//     }
+//   }
+//   else {
+//     if (Math.abs(sprite.waveAnimation.movex) > 2) {
+//       sprite.waveAnimation.step = -sprite.waveAnimation.step
+//     }
+//     sprite.waveAnimation.movex += sprite.waveAnimation.step;
+//   }
+//   sprite.x = sprite.waveAnimation.originx + sprite.waveAnimation.movex
+// }));
+
+// return pixiTMR.square(this.code(),
+//   {
+//     zIndex: tmrTokenZIndex.trounoir,
+//     tint: tmrColors.trounoir,
+//     alpha: 1,
+//     taille: () => pixiTMR.sizes.full,
+//     decallage: {
+//       x: -pixiTMR.sizes.half,
+//       y: -pixiTMR.sizes.half
+//     }
+//   })
+
+export class TMRAnimations {
+
+  static withAnimation(sprite, pixiTMR, ...animations) {
+    if (animations.length > 0) {
+      animations.forEach(animation =>
+        pixiTMR.animate(pixiApp => pixiApp.ticker.add(delta => animation(sprite, delta)))
+      )
+    }
+    return sprite
+  }
+
+  static rotation(options = { frequence: () => 1, angle: () => 1 }) {
+    return (sprite, delta) => {
+      if (!sprite.tmrConfig) {
+        sprite.tmrConfig = { nextTick: 0 }
+      }
+      sprite.tmrConfig.nextTick -= delta
+      if (sprite.tmrConfig.nextTick <= 0) {
+        sprite.tmrConfig.nextTick = options.frequence(delta)
+        sprite.angle += options.angle(delta)
+      }
+    }
+  }
+
+  static changeZoom(range = { min: 0.8, max: 1.2, step: 0.005 }) {
+    return (sprite, delta) => {
+      if (!sprite.tmrConfig) {
+        sprite.tmrConfig = TMRAnimations.startRange(range)
+      }
+      sprite.tmrConfig.current += (sprite.tmrConfig.step * delta)
+      if (sprite.tmrConfig.current < sprite.tmrConfig.min) {
+        sprite.tmrConfig.step = Math.abs(sprite.tmrConfig.step)
+      }
+      else if (sprite.tmrConfig.current > sprite.tmrConfig.max) {
+        sprite.tmrConfig.step = -Math.abs(sprite.tmrConfig.step)
+
+      }
+      const taille = sprite.tmrConfig.current * sprite.taille()
+      sprite.width = taille
+      sprite.height = taille
+    }
+  }
+
+  static verticalAxis(options = { step: 1 }) {
+    return (sprite, delta) => {
+      if (!sprite.tmrConfig) {
+        sprite.tmrConfig = this.startRange({
+          min: -Math.PI / 2,
+          max: Math.PI / 2,
+          step: options.step * Math.PI / 180,
+        })
+      }
+      sprite.tmrConfig.current += (sprite.tmrConfig.step * delta)
+      sprite.width = Math.cos(sprite.tmrConfig.current) * sprite.taille()
+    }
+  }
+
+  static startRange(range) {
+    range.current = TMRAnimations.randomInSegment(range)
+    const min = range.min
+    if (min > range.max) {
+      range.min = range.max
+      range.max = min
+    }
+    return range
+  }
+
+  static outOfRange(range) {
+    return range.current < range.min || range.current > range.max
+  }
+
+  static randomInSegment(range) {
+    const min = range.min
+    const max = range.max
+    const step = range.step
+    return min + (Math.floor(Math.random() / step) * step) * (max - min)
+  }
+}

module/tmr/augmentation-seuil.js

@@ -4,10 +4,6 @@ import { Misc } from "../misc.js";
 
 export class AugmentationSeuil extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'tete' }
   match(item) { return Draconique.isTeteDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('augmentation du seuil de reve'); }
   manualMessage() { return false }

module/tmr/carte-tmr.js

@@ -20,10 +20,10 @@ export class CarteTmr extends Draconique {
     const img = PixiTMR.getImgFromCode(this.code())
     const sprite = new PIXI.Sprite(PIXI.utils.TextureCache[img]);
     // Setup the position of the TMR
-    sprite.x = 0;
+    sprite.x = pixiTMR.pixiApp.screen.x;
-    sprite.y = 0;
+    sprite.y = pixiTMR.pixiApp.screen.y;
-    sprite.width = 722;
+    sprite.width = pixiTMR.pixiApp.screen.width;
-    sprite.height = 860;
+    sprite.height = pixiTMR.pixiApp.screen.height;
     // Rotate around the center
     sprite.anchor.set(0);
     sprite.buttonMode = true;
@@ -31,9 +31,5 @@ export class CarteTmr extends Draconique {
     return sprite;
   }
 
-  computeTooltip(coordTMR) {
-    const tmr = TMRUtility.getTMR(coordTMR)
-    return tmr? TMRUtility.getTMRLabel(coordTMR) : '';
-  }
 
 }

module/tmr/conquete.js

@@ -1,40 +1,38 @@
 import { Grammar } from "../grammar.js";
 import { RdDDice } from "../rdd-dice.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
-
 import { Draconique } from "./draconique.js";
+import { TMRAnimations } from "./animation.js";
 
 export class Conquete extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'queue' }
   match(item) { return Draconique.isQueueDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('conquete'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, item) { await this._creerConquete(actor, item); }
 
   code() { return 'conquete' }
-  tooltip(linkData) { return `${this.tmrLabel(linkData)}: doit être conquis` }
+  tooltip(linkData) { return `Doit être conquis` }
-  img() { return 'icons/svg/combat.svg' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/conquete.svg' }
 
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(),
+    return TMRAnimations.withAnimation(
-      {
+      pixiTMR.sprite(this.code(), {
         zIndex: tmrTokenZIndex.conquete,
-        color: tmrColors.queues,
+        decallage: pixiTMR.sizes.decallage(0, 0),
-        taille: tmrConstants.full,
+        taille: () => pixiTMR.sizes.half,
-        decallage: { x: 2, y: 0 }
+      }),
-      });
+      pixiTMR,
+      TMRAnimations.changeZoom()
+    )
   }
 
   async _creerConquete(actor, queue) {
     let existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     let possibles = TMRUtility.filterTMR(tmr => !TMRUtility.isCaseHumide(tmr) && !existants.includes(tmr.coord));
     let conquete = await RdDDice.rollOneOf(possibles);
-    await this.createCaseTmr(actor, 'Conquête: ' + conquete.label, conquete, queue.id);
+    await this.createCaseTmr(actor, 'Conquête', conquete, queue.id);
   }
 
   async onActorDeleteCaseTmr(actor, casetmr) {

module/tmr/debordement.js

@@ -1,34 +1,30 @@
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class Debordement extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'souffle' }
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('debordement'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, souffle) {
     const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     const tmr = await TMRUtility.getTMRAleatoire(it => !(TMRUtility.isCaseHumide(it) || existants.includes(it.coord)));
-    await this.createCaseTmr(actor, 'Debordement: ' + tmr.label, tmr, souffle.id);
+    await this.createCaseTmr(actor, 'Debordement', tmr, souffle.id);
   }
 
   code() { return 'debordement' }
-  tooltip(linkData) { return `Débordement en ${this.tmrLabel(linkData)}` }
+  tooltip(linkData) { return `Débordement` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/wave.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/debordement.svg' }
 
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(), {
+    const sprite = pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.casehumide,
-      alpha: 0.6,
+      decallage: pixiTMR.sizes.decallage(0, 2/3),
-      taille: tmrConstants.full,
+      taille: () => pixiTMR.sizes.half,
-      decallage: tmrConstants.center
+    })
-    });
+    return sprite;
   }
 
 }

module/tmr/demi-reve.js

@@ -1,12 +1,8 @@
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class DemiReve extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return '' }
   match(item) { return false; }
   manualMessage() { return false }
@@ -18,9 +14,9 @@ export class DemiReve extends Draconique {
 
   createSprite(pixiTMR) {
     const sprite = pixiTMR.sprite(this.code(), {
-      color: tmrColors.demireve,
+      tint: tmrColors.demireve,
       zIndex: tmrTokenZIndex.demireve,
-      taille: (tmrConstants.full * 0.7)
+      taille: () => pixiTMR.sizes.twoThird
     });
     pixiTMR.animate(pixiApp => pixiApp.ticker.add((delta) => sprite.rotation -= 0.01 * delta));
     return sprite;

module/tmr/desorientation.js

@@ -1,14 +1,12 @@
 import { Grammar } from "../grammar.js";
 import { Misc } from "../misc.js";
 import { RdDDice } from "../rdd-dice.js";
-import { TMRUtility, TMRType} from "../tmr-utility.js";
+import { TMRUtility, TMRType } from "../tmr-utility.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
+import { TMRAnimations } from "./animation.js";
 
 export class Desorientation extends Draconique {
-  constructor() {
-    super();
-  }
 
   type() { return 'souffle' }
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('desorientation'); }
@@ -28,24 +26,27 @@ export class Desorientation extends Draconique {
 
   code() { return 'desorientation' }
   tooltip(linkData) { return `Désorientation, cette case n'existe plus !` }
-  img() { return 'icons/svg/explosion.svg' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/desorientation.svg' }
 
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(),
+    return TMRAnimations.withAnimation(
-      {
+      pixiTMR.sprite(this.code(), {
         zIndex: tmrTokenZIndex.trounoir,
-        color: tmrColors.trounoir,
+        taille: () => pixiTMR.sizes.full,
-        alpha: 1,
+      }),
-        taille: tmrConstants.full,
+      pixiTMR,
-        decallage: { x: 2, y: 2 },
+      TMRAnimations.rotation({
-      });
+        frequence: delta => 2^(2 + Math.random() * 12) * 70,
+        angle: delta => (Math.floor(Math.random() * 2) - 1) * 30
+      })
+    )
   }
 
   async _creerCasesTmr(actor, type, souffle) {
     const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     let tmrs = TMRUtility.filterTMR(it => it.type == type && !existants.includes(it.coord));
     for (let tmr of tmrs) {
-      await this.createCaseTmr(actor, 'Désorientation: ' + tmr.label, tmr, souffle.id);
+      await this.createCaseTmr(actor, 'Désorientation', tmr, souffle.id);
     }
   }
 

module/tmr/draconique.js

@@ -9,14 +9,15 @@ const registeredEffects = [
  * Définition des informations d'une "draconique" (queue, ombre, tête, souffle) qui influence les TMR
  */
 export class Draconique {
+  static init() {
+  }
+
   static isCaseTMR(item) { return item.type == TYPES.casetmr; }
   static isQueueDragon(item) { return item.isQueueDragon(); }
   static isSouffleDragon(item) { return item.type == TYPES.souffle; }
   static isTeteDragon(item) { return item.type == TYPES.tete; }
   static isQueueSouffle(item) { return Draconique.isQueueDragon(item) || Draconique.isSouffleDragon(item); }
 
-  tmrLabel(linkData) { return TMRUtility.getTMRLabel(linkData.system.coord); }
-
   static register(draconique) {
     registeredEffects[draconique.code()] = draconique;
     if (draconique.img()) {
@@ -33,6 +34,8 @@ export class Draconique {
     return registeredEffects[code];
   }
 
+  tmrLabel(linkData) { return TMRUtility.getTMRLabel(linkData.system.coord); }
+
   /**
    * @param item un Item quelconque
    * @returns true si l'item correspond
@@ -96,32 +99,13 @@ export class Draconique {
     return token;
   }
 
-  /**
-   * methode en charge de recalculer le tooltip lorsque la souris bouge
-   * @param {*} event evenement contenant les coordonnées
-   * @param {*} sprite sprite pour laquelle calculer le tooltip
-   */
-  computeTooltip(event, sprite) {
-    if (sprite.isOver) {
-      const oddq = TMRUtility.computeEventOddq(event);
-      const coord = TMRUtility.oddqToCoordTMR(oddq);
-      const tmr = TMRUtility.getTMR(coord)
-      if (tmr){
-        const label = TMRUtility.getTMRLabel(coord);
-        const text = this.tooltip(this.linkData);
-        return text ? `${coord}: ${label}\n${text}` : `${coord}: ${label}`
-      }
-    }
-    return '';
-  }
-
   /**
    * factory d'élément graphique PIXI correpsondant à l'objet draconique
    * @param {*} pixiTMR instance de PixiTMR qui gère les tooltips, les méthodes de création de sprite standard, les clicks.
    */
   createSprite(pixiTMR) {
     if (this.img()) {
-      return pixiTMR.sprite(this.code());
+      return pixiTMR.sprite(this.code())
     }
     else {
       return pixiTMR.circle()
@@ -143,7 +127,9 @@ export class Draconique {
 
   async createCaseTmr(actor, label, tmr, sourceId = undefined) {
     const casetmrData = {
-      name: label, type: 'casetmr', img: this.img(),
+      name: label,
+      type: 'casetmr',
+      img: this.img(),
       system: { coord: tmr.coord, specific: this.code(), sourceid: sourceId }
     };
     await actor.createEmbeddedDocuments('Item', [casetmrData]);

module/tmr/effets-draconiques.js

@@ -20,9 +20,9 @@ import { Grammar } from "../grammar.js";
 import { AugmentationSeuil } from "./augmentation-seuil.js";
 import { TYPES } from "../item.js";
 
-
 export class EffetsDraconiques {
   static carteTmr = new CarteTmr();
+
   static demiReve = new DemiReve();
   static rencontre = new Rencontre();
   static sortReserve = new SortReserve();
@@ -39,10 +39,13 @@ export class EffetsDraconiques {
   static pelerinage = new Pelerinage();
   static periple = new Periple();
   static urgenceDraconique = new UrgenceDraconique();
+
   static augmentationSeuil = new AugmentationSeuil();
 
   static init() {
+    Draconique.init();
     Draconique.register(EffetsDraconiques.carteTmr);
+    // icône TMR
     Draconique.register(EffetsDraconiques.demiReve);
     Draconique.register(EffetsDraconiques.rencontre);
     Draconique.register(EffetsDraconiques.sortReserve);
@@ -59,6 +62,7 @@ export class EffetsDraconiques {
     Draconique.register(EffetsDraconiques.pelerinage);
     Draconique.register(EffetsDraconiques.periple);
     Draconique.register(EffetsDraconiques.urgenceDraconique);
+    // effets sans icône TMR
     Draconique.register(EffetsDraconiques.augmentationSeuil)
   }
 
@@ -184,5 +188,4 @@ export class EffetsDraconiques {
     return EffetsDraconiques.soufflesDragon(actor, 'péage').length > 0;
   }
 
-
 }

module/tmr/fermeture-cites.js

@@ -1,39 +1,32 @@
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class FermetureCites extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'souffle' }
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('fermeture des cites'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, souffle) { await this._fermerLesCites(actor, souffle); }
 
   code() { return 'fermeture' }
-  tooltip(linkData) { return `La ${this.tmrLabel(linkData)} est fermée` }
+  tooltip(linkData) { return `Cité fermée` }
-  img() { return 'icons/svg/door-closed.svg' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/fermeture.svg' }
 
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(),
+    return pixiTMR.sprite(this.code(), {
-      {
+      zIndex: tmrTokenZIndex.conquete,
-        zIndex: tmrTokenZIndex.conquete,
+      decallage: pixiTMR.sizes.decallage(0, 0),
-        color: tmrColors.souffle,
+      taille: () => pixiTMR.sizes.full
-        alpha: 0.9,
+    })
-        taille: tmrConstants.full,
-        decallage: { x: 2, y: 0 }
-      });
   }
 
   async _fermerLesCites(actor, souffle) {
     let existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     let ouvertes = TMRUtility.filterTMR(it => it.type == 'cite' && !existants.includes(it.coord));
     for (let tmr of ouvertes) {
-      await this.createCaseTmr(actor, 'Fermeture: ' + tmr.label, tmr, souffle.id);
+      await this.createCaseTmr(actor, 'Fermeture', tmr, souffle.id);
     }
   }
 }

module/tmr/pelerinage.js

@@ -1,37 +1,36 @@
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
+import { TMRAnimations } from "./animation.js";
 
 export class Pelerinage extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'queue' }
   match(item) { return Draconique.isQueueDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('pelerinage'); }
   manualMessage() { return false }
 
-  async onActorCreateOwned(actor, queue) { 
+  async onActorCreateOwned(actor, queue) {
     let tmr = await TMRUtility.getTMRAleatoire();
-    await this.createCaseTmr(actor, 'Pèlerinage: ' + tmr.label, tmr, queue.id);
+    await this.createCaseTmr(actor, 'Pèlerinage', tmr, queue.id);
   }
-  
+
-  
   code() { return 'pelerinage' }
-  tooltip(linkData) { return `Votre pèlerinage en ${this.tmrLabel(linkData)}` }
+  tooltip(linkData) { return `Lieu de pèlerinage` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/pelerin.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/pelerinage.svg' }
-  
+
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(), {
+    return TMRAnimations.withAnimation(
-      zIndex: tmrTokenZIndex.conquete,
+      pixiTMR.sprite(this.code(), {
-      alpha: 1,
+        zIndex: tmrTokenZIndex.conquete,
-      taille: tmrConstants.full,
+        decallage: pixiTMR.sizes.decallage(0, 0),
-      decallage: tmrConstants.center
+        taille: () => pixiTMR.sizes.half,
-    });
+      }),
+      pixiTMR,
+      TMRAnimations.changeZoom()
+    )
   }
-  
+
   async onActorDeleteCaseTmr(actor, casetmr) {
     await actor.deleteEmbeddedDocuments('Item', [casetmr.system.sourceid]);
   }

module/tmr/periple.js

@@ -1,15 +1,12 @@
 import { Grammar } from "../grammar.js";
 import { RdDDice } from "../rdd-dice.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
+import { TMRAnimations } from "./animation.js";
 
 export class Periple extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'souffle' }
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('periple'); }
   manualMessage() { return false }
@@ -18,22 +15,25 @@ export class Periple extends Draconique {
     let terrain = (await RdDDice.rollTotal("1d2")) == 1 ? 'sanctuaire' : 'necropole';
     let tmrs = TMRUtility.getListTMR(terrain);
     for (let tmr of tmrs) {
-      await this.createCaseTmr(actor, 'Périple: ' + tmr.label, tmr, souffle.id);
+      await this.createCaseTmr(actor, 'Périple', tmr, souffle.id);
     }
   }
 
 
   code() { return 'periple' }
-  tooltip(linkData) { return `Votre Périple passe par ${this.tmrLabel(linkData)}` }
+  tooltip(linkData) { return `Etape de périple` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/pelerin.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/periple.svg' }
 
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(), {
+    return TMRAnimations.withAnimation(
-      zIndex: tmrTokenZIndex.conquete,
+      pixiTMR.sprite(this.code(), {
-      alpha: 1,
+        zIndex: tmrTokenZIndex.conquete,
-      taille: tmrConstants.full,
+        decallage: pixiTMR.sizes.decallage(0, 0),
-      decallage: tmrConstants.center
+        taille: () => pixiTMR.sizes.half
-    });
+      }),
+      pixiTMR,
+      TMRAnimations.changeZoom()
+    )
   }
   getDifficulte(tmr) {
     switch (tmr.type) {

module/tmr/pixi-tmr.js

@@ -1,35 +1,61 @@
+import { SYSTEM_RDD } from "../constants.js";
 import { Misc } from "../misc.js";
-import { RdDTMRDialog } from "../rdd-tmr-dialog.js";
+import { TMRConstants, tmrTokenZIndex } from "../tmr-constants.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
 import { TMRUtility } from "../tmr-utility.js";
 import { EffetsDraconiques } from "./effets-draconiques.js";
 
-export const tooltipStyle = new PIXI.TextStyle({
-  fontFamily: 'CaslonAntique',
-  fontSize: 18,
-  fill: '#FFFFFF',
-  stroke: '#000000',
-  strokeThickness: 3
-});
-
-
 export class PixiTMR {
-
   static textures = []
 
-  constructor(tmrDialog) {
+  static getImgFromCode(code) {
+    return PixiTMR.textures[code]
+  }
+
+  static register(name, img) {
+    PixiTMR.textures[name] = img;
+  }
+  static async init() {
+    await Promise.all(
+      Object.values(PixiTMR.textures)
+        .filter(img => img != undefined)
+        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img)))
+    )
+  }
+
+  constructor(tmrDialog, displaySize) {
     this.tmrDialog = tmrDialog;
-
     this.callbacksOnAnimate = [];
-
+    this.sizes = new TMRConstants({ size: displaySize })
-    this.pixiApp = new PIXI.Application({ width: 720, height: 860 });
+    this.pixiApp = new PIXI.Application(PixiTMR.computeTMRSize(this.sizes));
     this.pixiApp.eventMode = 'static';
     this.pixiApp.stage.sortableChildren = true;
-    this.tooltip = new PIXI.Text('', tooltipStyle);
+
+    this.tooltipStyle = new PIXI.TextStyle({
+      fontFamily: 'CaslonAntique',
+      fontSize: 16,
+      fill: '#FFFFFF',
+      stroke: '#000000',
+      strokeThickness: 4
+    });
+
+    this.tooltip = new PIXI.Text('', this.tooltipStyle);
     this.tooltip.zIndex = 1000
 
     this.pixiApp.stage.addChild(this.tooltip);
+  }
 
+  close() {
+    this.pixiApp.ticker.stop();
+  }
+  static computeTMRSize(sizeConstants) {
+    return { width: sizeConstants.cellw * 13 + sizeConstants.marginx, height: sizeConstants.cellh / 2 + sizeConstants.cellh * 15 + sizeConstants.marginy }
+  }
+
+  resizeTMR(displaySize) {
+    this.sizes = new TMRConstants({ size: displaySize })
+    const appSize = PixiTMR.computeTMRSize(this.sizes)
+    this.pixiApp.renderer.resize(appSize.width, appSize.height)
+    this.tooltipStyle.fontSize = Math.max(this.sizes.size / 4, 16)
   }
 
   get view() {
@@ -48,24 +74,11 @@ export class PixiTMR {
       .on('pointerout', event => this.onHideTooltip(event));
   }
 
-  async load(onLoad = (loader, resources) => { }) {
+  async loadAnimations() {
-    // WIP - Deprecated since v7 : let loader = new PIXI.Loader();
-    for (const [name, img] of Object.entries(PixiTMR.textures)) {
-      const texture = await PIXI.Assets.load(img);
-      let image = PIXI.Sprite.from(texture);
-    }
-    onLoad();
     for (let onAnimate of this.callbacksOnAnimate) {
       onAnimate();
     }
-  }
+    this.pixiApp.ticker.start();
-
-  static getImgFromCode(code) {
-    return PixiTMR.textures[code]
-  }
-
-  static register(name, img) {
-    PixiTMR.textures[name] = img;
   }
 
   animate(animation = pixiApp => { }) {
@@ -90,33 +103,48 @@ export class PixiTMR {
 
   sprite(code, options = {}) {
     let img = PixiTMR.getImgFromCode(code)
-    const texture = PIXI.utils.TextureCache[img];
+    const texture = PIXI.utils.TextureCache[img]
     if (!texture) {
       console.error("Texture manquante", code, PIXI.utils.TextureCache)
       return;
     }
     let sprite = new PIXI.Sprite(texture);
-    sprite.width = options.taille ?? tmrConstants.half;
+    sprite.taille = options.taille ?? (() => this.sizes.half)
-    sprite.height = options.taille ?? tmrConstants.half;
+
-    sprite.anchor.set(0.5);
+    sprite.width = sprite.taille()
-    if (options.color) {
+    sprite.height = sprite.taille()
-      sprite.tint = options.color;
+    sprite.anchor.set(0.5)
+    if (options.tint) {
+      sprite.tint = options.tint
     }
-    sprite.zIndex = options.zIndex ?? tmrTokenZIndex.casehumide + 1;
+    sprite.zIndex = options.zIndex ?? tmrTokenZIndex.casehumide + 1
-    sprite.alpha = options.alpha ?? 0.75;
+    sprite.alpha = options.alpha ?? 1
-    sprite.decallage = options.decallage ?? tmrConstants.center;
+    sprite.decallage = options.decallage ?? this.sizes.center
-    this.pixiApp.stage.addChild(sprite);
+    this.pixiApp.stage.addChild(sprite)
-    return sprite;
+    return sprite
   }
 
   circle(code, options = {}) {
+    let sprite = new PIXI.Graphics()
+    sprite.taille = options.taille ?? (() => this.sizes.half)
+    sprite.decallage = options.decallage ?? this.sizes.topLeft
+    sprite.beginFill(options.tint, options.opacity)
+    sprite.drawCircle(0, 0, sprite.taille())
+    sprite.endFill()
+    this.pixiApp.stage.addChild(sprite)
+    return sprite
+  }
+
+  square(code, options = {}) {
     let sprite = new PIXI.Graphics();
-    sprite.beginFill(options.color, options.opacity);
+    sprite.taille = options.taille ?? (() => this.sizes.half)
-    sprite.drawCircle(0, 0, (options.taille ?? 12) / 2);
+    sprite.decallage = options.decallage ?? this.sizes.topLeft
-    sprite.endFill();
+    sprite.beginFill(options.tint, options.opacity)
-    sprite.decallage = options.decallage ?? tmrConstants.topLeft;
+    const size = sprite.taille();
-    this.pixiApp.stage.addChild(sprite);
+    sprite.drawRect(0, 0, size, size)
-    return sprite;
+    sprite.endFill()
+    this.pixiApp.stage.addChild(sprite)
+    return sprite
   }
 
   onClickBackground(event) {
@@ -131,7 +159,7 @@ export class PixiTMR {
       this.tooltip.text = this.computeTooltip(event);
     }
   }
-  
+
   onShowTooltip(event) {
     if (!this.carteTMR.isOver) {
       this.setTooltipPosition(event);
@@ -149,25 +177,27 @@ export class PixiTMR {
   }
 
   computeTooltip(event) {
-    const oddq = TMRUtility.computeEventOddq(event);
+    const oddq = this.sizes.computeEventOddq(event);
     const coordTMR = TMRUtility.oddqToCoordTMR(oddq);
     const tmr = TMRUtility.getTMR(coordTMR)
     if (tmr) {
-      const labelTMR = TMRUtility.getTMRLabel(coordTMR);
+      const tmrTooltip = `${coordTMR}: ${TMRUtility.getTMRLabel(coordTMR)}`;
       const tokenTooltips = this.tmrDialog.allTokens
         .filter(token => token.coordTMR() == coordTMR)
         .map(token => token.tooltip);
-      const tmrTooltip = `${coordTMR}: ${labelTMR}`;
       return [tmrTooltip, ...tokenTooltips].reduce(Misc.joining('\n'))
     }
   }
 
-  setTooltipPosition(event) {
+  computeEventOddq(event) {
-    var { x, y } = TMRUtility.computeEventPosition(event);
+    return this.sizes.computeEventOddq(event)
-    const oddq = TMRUtility.computeOddq(x, y);
+  }
 
-    this.tooltip.x = x + (oddq.col > 8 ? -3 * tmrConstants.full : tmrConstants.half);
+  setTooltipPosition(event) {
-    this.tooltip.y = y + (oddq.row > 10 ? -tmrConstants.half : tmrConstants.half);
+    const oddq = this.sizes.computeEventOddq(event);
+
+    this.tooltip.x = oddq.x + (oddq.col > 7 ? -3 * this.sizes.full : this.sizes.quarter);
+    this.tooltip.y = oddq.y + (oddq.row > 10 ? -this.sizes.size : 0);
   }
 
   positionToken(token) {
@@ -175,11 +205,11 @@ export class PixiTMR {
       const sprite = token.sprite;
       const oddq = TMRUtility.coordTMRToOddq(token.coordTMR());
 
-      const decallagePairImpair = (oddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
+      const decallagePairImpair = (oddq.col % 2 == 0) ? this.sizes.col1_y : this.sizes.col2_y;
-      const dx = (sprite.decallage == undefined) ? 0 : sprite.decallage.x;
+      const dx = sprite.decallage?.x ?? 0
-      const dy = (sprite.decallage == undefined) ? 0 : sprite.decallage.y;
+      const dy = sprite.decallage?.y ?? 0
-      sprite.x = tmrConstants.gridx + (oddq.col * tmrConstants.cellw) + dx;
+      sprite.x = this.sizes.gridx + (oddq.col * this.sizes.cellw) + dx;
-      sprite.y = tmrConstants.gridy + (oddq.row * tmrConstants.cellh) + dy + decallagePairImpair;
+      sprite.y = this.sizes.gridy + (oddq.row * this.sizes.cellh) + dy + decallagePairImpair;
     }
   }
 
@@ -190,10 +220,9 @@ export class PixiTMR {
   }
 
   getCaseRectangle(oddq) {
-    let decallagePairImpair = (oddq.col % 2 == 0) ? tmrConstants.col1_y : tmrConstants.col2_y;
+    const decallagePairImpair = (oddq.col % 2 == 0) ? this.sizes.col1_y : this.sizes.col2_y;
-    let x = tmrConstants.gridx + (oddq.col * tmrConstants.cellw) - (tmrConstants.cellw / 2);
+    const x = this.sizes.gridx + (oddq.col * this.sizes.cellw) - (this.sizes.cellw / 2);
-    let y = tmrConstants.gridy + (oddq.row * tmrConstants.cellh) - (tmrConstants.cellh / 2) + decallagePairImpair;
+    const y = this.sizes.gridy + (oddq.row * this.sizes.cellh) - (this.sizes.cellh / 2) + decallagePairImpair;
-    return { x: x, y: y, w: tmrConstants.cellw, h: tmrConstants.cellh };
+    return { x, y, w: this.sizes.cellw, h: this.sizes.cellh };
   }
-
 }

module/tmr/pont-impraticable.js

@@ -1,35 +1,30 @@
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class PontImpraticable extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'souffle' }
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('impraticabilite des ponts'); }
 
   async onActorCreateOwned(actor, souffle) {
     const ponts = TMRUtility.getListTMR('pont');
     for (let tmr of ponts) {
-      await this.createCaseTmr(actor, 'Pont impraticable: ' + tmr.label, tmr, souffle.id);
+      await this.createCaseTmr(actor, 'Pont impraticable', tmr, souffle.id);
     }
   }
 
   code() { return 'pont-impraticable' }
-  tooltip(linkData) { return `${this.tmrLabel(linkData)} impraticable` }
+  tooltip(linkData) { return `Pont impraticable` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/wave.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/debordement.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(),
       {
         zIndex: tmrTokenZIndex.casehumide,
-        alpha: 0.6,
+        decallage: pixiTMR.sizes.decallage(0, 2/3),
-        taille: tmrConstants.full,
+        taille: () => pixiTMR.sizes.half,
-        decallage: tmrConstants.center
       });
   }
 

module/tmr/present-cites.js

@@ -1,31 +1,26 @@
 import { ChatUtility } from "../chat-utility.js";
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class PresentCites extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return 'tete' }
   match(item) { return Draconique.isTeteDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('present des cites'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, tete) { await this._ajouterPresents(actor, tete); }
 
   code() { return 'present-cites' }
-  tooltip(linkData) { return `La ${this.tmrLabel(linkData)} a un présent` }
+  tooltip(linkData) { return `La cité a un présent` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/gift.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/present.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(),
       {
         zIndex: tmrTokenZIndex.tetes,
-        alpha: 0.9,
+        decallage: pixiTMR.sizes.decallage(-1, -1),
-        taille: tmrConstants.third,
+        taille: () => pixiTMR.sizes.third
-        decallage: tmrConstants.topRight
       });
   }
 
@@ -40,7 +35,7 @@ export class PresentCites extends Draconique {
     else {
       let cites = TMRUtility.filterTMR(it => it.type == 'cite');
       for (let tmr of cites) {
-        await this.createCaseTmr(actor, 'Présent: ' + tmr.label, tmr, tete.id);
+        await this.createCaseTmr(actor, 'Présent', tmr, tete.id);
       }
     }
   }

module/tmr/quete-eaux.js

@@ -1,28 +1,26 @@
 import { Grammar } from "../grammar.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
+import { TMRUtility } from "../tmr-utility.js";
 import { Draconique } from "./draconique.js";
 
 export class QueteEaux extends Draconique {
-  constructor() {
-    super();
-  }
 
   type() { return 'tete' }
   match(item) { return Draconique.isTeteDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes("quete des eaux"); }
-  manualMessage() { return "Vous devrez re-configurer votre Quête des Eaux une fois un lac ou marais vaincu" }
+  manualMessage() { return "Vous devrez re-configurer votre Nouvelle Quête des Eaux une fois un lac ou marais vaincu" }
   async onActorCreateOwned(actor, tete) {
-    await this.createCaseTmr(actor, "Quête des eaux à déterminer", { coord: 'A0' }, tete.id);
+    await this.createCaseTmr(actor, "Nouvelle Quête des Eaux", { coord: 'A0' }, tete.id);
   }
 
   code() { return 'maitrisee' }
-  tooltip(linkData) { return `Quête des eaux, le ${this.tmrLabel(linkData)} est maîtrisé` }
+  tooltip(linkData) { return `Quête des eaux, ${TMRUtility.getTMRType(linkData.system.coord)} maîtrisé` }
-  img() { return 'icons/svg/bridge.svg' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/maitrisee.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.casehumide + 1,
-      color: tmrColors.tetes,
+      decallage: pixiTMR.sizes.decallage(0, -2 / 3),
-      decallage: tmrConstants.topRight
+      taille: () => pixiTMR.sizes.half
     });
   }
 }

module/tmr/rencontre.js

@@ -1,12 +1,8 @@
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class Rencontre extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return '' }
   match(item) { return false; }
   manualMessage() { return false }
@@ -14,14 +10,13 @@ export class Rencontre extends Draconique {
 
   code() { return 'rencontre' }
   tooltip(rencontre) { return `${rencontre.name} de force ${rencontre.system.force}` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/heures/hd06.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/rencontre.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.rencontre,
-      color: tmrColors.rencontre,
+      decallage: pixiTMR.sizes.decallage(0, 0),
-      taille: tmrConstants.full,
+      taille: () => pixiTMR.sizes.twoThird,
-      decallage: { x: 2, y: 2 }
+    })
-    });
   }
 }

module/tmr/reserve-extensible.js

@@ -1,16 +1,13 @@
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class ReserveExtensible extends Draconique {
-  constructor() {
-    super();
-  }
 
   type() { return 'tete' }
   match(item) { return Draconique.isTeteDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes("reserve extensible"); }
-  manualMessage() { return "Vous pouvez re-configurer votre Réserve extensible" }
+  manualMessage() { return "Vous pouvez re-configurer votre Nouvelle Réserve extensible" }
   async onActorCreateOwned(actor, tete) {
     const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     const selectedTMR = await TMRUtility.getTMRAleatoire(tmr => !(tmr.type == 'fleuve' || existants.includes(tmr.coord)));
@@ -18,14 +15,15 @@ export class ReserveExtensible extends Draconique {
   }
 
   code() { return 'reserve_extensible' }
-  tooltip(linkData) { return `Réserve extensible en ${this.tmrLabel(linkData)} !` }
+  tooltip(linkData) { return `Réserve extensible` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/treasure-chest.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/reserve.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.tetes,
-      alpha: 0.7,
+      decallage: pixiTMR.sizes.decallage(-1, 1),
-      decallage: tmrConstants.left
+      taille: () => pixiTMR.sizes.third
+        
     });
   }
 

module/tmr/sort-reserve.js

@@ -1,12 +1,8 @@
-import { tmrConstants, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class SortReserve extends Draconique {
 
-  constructor() {
-    super();
-  }
-
   type() { return '' }
   match(item) { return false; }
   manualMessage() { return false }
@@ -14,13 +10,13 @@ export class SortReserve extends Draconique {
 
   code() { return 'sortreserve' }
   tooltip(sort) { return `${sort.name}, r${sort.system.ptreve}` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/scroll.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/sort-reserve.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.sort,
-      alpha: 0.5,
+      decallage: pixiTMR.sizes.decallage(-1, 0),
-      decallage: tmrConstants.right
+      taille: () => pixiTMR.sizes.third,
     });
   }
 }

module/tmr/terre-attache.js

@@ -1,29 +1,26 @@
 import { Grammar } from "../grammar.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class TerreAttache extends Draconique {
-  constructor() {
-    super();
-  }
 
   type() { return 'tete' }
   match(item) { return Draconique.isTeteDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes("terre d'attache"); }
-  manualMessage() { return "Vous pouvez re-configurer votre Terre d'Attache" }
+  manualMessage() { return "Vous pouvez re-configurer votre Nouvelle Terre d'attache" }
 
   async onActorCreateOwned(actor, tete) {
-    await this.createCaseTmr(actor, "Terre d'attache à déterminer", { coord: 'A0' }, tete.id);
+    await this.createCaseTmr(actor, "Nouvelle Terre d'attache", { coord: 'A0' }, tete.id);
   }
 
   code() { return 'attache' }
-  tooltip(linkData) { return `Terre d'attache en ${this.tmrLabel(linkData)} !` }
+  tooltip(linkData) { return `Terre d'attache` }
-  img() { return 'icons/svg/anchor.svg' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/attache.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.tetes,
-      color: tmrColors.tetes,
+      decallage: pixiTMR.sizes.decallage(-1, -1),
-      decallage: tmrConstants.topLeft
+      taille: () => pixiTMR.sizes.third
     });
   }
 

module/tmr/trou-noir.js

@@ -1,12 +1,9 @@
 import { Grammar } from "../grammar.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
 
 export class TrouNoir extends Draconique {
-  constructor() {
-    super();
-  }
 
   type() { return 'souffle' }
   match(item) { return Draconique.isSouffleDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('trou noir'); }
@@ -15,21 +12,19 @@ export class TrouNoir extends Draconique {
   async onActorCreateOwned(actor, souffle) {
     const existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord);
     const selectedTMR = await TMRUtility.getTMRAleatoire(tmr => !(TMRUtility.isCaseHumide(tmr) || existants.includes(tmr.coord)));
-    await this.createCaseTmr(actor, 'Trou noir: ' + selectedTMR.label, selectedTMR, souffle.id);
+    await this.createCaseTmr(actor, 'Trou noir', selectedTMR, souffle.id);
   }
 
   code() { return 'trounoir' }
-  tooltip(linkData) { return `Trou noir en ${this.tmrLabel(linkData)} !` }
+  tooltip(linkData) { return `Trou noir` }
-  img() { return 'icons/svg/explosion.svg' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/trounoir.svg' }
 
   createSprite(pixiTMR) {
     return pixiTMR.sprite(this.code(),
       {
         zIndex: tmrTokenZIndex.trounoir,
-        color: tmrColors.trounoir,
+        decallage: pixiTMR.sizes.decallage(0, 0),
-        alpha: 1, taille:
+        taille: () => pixiTMR.sizes.full,
-          tmrConstants.full,
-        decallage: { x: 2, y: 2 },
       });
   }
 

module/tmr/urgence-draconique.js

@@ -3,8 +3,10 @@ import { Grammar } from "../grammar.js";
 import { Misc } from "../misc.js";
 import { RdDRollTables } from "../rdd-rolltables.js";
 import { TMRUtility } from "../tmr-utility.js";
-import { tmrConstants, tmrColors, tmrTokenZIndex } from "../tmr-constants.js";
+import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
+import { TYPES } from "../item.js";
+import { TMRAnimations } from "./animation.js";
 
 export class UrgenceDraconique extends Draconique {
 
@@ -27,7 +29,7 @@ export class UrgenceDraconique extends Draconique {
       const demiReve = actor.getDemiReve();
       coordSortsReserve.sort(Misc.ascending(t => TMRUtility.distanceCoordTMR(t, demiReve)));
       const tmr = TMRUtility.getTMR(coordSortsReserve[0]);
-      await this.createCaseTmr(actor, 'Urgence draconique: ' + tmr.label, tmr, queue.id);
+      await this.createCaseTmr(actor, 'Urgence draconique', tmr, queue.id);
     }
   }
 
@@ -36,16 +38,18 @@ export class UrgenceDraconique extends Draconique {
   }
 
   code() { return 'urgence' }
-  tooltip(linkData) { return `Urgence draconique!` }
+  tooltip(linkData) { return `Urgence draconique` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/pelerin.webp' }
+  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/urgence.svg' }
 
   createSprite(pixiTMR) {
-    return pixiTMR.sprite(this.code(),
+    return TMRAnimations.withAnimation(
-      {
+      pixiTMR.sprite(this.code(), {
         zIndex: tmrTokenZIndex.conquete,
-        color: tmrColors.queues,
+        decallage: pixiTMR.sizes.decallage(0, 0),
-        taille: tmrConstants.full,
+        taille: () => pixiTMR.sizes.half,
-        decallage: { x: 2, y: 0 }
+      }),
-      });
+      pixiTMR,
+      TMRAnimations.changeZoom()
+    )
   }
 }

styles/simple.css

@@ -171,9 +171,6 @@ i:is(.fas, .far) {
   width: fit-content;
 }
 
-.tmr-dialog table {
-  border: none;
-}
 .system-foundryvtt-reve-de-dragon .sheet-header div.tmr-buttons {
   padding: 0;
   margin: 0;
@@ -264,6 +261,39 @@ nav.sheet-tabs .item:after {
   border-right: 1px dashed rgba(52, 52, 52, 0.25);
 }
 
+/* =================== Fenêtre TMR ============ */
+div.tmrdialog {
+  width: fit-content !important;
+  height: fit-content !important;
+  max-height: 1024px;
+}
+div.tmrdialog .window-content {
+  margin: 0;
+  padding: 0;
+  width: fit-content;
+  max-width: fit-content;
+  max-height: fit-content;
+}
+div.tmrdialog div.tmr-map {
+  width: fit-content;
+  height: fit-content;
+  max-height: 1024px;
+}
+div.tmrdialog div.tmr-actions{
+  width: 12rem;
+  max-height: fit-content;
+}
+div.tmrdialog div.tmr-map {
+  width: min-content;
+  padding: 0;
+  font-size: 0;
+}
+div.tmrdialog div.tmr-actions {
+  vertical-align: top;
+  flex-basis: inherit;
+  flex: 'flex-shrink';
+} 
+
 /* =================== Autres ============ */
 
 .tabs .item.active,

system.json

@@ -1,8 +1,8 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "11.1.6",
+  "version": "v11.2.0",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.1.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-v11.2.0.zip",
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
   "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
   "compatibility": {
@@ -40,6 +40,19 @@
       "flags": {}
     }
   ],
+  "flags": {
+    "hotReload": {
+      "extensions": [
+        "css",
+        "hbs",
+        "html"
+      ],
+      "paths": [
+        "styles/",
+        "templates/"
+      ]
+    }
+  },
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "esmodules": [

templates/dialog-tmr.html

@@ -1,48 +1,60 @@
-<form class="tmr-dialog">
+<form class="tmr-dialog flexrow">
-<h2 class="comptmrdialog" id="tmrDialogTitle" style="visibility: hidden;"></h2>
+  <div class="tmr-map">
-<table>
+  </div>
-  <tr class="tmr-row">
+  <div class="flexcol">
-    <td>
+    <div class="tmr-actions flexcol">
+      <div class="flex-group-center flex-shrink">
+        &copy; Scriptarium, 2023.
+        <br>Usage personnel et privé.
+      </div>
+      <div class="flex-group-center flex-shrink tmr-size">
+        <a class="tmr-size-zoom-minus">
+          <i class="fa-regular fa-magnifying-glass-minus"></i>
+        </a>
+        <a class="tmr-size-zoom-plus">
+          <i class="fa-regular fa-magnifying-glass-plus"></i>
+        </a>
+      </div>
       {{#if (eq mode "visu")}}
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
         <h4>Visualisation!</h4>
       </div>
       {{else}}
         {{#if (and isGM hasPlayerOwner)}}
-        <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
           <h4>Le gardien gére les TMR du joueur, le joueur ne peut pas monter dans les TMR!</h4>
         </div>
         {{/if}}
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
-        <img class="small-button-direction" id='dir-top-left' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top-left.svg'>
+        <img class="small-button-direction tmr-move" data-move="topleft" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topleft.svg">
-        <img class="small-button-direction" id='dir-top' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top.svg'>
+        <img class="small-button-direction tmr-move" data-move="top" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top.svg">
-        <img class="small-button-direction" id='dir-top-right' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top-right.svg'>
+        <img class="small-button-direction tmr-move" data-move="topright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-topright.svg">
       </div>
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
-        <img class="small-button-direction" id='dir-bottom-left' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom-left.svg'>        
+        <label>Coordonnées : </label><span id="tmr-pos">0</span>
-        <img class="small-button-direction" id='dir-bottom' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom.svg'>
-        <img class="small-button-direction" id='dir-bottom-right' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom-right.svg'>
       </div>
-      <div class="flex-group-center lire-signe-draconique">
+      <div class="flex-group-center flex-shrink">
+        <img class="small-button-direction tmr-move" data-move="bottomleft" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomleft.svg">        
+        <img class="small-button-direction tmr-move" data-move="bottom" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom.svg">
+        <img class="small-button-direction tmr-move" data-move="bottomright" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottomright.svg">
+      </div>
+      <div class="flex-group-center flex-shrink lire-signe-draconique">
         <a>Lire un signe draconique</a>
       </div>
-      <div class="flex-group-center lancer-sort">
+      <div class="flex-group-center flex-shrink lancer-sort">
         <a>Lancer un Sort</a>
       </div>
       <hr>
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
         <label>Carac. Rêve : </label><label>{{caracReve}}</label>
       </div>
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
         <label>Rêve actuel : </label><span id="tmr-pointsreve-value">0</span>
       </div>
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
-        <label>Coordonnées : </label><span id="tmr-pos">0</span>
-      </div>
-      <div class="flex-group-center">
         <label>Etat général : </label><span id="tmr-etatgeneral-value">0</span>
       </div>
-      <div class="flex-group-center">
+      <div class="flex-group-center flex-shrink">
         <label>Refoulement : </label><span id="tmr-refoulement-value">0</span>
       </div>
       <div class="flex-group-center flex-actions-bar appliquerFatigue">
@@ -50,8 +62,9 @@
         <span id="tmr-fatigue-table">{{{fatigue.html}}}</span>
       </div>
       {{/if}}
-    </td>
+      <div class="flex-group-center flex-grow">
-  </tr>
+      </div>
-</table>
+    </div>
+  </div>
 </form>