Merge pull request 'v13.0.14 - Le familier d'Illysis' (#779 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13

Reviewed-on: #779
Correction couleurs sommaires
2025-10-25 23:21:59 +02:00 · 2025-10-24 22:20:29 +02:00 · 2025-10-24 01:22:20 +02:00 · 2025-10-23 20:21:56 +02:00 · 2025-10-23 12:01:52 +02:00 · 2025-10-22 22:40:07 +02:00
336 changed files with 10677 additions and 3137 deletions
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ Pseudo : LeRatierBretonnien

 Mainteneur/Développeur : LeRatierBretonnien
 Développeur : VincentVk
-Tests, Compendiums, Données: Fred, Fab, Grendel
-Styles/CSS : Mandar
+Tests, Compendiums, Données: Fred, Fab, Grendel, LeRatierBretonnien, VincentVk
+Styles/CSS : Mandar, VincentVk

 # Mentions Légales

@@ -23,6 +23,6 @@ La carte des Terres Médianes du Rêve est une illustration de **Jidus**, utilis
 Les silhouettes des créatures, humanoïdes et entités sont des illustrations de **Roland Barthélémy**, et sont utilisés dans le cadre de ce projet avec son aimable autorisation.
 Merci à eux !!

-Toute la propriété intellectuelle leur appartient, ce système est une adpatation destinée à fonctionner sous FoundryVTT.
+Toute la propriété intellectuelle leur appartient, ce système est une adaptation destinée à fonctionner sous FoundryVTT.

 L'ensemble du code est sous licence Creative Commons.
--- a/assets/actions/armes-disparates.svg
+++ b/assets/actions/armes-disparates.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="m329.5 29.12-8.1 11.4L359 67.16l8.1-11.44zm-88 5.04 24.2 45.36 1.8 1.29 14.8-40.36zm57.6 12.63-16.4 44.8 40.7 28.81 35.3-31.54c-.9-.58-1.9-1.19-2.8-1.84zM59.83 48.56l10.84 45.83 29.63 2.6 2.7-29.63zM470.9 75.41c-5.6 4.71-12.2 8.59-19.5 11.74 5 46.45-14.7 83.45-45.2 109.75-26.5 22.9-60.9 38.4-95 47.9-2.5 4.8-5 9.2-7.4 13.1 41.5 5.4 93.2-21.2 129.2-60 19.8-21.3 34.8-45.9 41.1-69.2 5.2-19.4 4.7-37.42-3.2-53.29zm-351.3 8.71-3 32.48-32.35-2.9 226.55 271 20-16.7 15.3-12.8zM434 93.09c-4.2 1-8.5 2-12.8 2.7-14.9 2.5-30.1 3.1-43.5.3l-41 36.61c4 7 5 15.7 4.5 24.5-.6 12.6-4.3 26.7-9.3 40.9-3 8.3-6.3 16.6-9.9 24.6 26.9-9.2 52.6-22.3 72.5-39.4 26.2-22.8 42.5-51.6 39.5-90.21zM274 107.4l-51.2 72.2 30.6 36.5 58.2-82.1zM173.8 248.8 34.53 445.2l37.53 26.6L204.3 285.3zm233 79.2L273.3 439.5l19.2 23.1L426 351zm-18.3 77.9-35.3 29.4 39.7 47.6 35.3-29.4z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/attaque.svg
+++ b/assets/actions/attaque.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="m214.02 19.115-.02.06a433.415 433.415 0 0 1 106.393 58.446L368.02 158.4C292.254 72.063 181.72 20.678 64.66 20.604c-14.96-.01-30.027.834-45.14 2.535v18.8c108.174-12.774 213.91 21.292 293.527 88.554l42.314 97.416C290.887 132.486 182.425 73.885 66.395 73.21a349.119 349.119 0 0 0-46.879 2.906v18.85c98.998-13.552 196.12 18.532 267.11 82.264l30.708 87.82c-53.922-85.58-148.482-138.656-249.986-139.69a297.451 297.451 0 0 0-47.83 3.398v18.914c93.33-15.18 185.38 18.05 247.677 83.27l20.694 83.917C246.555 230.42 160.67 176.716 67.7 175.423a248.202 248.202 0 0 0-48.182 4.06v19.036c89.513-17.794 178.655 19.16 230.357 89.468l4.62 73.348c-28.973-83.013-107.888-136.692-193.257-135.87a201.938 201.938 0 0 0-41.72 4.78v19.188c77.22-18.904 155.333 13.983 197.095 77.14l5.873 57.49c23.33-6.283 47.534-13.218 68.727-20.873 19.194-6.93 35.884-14.525 46.596-22.038 5.354-3.756 9.142-7.478 11.174-10.574 2.033-3.096 2.47-5.184 2.098-7.59l-1.252-8.123 137.074-39.556C446.897 159.92 363.67 69.964 260.654 19.114H214.02zm278.86 273.922-40.196 11.6c1.63 18.66-4.666 36.567-16.397 52.043-14.18 18.707-35.934 34.627-62.363 48.257-45.23 23.33-104.45 39.877-164.397 47.97l4.38 16.35c68.63-7.66 143.34-22.038 198.17-48.538 30.517-14.75 54.633-33.123 68.722-55.33 12.74-20.084 17.775-43.384 12.08-72.353zm-58.513 16.885-65.027 18.765c-.736 4.345-2.345 8.51-4.733 12.147-3.925 5.98-9.462 10.986-16.068 15.62-13.213 9.266-30.996 17.098-50.978 24.316-31.927 11.53-68.41 20.998-99.558 29.134l6.644 24.79c59.027-7.79 117.64-24.153 160.71-46.366 24.828-12.805 44.388-27.573 56.037-42.94 8.804-11.614 13.283-23.135 12.972-35.466zm-261.754 77.43-33.033 8.85 8.197 30.59c10.812 3.95 18.623 14.38 18.623 26.485 0 6.87-2.52 13.2-6.673 18.114l4.716 17.6 33.034-8.85-24.864-92.788zM138.22 443.79c-1.49 0-2.88.33-4.12.91l-75.6 20.255a30.49 30.49 0 0 1 4.625 16.14c0 .67-.03 1.33-.072 1.987l75.96-20.352c4.96-.386 8.698-4.37 8.698-9.453 0-5.35-4.138-9.488-9.49-9.488zM32.327 468.985c-6.798 0-12.11 5.312-12.11 12.11 0 6.798 5.312 12.11 12.11 12.11 6.798 0 12.111-5.312 12.111-12.11 0-6.798-5.313-12.11-12.11-12.11z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/comp.svg
+++ b/assets/actions/comp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M119.1 25v.1c-25 3.2-47.1 32-47.1 68.8 0 20.4 7.1 38.4 17.5 50.9L99.7 157 84 159.9c-13.7 2.6-23.8 9.9-32.2 21.5-8.5 11.5-14.9 27.5-19.4 45.8-8.2 33.6-9.9 74.7-10.1 110.5h44l11.9 158.4h96.3L185 337.7h41.9c0-36.2-.3-77.8-7.8-111.7-4-18.5-10.2-34.4-18.7-45.9-8.6-11.4-19.2-18.7-34.5-21l-16-2.5L160 144c10-12.5 16.7-30.2 16.7-50.1 0-39.2-24.8-68.8-52.4-68.8-2.9 0-4.7-.1-5.2-.1zM440 33c-17.2 0-31 13.77-31 31s13.8 31 31 31 31-13.77 31-31-13.8-31-31-31zM311 55v48H208v18h103v158h-55v18h55v110H208v18h103v32h80.8c-.5-2.9-.8-5.9-.8-9 0-3.1.3-6.1.8-9H329V297h62.8c-.5-2.9-.8-5.9-.8-9 0-3.1.3-6.1.8-9H329V73h62.8c-.5-2.92-.8-5.93-.8-9 0-3.07.3-6.08.8-9H311zm129 202c-17.2 0-31 13.8-31 31s13.8 31 31 31 31-13.8 31-31-13.8-31-31-31zm0 160c-17.2 0-31 13.8-31 31s13.8 31 31 31 31-13.8 31-31-13.8-31-31-31z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/cuisine.svg
+++ b/assets/actions/cuisine.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M259.063 25.094c-56.045 0-106.836 9.775-144.438 26.125-18.8 8.174-34.34 17.96-45.594 29.53-11.254 11.57-18.28 25.338-18.28 40.188 0 9.936 3.17 19.388 8.625 28.03-10.218 21.883-15.844 45.794-15.844 70.782 0 103.158 95.757 187.844 215.532 187.844 119.776 0 215.563-84.686 215.563-187.844 0-24.99-5.653-48.897-15.875-70.78 5.454-8.644 8.625-18.096 8.625-28.032 0-14.85-7.026-28.617-18.28-40.188-11.256-11.57-26.825-21.356-45.626-29.53-37.603-16.35-88.363-26.126-144.408-26.126zm0 18.687c53.848 0 102.554 9.6 136.968 24.564 17.208 7.482 30.775 16.306 39.658 25.437 8.882 9.133 13 18.115 13 27.157 0 9.043-4.118 18.057-13 27.188-8.883 9.13-22.45 17.956-39.657 25.438-34.413 14.963-83.12 24.562-136.967 24.562-53.85 0-102.555-9.6-136.97-24.563-17.206-7.48-30.804-16.306-39.687-25.437-8.882-9.13-12.97-18.145-12.97-27.188 0-9.042 4.088-18.024 12.97-27.156 8.883-9.13 22.48-17.954 39.688-25.436 34.414-14.964 83.12-24.563 136.97-24.563zm-7.782 17.282c-80.57 0-146 26.008-146 57.844 0 31.836 65.43 57.81 146 57.813 40.04 0 76.404-6.613 102.782-16.94-21.316 3.34-45.064 5.845-70.656 5.845-86.066 0-155.937-21.656-155.937-47.906s69.868-47.282 155.936-47.282c20.43 0 39.926.725 57.813 2.906-24.816-7.704-55.957-12.28-89.94-12.28zM87.657 360.5c-9.916 19.897-14.758 36.638-15.78 49.03-1.23 14.906 2.752 22.238 6.655 24.626 3.905 2.388 11.497 2.48 23.376-5.75 9.25-6.41 20.16-17.73 31.375-34.406-16.778-9.432-32.1-20.71-45.624-33.5zm342.75.063c-13.532 12.782-28.872 24.043-45.656 33.468 11.21 16.666 22.13 27.97 31.375 34.376 11.88 8.23 19.472 8.138 23.375 5.75 3.903-2.388 7.886-9.72 6.656-24.625-1.022-12.38-5.855-29.098-15.75-48.967zm-199.25 64.25c1.36 21.275 5.296 37.554 10.344 48.468 6.272 13.56 13.26 17.82 17.72 17.908 4.457.088 11.14-3.683 17.374-16.907 5.133-10.89 9.165-27.52 10.437-49.467a267.366 267.366 0 0 1-27.967 1.468c-9.437 0-18.75-.506-27.907-1.467z" fill="#fff" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/actions/defense.svg
+++ b/assets/actions/defense.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M80 32c-64 256 48 416 176 464 128-48 240-208 176-464-112 32-240 32-352 0zm99.3 52.9c14.7 27.9 40.1 26.4 65 26.4l53.9 1.5 7.8 25 77.1 10.3 3.5 49.9c-27.9 7.4-83.7 5.9-83.8 17.7-.2 20.6 36.3 16.2 78.1 5.9L356.7 276l-61.4 4.4c3.8 46.4-1.2 77.6-35.6 110.7l-21.9-55.3c-12.6 22.6-30 38.8-57.3 41.4 10.6-26 19.1-46.7 9.7-76.3-13.5 13.3-35.1 18.7-64.8 16.7 31.6-49 48.3-101.9 62.1-151.9l-23.2-20.6c-6.6-23.5-1.3-44.1 15-60.2z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/defense1.svg
+++ b/assets/actions/defense1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M261.563 64.28A191.758 191.758 0 0 0 64.25 256a191.758 191.758 0 1 0 383.5 0A191.758 191.758 0 0 0 261.562 64.28zm-4.625 9.126 8.937 5.156v10.313l-8.938 5.156-8.906-5.155V78.562l8.907-5.156zm3.53 29.25A153.407 153.407 0 0 1 409.407 256a153.407 153.407 0 0 1-306.812 0A153.407 153.407 0 0 1 260.47 102.656zm-11.53 20.03a133.607 133.607 0 0 0-65.157 20.908V368.22a133.607 133.607 0 0 0 65.157 21.092V122.688zm17.687.314v266.125a133.607 133.607 0 0 0 63.438-22.03V145a133.607 133.607 0 0 0-63.438-22zm-100.5 34.344A133.607 133.607 0 0 0 122.405 256a133.607 133.607 0 0 0 43.72 98.78V157.345zm-60.72 1.625 8.907 5.155v10.28l-8.906 5.157-8.937-5.156v-10.28l8.936-5.157zm300.5 0 8.94 5.155v10.28l-8.94 5.157-8.905-5.156v-10.28l8.906-5.157zm-58.155.093V353.03A133.607 133.607 0 0 0 389.594 256a133.607 133.607 0 0 0-41.844-96.938zm57.813 173.125 8.937 5.156v10.312l-8.938 5.156-8.906-5.156v-10.312l8.906-5.156zm-299.813.718 8.938 5.156v10.313l-8.938 5.156-8.938-5.155v-10.313l8.938-5.156zm149.906 85.188 8.938 5.156v10.313l-8.938 5.156-8.906-5.158v-10.31l8.906-5.156z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/empoignade.svg
+++ b/assets/actions/empoignade.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M243.512 23.29c-27.105 18.337-53.533 32.92-82.274 45.337-2.843 17.364-3.948 34.497-4.05 51.584 28.913 15.41 56.096 32.85 83.33 49.634l7.045 4.344-3.432 7.482c-12.12 26.572-24.33 47.087-46.245 70.3l-5.184 5.512-6.46-3.904c-32.974-19.974-74.472-38.724-113.373-53.95l6.826-17.374c36.79 14.4 75.11 32.32 108.153 51.504 15.396-17.198 25.326-33.354 34.713-52.89-43.44-26.91-86.13-53.51-134.69-70.632-23.012 20.357-37.705 45.243-51.942 70.74 8.324 25.495 6.596 53.376-6.596 77.46 48.58-.593 97.994 2.23 150.666 10.26l5.658.837 1.787 5.44c8.85 26.46 11.79 54.41 8.325 83.588l-.987 8.432-8.466-.187c-40.508-.864-80.175-2.138-118.17.234 1.634 15.94-2.31 30.972-7.724 45.025 13.427 28.54 27.38 55.8 48.29 79.39 41.27-19.05 73.564-31.288 115.93-42.85-3.407-13.72-6.918-26.36-11.097-33.62-5.122-8.9-10.207-13.057-17.85-15.256-15.284-4.4-44.533 2.293-92.894 19.454l-6.243-17.594c48.907-17.354 79.702-26.894 104.283-19.82 9.133 2.628 16.884 8.004 23.066 15.46 14.487-7.627 28.415-16.79 42.053-26.996 12.34-45.92 37.29-81.42 66.626-112.107-7.226-13.52-13.208-27.204-20.563-40.613l-3.394-6.168 5-4.965c23.275-23.13 47.34-40.157 71.87-52.487l8.395 16.716c-20.952 10.53-41.503 25.913-61.795 45.152 12.41 23.91 22.263 45.5 39.457 64.826 37.488-27.124 74.943-51.39 116.84-74.938-13.96-30.473-31.345-58.357-56.286-79.462-32.2 13.38-62.527 17.39-92.61 12.29-14.223 13.25-30.094 22.23-48.756 23.337-29.017 1.722-60.74-15.74-99.174-57.672l6.858-6.295.017-.028.006.006 6.88-6.314c36.702 40.043 63.74 52.87 84.32 51.65 18.514-1.1 35.03-14.95 51.684-35.406-28.827-31.81-64.174-59.94-97.822-84.465zM39.324 277.884c-6.06.022-12.104.098-18.142.223 1.673 26.288 5.512 51.288 14.052 73.732 45.88-5.82 93.308-4.96 141.15-3.87 1.518-21.27-.253-41.69-6.058-61.212-45.528-6.565-88.59-9.03-131.002-8.873z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/encaisser.svg
+++ b/assets/actions/encaisser.svg
@@ -0,0 +1,66 @@
+<?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 410.39459 390.34079"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="encaisser.svg"
+   width="410.39459"
+   height="390.34079"
+   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" />
+        <dc:title></dc:title>
+      </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="2284"
+     inkscape:window-height="1517"
+     id="namedview8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="206.1036"
+     inkscape:cy="215.2477"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <g
+     class=""
+     transform="translate(-49.8964,-68.7523)"
+     id="g4">
+    <path
+       d="m 26.996,47.947 c 11.726,44.806 56.176,129.96 67.496,242.934 -6.597,76.494 -22.66,98.81 -22.66,152.74 0,27.602 11.33,38.038 23.254,38.038 11.662,0 23.72,-11.823 23.72,-40.896 0,-56.606 -16.937,-73.84 -23.283,-151.65 6.472,-83.65 59.715,-45.933 59.715,2.765 0,-112.652 101.99,-85.16 116.024,-34.77 -5.164,35.11 -15.028,45.947 -15.028,75.368 0,16.633 8.51,28.86 16.74,28.86 8.416,0 16.41,-11.433 16.41,-27.226 0,-27.953 -9.303,-41.066 -14.515,-75.825 15.447,-37.68 115.544,-34.583 115.845,-1.754 -3.41,26.414 -12.764,32.13 -12.764,51.16 0,9.714 6.58,16.855 12.943,16.855 6.506,0 12.685,-6.677 12.685,-15.9 0,-18.435 -9.164,-25.838 -12.596,-52.854 14.138,-49.16 86.57,-19.867 92.008,-73.298 -51.22,45.91 -357.175,26.76 -455.994,-134.545 z m 128.85,266.22 c -4.676,31.802 -17.635,40.28 -17.635,61.724 0,10.642 8.592,18.346 17.636,18.346 8.844,0 17.988,-8.24 17.988,-19.45 0,-22.338 -13.464,-28.757 -17.988,-60.62 z"
+       fill="#ffffff"
+       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
+       fill-opacity="1"
+       id="path2" />
+  </g>
+</svg>
--- a/assets/actions/jeu.svg
+++ b/assets/actions/jeu.svg
@@ -0,0 +1,66 @@
+<?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 310.12469 310.12469"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="jeu.svg"
+   width="310.12469"
+   height="310.12469"
+   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" />
+        <dc:title></dc:title>
+      </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="2532"
+     inkscape:window-height="1492"
+     id="namedview8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="155.06205"
+     inkscape:cy="142.25079"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <g
+     class=""
+     transform="translate(-100.93795,-121.74921)"
+     id="g4">
+    <path
+       d="m 477.518,181.966 a 25,25 0 0 1 -34.91,23 l -62.29,150.26 h -248.92 l -62.24,-150.19 a 25,25 0 1 1 9.73,-7.29 l 87,71.2 20.92,-126.4 a 25,25 0 1 1 14.7,-1.85 l 54.31,117 54.42,-117.3 a 25,25 0 1 1 14.58,2.08 l 20.93,126.42 87.26,-71.3 a 25,25 0 1 1 44.51,-15.63 z m -71.66,241.25 h -300 v 60 h 300 z m -27.75,-52 h -244.22 v 36 h 244.22 z"
+       fill="#ffffff"
+       fill-opacity="1"
+       transform="matrix(0.7,0,0,0.7,76.8,76.8)"
+       id="path2" />
+  </g>
+</svg>
--- a/assets/actions/meditation.svg
+++ b/assets/actions/meditation.svg
@@ -0,0 +1,63 @@
+<?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"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="meditation1.svg"
+   width="512"
+   height="512"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     id="namedview10"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="254.56378"
+     inkscape:cy="255.99978"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8">
+    <inkscape:grid
+       type="xygrid"
+       id="grid856" />
+  </sodipodi:namedview>
+  <path
+     id="polygon2"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="M 256,0 0,256 256,512 512,256 Z m 5.11719,62.361328 c 8.239,0 15.89463,4.297288 21.83203,12.054688 5.2108,6.811 8.83798,16.231192 9.64648,26.841794 -8.4868,-3.970403 -17.26742,-6.37191 -26.14062,-7.13281 v 12.81836 c 8.5484,0.9429 17.03537,3.85822 25.48437,8.64062 -1.442,8.41469 -4.67333,15.84043 -8.99023,21.48243 -5.9367,7.7574 -13.59443,12.05468 -21.83203,12.05468 -8.2376,0 -15.8726,-4.29728 -21.8086,-12.05468 -4.452,-5.8184 -7.76497,-13.52864 -9.14257,-22.26953 7.8043,-4.21541 15.53348,-6.75681 23.20898,-7.72071 V 94.191406 c -7.938,0.763 -15.87192,2.852576 -23.66992,6.300784 0.9261,-10.297007 4.51857,-19.430374 9.60547,-26.076174 5.936,-7.7581 13.57099,-12.052735 21.80859,-12.052735 z M 228.50391,144.4375 c 0.14,0.1883 0.27391,0.38286 0.41601,0.56836 7.8876,10.3082 19.34232,17.19336 32.19922,17.19336 12.8569,0 24.31162,-6.88586 32.19922,-17.19336 0.1421,-0.1862 0.27797,-0.37936 0.41797,-0.56836 7.2765,3.3453 12.81763,7.79108 15.76953,12.86328 h 0.0449 l 29.11524,45.10547 35.48046,-15.37891 c 20.5632,-11.2833 43.10446,16.80074 21.43946,29.18164 l -66.12891,30.84571 -25.74609,-33.90821 c -11.6662,23.2505 -11.80448,46.48779 6.66992,69.73829 37.3275,-3.0275 65.31156,3.90026 69.47656,19.44726 3.4104,12.7316 -9.91357,28.42679 -33.35937,42.45899 l -66.10743,-21.9629 33.66602,-11.17773 -4.11328,-12.4043 -50.29102,16.69141 -50.26757,-16.69141 -4.11133,12.4043 126.1289,41.89063 15.53321,37.60351 -64.44532,-20.10351 0.0234,-0.22071 c -0.2989,-0.0168 -0.5782,-0.0463 -0.875,-0.0645 l -0.30664,-0.0879 h -1.09375 c -43.1116,-2.7132 -70.90445,-9.13273 -109.87695,-29.64063 -19.6938,-13.027 -30.49667,-27.09126 -27.38867,-38.69726 h -0.0215 c 3.4755,-12.9682 23.51598,-19.95189 51.73438,-20.14649 5.3179,-0.0364 10.93654,0.18537 16.77734,0.63477 19.418,-23.6082 20.76969,-47.21649 7.67969,-70.80859 l -26.6211,35.04296 -66.1289,-30.84375 c -21.665,-12.3816 0.87304,-40.46424 21.43554,-29.18164 l 35.46094,15.37891 29.13672,-45.10547 0.26172,0.0664 c 2.9421,-5.1016 8.50701,-9.56969 15.81641,-12.92969 z m -44.58008,217.70117 c 12.7582,5.6602 24.87218,9.90172 37.20898,13.10352 l -48.91406,15.24609 z" />
+</svg>
--- a/assets/actions/oeuvre.svg
+++ b/assets/actions/oeuvre.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(2,-1)" style=""><path d="m375.2 23.61-12.7 12.7 24.5 24.5c.5-1.2 1-2.3 1.5-3.5 2.4-6.6 4.1-12.4 4.9-15.5zm33.3 30.5c-.9 3-1.9 5.9-3.3 9.6-4 10.8-9.1 23.4-20.2 30.4-4 2.4-8.1 2.6-11.2 2.3-3.1-.3-5.6-1.1-7.5-1.6-1.7-.4-2.6-.6-3.2-.7-.6.9-1.2 2.2-1.6 4.5-.8 3.19-1 7.49-.8 11.59.1 6 .7 10.5 1.2 13.1l26.8 26.8c2.6.4 7.1 1 13 1.2 7.5.1 14.3-1.8 16-2.7-.1-.8-.2-1.4-.6-2.9-.5-2-1.3-4.5-1.7-7.6-.3-3.1 0-7.3 2.3-11.2 7-11.1 19.6-16.2 30.5-20.3 3.6-1.4 6.6-2.2 9.6-3.1l-16.4-32.89zm-67.2 3.4-12.7 12.7 17.4 17.5c1.3-2.9 3-5.6 5.6-7.9 2.5-2.2 5.6-3.3 8.3-3.7zm128.9 60.99c-3.2.8-9.1 2.4-15.7 5-1.1.4-2.2.8-3.4 1.3l24.6 24.6 12.7-12.7zm-120.7 17.9L217.4 262.3l9.8 9.8 129-129zm86.3 15.5c-.4 2.8-1.5 6-3.8 8.5s-4.8 4.3-7.5 5.6l17.3 17.3 12.7-12.7zm-66.9 3.9L240 284.9l9.7 9.6 125.9-132zm-226.3 94.5c-30.4 0-60.87 11.6-84.13 34.9-46.53 46.5-46.53 121.7 0 168.3C105 500 180.2 500 226.8 453.5c35.8-35.9 43.9-88.5 24.7-132.2L156.8 416l14.9 14.9-12.8 12.7-90.46-90.5 12.73-12.7 14.75 14.7 94.78-94.7c-15.3-6.8-31.7-10.1-48.1-10.1zm60.6 23.2-94.5 94.4 11.3 11.3 94.5-94.4zm24 24L132.7 392l11.2 11.2 94.6-94.4z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/sort.svg
+++ b/assets/actions/sort.svg
@@ -0,0 +1,65 @@
+<?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"
+   width="66.69709mm"
+   height="66.69709mm"
+   viewBox="0 0 378.10574 378.10571"
+   version="1.1"
+   id="svg3"
+   sodipodi:docname="sort.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="3.887601"
+     inkscape:cx="72.254869"
+     inkscape:cy="97.300114"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3"
+     inkscape:document-rotation="0"
+     inkscape:snap-text-baseline="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     id="Sélection #2"
+     fill="none"
+     stroke="black"
+     stroke-width="1"
+     d="M 189.05286,0 378.10571,189.05286 189.05285,378.10571 0,189.05286 Z m 98.94184,241.93328 c -0.88,-10.41 -2.89,-10.17 -9.87,-16.75 l -5.39,-5.72 c -2.61,-2.12 -6.9,-3.02 -8.72,-5.91 -1.19,-1.9 -0.91,-4.46 -1.28,-6.62 -3.40308,-4.90559 -2.01923,-20.20245 -2.01923,-26.63889 3.88586,-9.60746 4.36923,-1.69111 7.45923,-14.36111 0.62,-2.55 2.32,-6.14 1.21,-8.69 -1.07,-2.43 -3.44,-2.03 -6.71,-5.17 -5.66937,-7.30653 -11.39498,-14.88252 -18.68,-20.92 -23.49144,-15.67176 -34.12005,-20.68725 -60,-20.32 -8.54383,0.23148 -13.2432,0.66798 -20,2.68 -19.05,6.09 -27.58,11.85 -41.76999,25.79 -8.08,7.96 -7.17,10.3 -10.91,14.41 -3.1,3.4 -6.12,3.44 -6.73,7.27 -0.64,1.83 -0.09,3.98 0,5.78 1.91418,8.65633 2.50026,3.00305 7.73101,9.8295 1.38405,9.6854 0.3222,25.26042 -0.70608,33.05113 -2.53556,2.89228 -2.29493,5.91937 -3.63493,7.97937 -1.62,2.49 -4.35,2.16 -7.77,5.03 -5.170004,4.32 -4.470004,8.06 -13.210004,13.28 1.78,5.5 4.63,5.91 10,6 z M 195.6316,118.20709 c 11.22808,5.82176 1.31866,21.02928 -11.27386,31.1911 13.0336,5.31132 -0.79998,6.64062 23.09132,6.48796 l 32.86359,-0.54563 13.5005,1.22254 7.27084,3.68304 c -4.13,5.49 -2.71929,1.23718 -2.08929,8.68718 h -4 c -0.28,-1.68 -0.54282,-4.85331 -1.87282,-6.17331 -3.32127,-0.17387 -9.61514,-0.5831 -13.55025,0.47743 -0.17052,3.22972 -0.29693,4.01588 -0.57693,5.69588 l -3.40923,-0.34102 c -0.28,-1.68 0.27564,-3.83025 -1.05436,-5.15025 -3.7305,-0.17387 -10.29718,-0.7195 -13.48204,0.40923 -1.33,1.32 -0.77437,3.40204 -1.05437,5.08204 h -3 c -0.28,-1.68 0.071,-3.08 -0.91796,-5.08204 -2.83922,-1.53335 -14.39204,-0.93796 -18.08204,-0.91796 -1.96,0.01 -5.02,-0.11 -6.68,1.02 -0.19823,6.27508 -0.4088,8.38327 1.52129,9.86916 l 20.15871,0.0399 v 37.07089 h -19.09 c 0.0887,-5.45486 2.17,-22.09 0,-25.77 -2.24,-3.53 -10.37,-4.58 -13.31,-1.63 -0.59765,14.41964 -0.37159,20.85123 -0.92619,27.34486 -16.5374,0 -13.4074,0.42 -16.5374,0 l -0.13641,-21.94486 c -0.0284,-4.56991 -0.5617,-9.93269 1.12488,-14.46674 3.57532,-2.18241 14.40143,0.2341 20.38143,-0.7259 1.06669,-3.31458 1.12908,-6.5781 0.80651,-10.05451 -2.74793,-0.83105 -4.76282,-0.70285 -7.31282,-0.75285 h -11 c -7.39,0.05 -9.43418,2.79797 -7.61418,10.68797 l -6.48228,0.24114 c 0.72,-2.06 1.97646,-7.02474 0.81646,-9.16474 -1.7,-3.14 -11.93127,-2.75719 -14.21127,-0.43719 -2.03,2.07 -1.8049,7.64421 -1.24493,10.08421 l -7.37013,0.12387 c -0.24405,12.94493 0.23633,18.13752 0.10633,29.28752 -0.09,7.42 0.28,6.88722 -7.99999,7.17722 v -28 c 0,-2.48 0.22,-6.59 -1.17,-8.69 -1.62,-2.42 -4.26,-2.22 -6.83,-2.31 2.73,-7.8 6.25917,-8.9 -1.27083,-9 10.53404,-8.39725 16.12632,-16.70355 22.85717,-22.49183 5.05278,-4.9362 12.06169,-10.2231 15.11169,-11.61765 14.97984,-6.56268 20.63207,-10.69702 43.93886,-10.61671 z m -73.26379,44.49619 c -0.79548,4.04536 -1.9331,12.40663 2.6469,12.48663 10.50353,0.43469 11.50999,-8.2279 8.90999,-11.7879 -1.43,-1.96 -9.22689,-0.64873 -11.55689,-0.69873 z m 19.62689,11.59316 9.01278,-0.14468 0.91722,5.78152 c 0.10638,11.6222 0,0 0.0146,31.52202 -8.59422,-0.32911 -7.4946,-0.52202 -9.9446,-0.52202 z m 80.95177,-0.77164 8.14469,0.22835 -0.0965,36.18013 h -8 z m 19.38582,0.5305 7.6014,-0.33759 0.061,36.21557 h -8 z m -129.12528,49.01235 11.33333,-0.31493 45.72718,-0.54563 59.09028,-0.81845 33.54662,-0.27282 c 7.10809,1.39089 4.61048,5.28283 13.46463,11.36941 -49.05198,-0.38776 -122.72138,-0.48241 -173.42548,-0.8649 z"
+     style="fill:#d6d2d0;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccsccccccccccccccccccccccccccccccccccc" />
+</svg>
--- a/assets/actions/surenc.svg
+++ b/assets/actions/surenc.svg
@@ -0,0 +1,65 @@
+<?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 448 434"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="surenc.svg"
+   width="448"
+   height="434"
+   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" />
+        <dc:title></dc:title>
+      </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="3840"
+     inkscape:window-height="2054"
+     id="namedview8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="224"
+     inkscape:cy="210"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <g
+     class=""
+     id="g4"
+     transform="translate(-32,-46)">
+    <path
+       d="m 256,46 c -45.074,0 -82,36.926 -82,82 0,25.812 12.123,48.936 30.938,64 H 128 L 32,480 H 480 L 384,192 H 307.062 C 325.877,176.936 338,153.812 338,128 338,82.926 301.074,46 256,46 Z m 0,36 c 25.618,0 46,20.382 46,46 0,25.618 -20.382,46 -46,46 -25.618,0 -46,-20.382 -46,-46 0,-25.618 20.382,-46 46,-46 z m -82.215,202.95 h 23.5 v 33.263 l 33.873,-33.264 h 27.283 l -43.883,43.15 48.4,47.974 H 233.54 l -36.255,-35.888 v 35.888 h -23.5 z m 119.934,21.24 c 4.76,0 8.952,0.934 12.573,2.806 3.62,1.872 6.938,4.82 9.95,8.85 v -10.13 h 21.972 v 61.462 c 0,10.986 -3.48,19.368 -10.438,25.146 -6.917,5.82 -16.968,8.727 -30.152,8.727 -4.272,0 -8.4,-0.325 -12.39,-0.976 a 77.367,77.367 0 0 1 -12.024,-2.99 v -17.03 c 3.826,2.198 7.57,3.826 11.23,4.884 3.664,1.098 7.347,1.648 11.05,1.648 7.162,0 12.41,-1.566 15.746,-4.7 3.337,-3.132 5.006,-8.035 5.006,-14.708 v -4.7 c -3.01,3.986 -6.328,6.916 -9.95,8.788 -3.62,1.87 -7.813,2.808 -12.573,2.808 -8.343,0 -15.238,-3.275 -20.69,-9.826 -5.453,-6.592 -8.18,-14.974 -8.18,-25.146 0,-10.214 2.727,-18.576 8.18,-25.086 5.452,-6.55 12.347,-9.827 20.69,-9.827 z m 8.118,15.746 c -4.517,0 -8.038,1.67 -10.56,5.005 -2.523,3.338 -3.784,8.058 -3.784,14.162 0,6.266 1.22,11.026 3.662,14.28 2.442,3.215 6.003,4.823 10.682,4.823 4.557,0 8.096,-1.67 10.62,-5.006 2.522,-3.337 3.784,-8.036 3.784,-14.098 0,-6.104 -1.262,-10.824 -3.785,-14.16 -2.523,-3.337 -6.062,-5.006 -10.62,-5.006 z"
+       fill="#ffffff"
+       fill-opacity="1"
+       id="path2" />
+  </g>
+</svg>
--- a/assets/actions/surprise-demi.svg
+++ b/assets/actions/surprise-demi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M355.102 21.097c-33.682.164-64.173 18.585-74.615 50.5 21.357-.79 23.203 53.922 23.203 53.922l41.619 6.262c-13.41 12.963-50.025 5.967-50.025 5.967-17.14 19.182-33.124 40.966-47.758 57.578-15.952 18.127-35.2 38.103-57.018 60.086-6.79 6.823 41.594-9.821 34.342-2.604-24.567 12.751-42.297 16.097-61.764 32.069-31.312 25.674-62.853 60.71-81.146 79.431-7.711 7.91-44.362 37.674 20.469 34.74 2.404 7.52-1.621 9.456-7.493 15.293-4.327 4.303-18.082.283-22.263 2.828-22.172 35.055-17.246 37.975-27.43 58.047-4.252 11.635 41.68-14.404 64.305-34.18 13.974-7.58 25.147-21.652 35.002-17.202 43.11 18.984 129.826 35.53 141.328 27.619 18.368-12.646-10.321-46.343 3.832-97.912 23.47 5.817 43.825 13.657 66.767 11.459-1.581 49.307 3.56 55.306-3.888 104.777l59.129 21.127 1.91-13.809-33.815-22.478c14.568-50.659 16.809-72.578 15.227-121.719-.16-5.372-45.168-24.325-74.492-33.133l18.593-30.412c30.393-44.788 124.141-62.055 127.932-88.258-13.02-19.676 3.022-27.384-25.092-21.912-6.295 1.318-13.771 24.346-18.023 27.213-7.843 5.276-40.655 24.477-51.951 18.377-1.9-1.026 7.246-33.441 6.85-44.78-.116-3.205-1.19-6.625-2.866-10.001.185-.64 15.24-52.482 54.809-94.016-43.978 25.134-65.332 79.925-65.354 79.98-2.207-2.134-4.476-3.983-6.639-5.423-1.916-14.7-4.819-73.02 68.598-78.776-21.427-21.177-47.704-30.78-72.283-30.66z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/actions/surprise-totale.svg
+++ b/assets/actions/surprise-totale.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M332.031 66.13c-28.807-.01-55.439 14.149-67.88 40.65 20.79 1.744 16 55.07 16 55.07-11.814 16.687-24.73 33.186-36.589 50.146 0 0-99.046 132.283-178.378 168.025-28.049 22.593-33.305 36.532-44.137 52.649-4.877 9.54 9.257 14.324 11.701 13.2 22.726-10.461 25.176-20.866 47.07-35.675 12.805-5.026 23.839-15.9 31.854-11.049 34.962 20.86 107.556 44.28 118.271 38.706 17.857-9.263-5.78-43.585 16.174-89.057 31.97-3.352 58.916-.885 88.332-12.094 3.483 50.279 10.106 54.59 6.766 107.092l71.2 1.045.698-14.61-41.814-11.105c11.528-56.054 11.816-78.996 4.672-127.996-.956-6.622-53.746-8.275-81.012-3.79 24.449-24.202 40.274-45.24 47.506-68.44l.027.189c7.637 15.923 30.083 33.958 35.336 37.125 27.704 11.048 38.214 7.982 62.955 3.887 4.907-.784 27.47 24.537 44.807 9.597 2.642-20.238 16.522-20.369-4.938-32.71-4.847-2.73-27.063 7.462-31.418 6.898-20.21-2.481-30.954-5.211-58.45-12.703-10.23-13.187-32.676-56.136-55.43-59.744 6.535-14.15 28.226-53.108 73.664-66.237-20.943-26.54-49.925-39.057-76.987-39.068zm82.405 46.722c-46.658 19.516-58.266 50.4-58.266 50.4l9.916 7.644s9.646-4.765 48.35-58.044zm23.04 160.005-4.658 11.418c5.233-.083 10.425.47 15.328 1.608-12.774 30.856-23.938 59.635-28.181 93.094l-.908 7.558 4.863-5.889c20.805-25.671 32.303-55.25 44.95-85.78 4.203 2.656 8.24 5.885 12.071 9.35l4.78-11.374-20.518-8.526-31.767 66.579 24.062-69.713-20.021-8.325z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/actions/tache.svg
+++ b/assets/actions/tache.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M56.813 18.438c-.47-.005-.938.014-1.407.03-.625.023-1.252.066-1.875.126-7.468.72-14.682 4.148-22.31 11.125-9.985 9.128-12.863 17.66-11.407 27.718 1.455 10.056 8.353 22.236 21.125 34.906 2.895 2.872 6.126 5.737 9.593 8.625 1.27 1.055 2.565 2.13 3.907 3.186a200.62 200.62 0 0 0 3.438 2.656c.232.175.454.358.688.532C74.71 119.38 95.558 131.28 120.25 142.22c159.723 161.31 288.815 297.553 374.594 352.124-51.11-85.624-187.432-214.62-350-375.531-10.23-23.802-21.115-43.71-32.094-59.282 35.46-10.19 82.517-2.294 125.75 40.94 40.243 40.242 52.642 90.776 41.375 128.343 4.89 4.914 9.883 9.913 14.688 14.75 19.07-46.1 4.573-108.895-42.844-156.313-35.694-35.693-75.48-50.324-111.032-50.22-1.147.005-2.3.03-3.438.064-21.844.65-41.957 6.898-58.344 17.187a102.302 102.302 0 0 0-8.312 5.814c1.33 3.094 2.758 5.884 4.406 8.218 1.92 2.72 4.004 4.936 6.906 6.688 2.202-1.717 4.498-3.375 6.938-4.906a88.727 88.727 0 0 1 3.25-1.97c8.196 10.088 15.465 24.624 25.47 47.25-23.907-10.568-38.822-18.04-49.033-27 .024-.03.04-.063.064-.093-.433-.33-.867-.655-1.28-1-.013-.008-.022-.02-.033-.03-11.215-10.375-16.532-22.934-22.31-44.5 5.988 1.605 11.256 3.19 16 4.844a137.13 137.13 0 0 1 26.81-15.875c-9.5-7.738-18.552-11.93-26.686-12.97-1.443-.185-2.87-.3-4.282-.313zM493.28 64.374c-77.985 0-125.587 28.886-146.124 69.406-20.536 40.52-13.994 90.39 9.688 131.407 11.385 19.72 17.807 40.687 19.187 61.22a4329.64 4329.64 0 0 1 18.47 19.187c2.31-29.955-5.072-61.35-21.47-89.75-21.13-36.602-26.155-80.112-9.186-113.594 16.97-33.481 55.94-59.188 129.437-59.188V64.376zM37.907 114.938c-2.894 23.925 6.18 50.21 29.532 73.562l13.218-13.188c-15.97-15.97-23.188-31.833-24.437-46.593-6.646-4.51-12.754-9.102-18.314-13.782zM124.062 277c-24.466-.028-45.04 4.92-61.343 13.656-24.842 13.31-39.363 35.865-40.75 60.47-2.78 49.207 44.38 102.65 140.405 118.28 101.63 16.544 170.303-9.184 205.406-54.062 1.01-1.29 1.988-2.59 2.94-3.906-4.552-4.232-9.148-8.52-13.783-12.875-1.233 1.79-2.52 3.55-3.875 5.28-29.97 38.315-90.355 62.97-187.687 47.126-90.394-14.715-126.796-62.527-124.75-98.783 1.023-18.127 10.982-34.37 30.938-45.062 19.955-10.692 50.267-15.364 90.5-7.47 34.077 6.69 62.938 3.47 85.437-6.936-4.72-4.65-9.49-9.33-14.28-14.064-17.545 6.452-39.89 8.088-67.564 2.656-14.895-2.923-28.778-4.297-41.594-4.312z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/weak.svg
+++ b/assets/actions/weak.svg
@@ -0,0 +1,66 @@
+<?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 323.9906 329.83231"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="weak.svg"
+   width="323.9906"
+   height="329.83231"
+   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" />
+        <dc:title></dc:title>
+      </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="2230"
+     inkscape:window-height="1388"
+     id="namedview8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="157.6092"
+     inkscape:cy="192.4342"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <g
+     class=""
+     transform="translate(-98.3908,-91.5658)"
+     id="g4">
+    <path
+       d="M 200.094,21.094 213.969,164.814 83.72,58.343 156.344,198.249 78.624,168.779 112.906,230.905 30.844,228.843 135.874,297 31.75,327.03 141.188,348.188 c 8.39,-48.802 49.597,-85.194 97.75,-105.344 28.916,-12.1 60.67,-18.762 90.75,-18.594 19.237,0.108 37.776,3.024 54.437,9.063 l 48,-119.375 L 350,196.5 369.22,34.72 327.344,130.688 313.47,92.03 l -32.69,83.5 z m 255.78,190.687 c -17.883,-0.093 -38.852,9.04 -55.937,26.126 a 100.103,100.103 0 0 0 -13.562,16.875 C 357.123,237.155 314,237.977 273.095,250.877 c -9.17,2.484 -18.214,5.537 -26.94,9.188 -43.676,18.277 -78.503,49.837 -86.218,89.625 -6.61,30.108 5.37,63.223 47.438,94.843 H 88.062 l -26.437,47.75 H 318.78 l -88.467,-103.25 c 24.27,-26.707 67.457,-43.703 97,-45.06 13.792,45.096 36.233,113.496 71.718,148.31 h 60.876 c -43.07,-46.546 -76.57,-109.087 -81.97,-179.842 a 33.579,33.579 0 0 0 6.314,8.78 c 18.664,18.664 55.945,11.618 83.28,-15.718 27.337,-27.336 34.384,-64.618 15.72,-83.28 -7,-7 -16.645,-10.382 -27.375,-10.44 z"
+       fill="#ffffff"
+       fill-opacity="1"
+       transform="matrix(0.7,0,0,0.7,76.8,76.8)"
+       id="path2" />
+  </g>
+</svg>
--- a/assets/ui/chance.svg
+++ b/assets/ui/chance.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80.64064mm"
+   height="87.145065mm"
+   viewBox="0 0 80.64064 87.145065"
+   version="1.1"
+   id="svg857"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="chance.svg">
+  <defs
+     id="defs851">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2797">
+      <stop
+         style="stop-color:#800000;stop-opacity:1;"
+         offset="0"
+         id="stop2793" />
+      <stop
+         style="stop-color:#800000;stop-opacity:0;"
+         offset="1"
+         id="stop2795" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient845"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#800000;stop-opacity:1;"
+         offset="0"
+         id="stop841" />
+      <stop
+         style="stop-color:#800000;stop-opacity:0;"
+         offset="1"
+         id="stop843" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="radialGradient2799"
+       cx="150.29712"
+       cy="162.02298"
+       fx="150.29712"
+       fy="162.02298"
+       r="148.85666"
+       gradientTransform="matrix(1,0,0,1.0817371,0,-13.243291)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8510546"
+     inkscape:cx="440.18041"
+     inkscape:cy="219.34219"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata854">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-65.513013,-104.59413)">
+    <g
+       id="g7-6"
+       transform="matrix(0.26458333,0,0,0.26458333,68.622737,106.83336)"
+       style="opacity:1;mix-blend-mode:normal;fill:#000000;fill-opacity:0.604288;stroke:none;stroke-width:10.56;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.4;image-rendering:auto">
+      <title
+         id="title4-3">Layer 1</title>
+      <path
+         fill="#ffffff"
+         fill-rule="evenodd"
+         stroke="#000000"
+         stroke-width="8"
+         id="path2-1"
+         d="m 206.5,1.5 q 8.5,0 15,3 6.5,3 12.25,8.25 5.75,5.25 12.5,15.5 Q 253,38.5 259.5,43 266,47.5 273.75,52.25 281.5,57 285.5,63 q 4,6 5.75,11.5 1.75,5.5 0,18 -1.75,12.5 -5.75,20 -4,7.5 -12.75,14.25 -8.75,6.75 -17.25,10.75 -8.5,4 -15,6 -6.5,2 -28.75,4.25 -22.25,2.25 -23,3 l -0.75,0.75 0.5,1.25 q 0.5,1.25 32,0.5 31.5,-0.75 43.5,2.75 12,3.5 18.25,8.25 6.25,4.75 9.75,10.25 3.5,5.5 5.5,10.5 2,5 0.5,19.5 -1.5,14.5 -4.75,19.75 -3.25,5.25 -3.75,6.5 l -0.5,1.25 -4.25,2.5 q -4.25,2.5 -10.25,10.5 -6,8 -10,16.5 -4,8.5 -6.75,12.25 -2.75,3.75 -5.25,5.5 -2.5,1.75 -4,4 -1.5,2.25 -9.5,6.25 -8,4 -18.5,2.5 Q 210,290.5 202.75,285.25 195.5,280 190.5,275 q -5,-5 -10.25,-12.25 -5.25,-7.25 -7,-10.5 Q 171.5,249 169,237 q -2.5,-12 -5.5,-21 l -3,-9 -1.5,6.5 q -1.5,6.5 0,28.5 1.5,22 6.5,35 5,13 9.25,18.25 4.25,5.25 10,10.5 5.75,5.25 4.75,10.75 -1,5.5 -1.25,5.75 L 188,322.5 181,321 q -7,-1.5 -13.75,-7.25 Q 160.5,308 156,301.5 q -4.5,-6.5 -8.5,-17 -4,-10.5 -5.5,-20.5 -1.5,-10 -0.25,-36.25 l 1.25,-26.25 -3.25,0.75 q -3.25,0.75 -4.75,5.25 -1.5,4.5 -5.5,29.5 -4,25 -8,32.5 -4,7.5 -7.25,10.75 -3.25,3.25 -8.25,6.75 -5,3.5 -11,5.5 -6,2 -19,0.5 Q 63,291.5 57,288 51,284.5 43.25,274.75 35.5,265 31.75,257 L 28,249 26.5,247.75 Q 25,246.5 20.75,242.75 16.5,239 10,230.5 3.5,222 2.5,219 1.5,216 3,202.5 4.5,189 9.5,181 14.5,173 21.75,167.25 29,161.5 37,158.5 q 8,-3 36.5,-3.5 28.5,-0.5 30.75,-2.75 l 2.25,-2.25 -1.25,-1.25 Q 104,147.5 74,145 44,142.5 30.5,136.5 17,130.5 11.75,125.25 6.5,120 4.5,116.5 2.5,113 2,103.5 1.5,94 5.25,84.75 9,75.5 21.5,65 34,54.5 35,54.25 L 36,54 37.5,51.25 Q 39,48.5 46.25,39.25 53.5,30 57.25,25.75 61,21.5 68,16 75,10.5 83,8 91,5.5 97,6 q 6,0.5 14,4 8,3.5 14.25,9.25 6.25,5.75 9.25,12.25 3,6.5 4.5,15.5 1.5,9 4.25,34 2.75,25 3.75,25 h 1 l 0.75,-2.5 Q 149.5,101 151.5,72 153.5,43 155,39.5 156.5,36 162.25,27.75 168,19.5 176,13.5 q 8,-6 15,-9 7,-3 15.5,-3 z"
+         style="fill:#000000;fill-opacity:0.604288;stroke:none;stroke-width:10.56;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.4" />
+    </g>
+    <g
+       id="g7"
+       transform="matrix(0.26458333,0,0,0.26458333,66.057598,105.25559)"
+       style="opacity:1;mix-blend-mode:normal;fill:#217821;stroke:none;stroke-width:10.56;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.4;image-rendering:auto">
+      <title
+         id="title4"
+         style="stroke:url(#radialGradient2799)">Layer 1</title>
+      <path
+         fill="#ffffff"
+         fill-rule="evenodd"
+         stroke="#000000"
+         stroke-width="8"
+         id="path2"
+         d="m 206.5,1.5 q 8.5,0 15,3 6.5,3 12.25,8.25 5.75,5.25 12.5,15.5 Q 253,38.5 259.5,43 266,47.5 273.75,52.25 281.5,57 285.5,63 q 4,6 5.75,11.5 1.75,5.5 0,18 -1.75,12.5 -5.75,20 -4,7.5 -12.75,14.25 -8.75,6.75 -17.25,10.75 -8.5,4 -15,6 -6.5,2 -28.75,4.25 -22.25,2.25 -23,3 l -0.75,0.75 0.5,1.25 q 0.5,1.25 32,0.5 31.5,-0.75 43.5,2.75 12,3.5 18.25,8.25 6.25,4.75 9.75,10.25 3.5,5.5 5.5,10.5 2,5 0.5,19.5 -1.5,14.5 -4.75,19.75 -3.25,5.25 -3.75,6.5 l -0.5,1.25 -4.25,2.5 q -4.25,2.5 -10.25,10.5 -6,8 -10,16.5 -4,8.5 -6.75,12.25 -2.75,3.75 -5.25,5.5 -2.5,1.75 -4,4 -1.5,2.25 -9.5,6.25 -8,4 -18.5,2.5 Q 210,290.5 202.75,285.25 195.5,280 190.5,275 q -5,-5 -10.25,-12.25 -5.25,-7.25 -7,-10.5 Q 171.5,249 169,237 q -2.5,-12 -5.5,-21 l -3,-9 -1.5,6.5 q -1.5,6.5 0,28.5 1.5,22 6.5,35 5,13 9.25,18.25 4.25,5.25 10,10.5 5.75,5.25 4.75,10.75 -1,5.5 -1.25,5.75 L 188,322.5 181,321 q -7,-1.5 -13.75,-7.25 Q 160.5,308 156,301.5 q -4.5,-6.5 -8.5,-17 -4,-10.5 -5.5,-20.5 -1.5,-10 -0.25,-36.25 l 1.25,-26.25 -3.25,0.75 q -3.25,0.75 -4.75,5.25 -1.5,4.5 -5.5,29.5 -4,25 -8,32.5 -4,7.5 -7.25,10.75 -3.25,3.25 -8.25,6.75 -5,3.5 -11,5.5 -6,2 -19,0.5 Q 63,291.5 57,288 51,284.5 43.25,274.75 35.5,265 31.75,257 L 28,249 26.5,247.75 Q 25,246.5 20.75,242.75 16.5,239 10,230.5 3.5,222 2.5,219 1.5,216 3,202.5 4.5,189 9.5,181 14.5,173 21.75,167.25 29,161.5 37,158.5 q 8,-3 36.5,-3.5 28.5,-0.5 30.75,-2.75 l 2.25,-2.25 -1.25,-1.25 Q 104,147.5 74,145 44,142.5 30.5,136.5 17,130.5 11.75,125.25 6.5,120 4.5,116.5 2.5,113 2,103.5 1.5,94 5.25,84.75 9,75.5 21.5,65 34,54.5 35,54.25 L 36,54 37.5,51.25 Q 39,48.5 46.25,39.25 53.5,30 57.25,25.75 61,21.5 68,16 75,10.5 83,8 91,5.5 97,6 q 6,0.5 14,4 8,3.5 14.25,9.25 6.25,5.75 9.25,12.25 3,6.5 4.5,15.5 1.5,9 4.25,34 2.75,25 3.75,25 h 1 l 0.75,-2.5 Q 149.5,101 151.5,72 153.5,43 155,39.5 156.5,36 162.25,27.75 168,19.5 176,13.5 q 8,-6 15,-9 7,-3 15.5,-3 z"
+         style="fill:#217821;stroke:none;stroke-width:10.56;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.4" />
+    </g>
+  </g>
+</svg>
--- a/assets/ui/d100.svg
+++ b/assets/ui/d100.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(201, 201, 201, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite>0<feOffset dx="230" dy="300" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(-100,0)" style=""><path d="m375.483 251.243-109.98 51.138.213 183.381L477.01 266.346l-86.993-21.81zm-12.736 108.626-5.947 14.699-48.604-8.955 5.007-12.832a141.306 141.306 0 0 0 13.51-11.358 167.184 167.184 0 0 0 16.566-17.517 170.478 170.478 0 0 0 12.606-17.958 115.607 115.607 0 0 0 9.514-17.97l14.068 2.51q-9.37 22.334-30.361 44.43-13.296 13.64-20.645 18.636zM121.603 244.334l-84.71 21.763L246.474 486V302.38l-109.946-51.137zm19.147 50.852a28.72 28.72 0 0 1 24.273 6.802 53.052 53.052 0 0 1 11.226 14.188l-13.081 2.676a28.542 28.542 0 0 0-5.388-7.374q-5.185-4.876-11.262-3.853l-.487.095a6.458 6.458 0 0 0-5.162 4.448c-.856 2.378-.238 5.554 1.796 9.371q4.08 7.6 10.81 9.027a23.785 23.785 0 0 0 8.563-.203l1.867-.344 5.791 10.822q-6.398 1.427-8.23 3.282-3.21 3.14.429 9.93a17.042 17.042 0 0 0 6.089 6.696 10.406 10.406 0 0 0 7.385 1.534l.416-.083q4.757-.964 5.079-4.757c.261-2.57-.655-5.744-2.748-9.514l12.38-2.545a49.247 49.247 0 0 1 4.103 11.226 19.956 19.956 0 0 1-.642 9.383 11.702 11.702 0 0 1-3.96 5.411 19.575 19.575 0 0 1-8.027 3.235l-1.19.214a27.971 27.971 0 0 1-17.494-2.7 32.193 32.193 0 0 1-14.128-14.092q-3.627-6.79-2.604-12.19a8.396 8.396 0 0 1 2.521-4.947h-.071q-1.844.31-7.04-2.497a32.11 32.11 0 0 1-12.916-13.593q-5.245-9.764-3.282-18.398 1.962-8.634 13.676-11zM27.19 248.865l108.78-116.309a7.135 7.135 0 0 1 1.427 0h.154q3.14.345 2.842 3.71a19.36 19.36 0 0 1-3.294 8.1 39.376 39.376 0 0 1-9.728 10.405q-3.912 2.938-15.044 9.514-12.796 7.505-19.55 14.77a92.535 92.535 0 0 0-11.513 14.486l32.907 3.758 8.182-12.963-20.967-2.378a36.415 36.415 0 0 1 4.757-3.83q2.379-1.605 8.444-5.125l6.422-3.747a92.975 92.975 0 0 0 12.903-8.776 61.472 61.472 0 0 0 12.51-14.414q6.84-10.846 6.494-17.957c-.19-3.949-2.105-6.434-5.684-7.505l79.798-85.161-102.097 179.576-5.708 10.06zm367.238-71.974q-3.817-5.458-3.758-8.515c0-2.033 1.19-3.199 3.568-3.448h.57a11.892 11.892 0 0 1 6.91 2.247 29.85 29.85 0 0 1 7.837 8.051q3.687 5.28 3.71 8.397c0 2.093-1.188 3.258-3.496 3.567h-.594a11.75 11.75 0 0 1-6.957-2.378 29.79 29.79 0 0 1-7.79-7.885zm-109.41-141.52 83.948 89.634h-1.189c-.38 0-.975 0-1.463.107q-7.825.892-8.324 6.862-.5 5.97 5.03 13.747a53.778 53.778 0 0 0 6.375 7.374 37.901 37.901 0 0 0 10.144 6.897q-2.117 2.89-.702 7.98a37.283 37.283 0 0 0 5.613 11.096 55.122 55.122 0 0 0 15.223 14.806q8.098 5.268 16.066 4.935.81 0 1.618-.13 8.776-.988 9.228-7.873a16.114 16.114 0 0 0-.463-4.853l58.689 62.686-91.572-22.941-6.1-10.703zm98.22 104.927 2.45 2.617c.451.57.903 1.189 1.355 1.784 1.808 2.592 2.723 4.757 2.723 6.529 0 1.771-1.034 2.782-3.127 3.02h-.512a10.346 10.346 0 0 1-6.077-1.95 22.596 22.596 0 0 1-6.184-6.137c-1.974-2.83-2.937-5.102-2.878-6.814.06-1.713 1.118-2.7 3.187-2.937h.524a10.263 10.263 0 0 1 6.005 1.879 19.147 19.147 0 0 1 2.533 2.01zM255.987 26 137.456 231.026l118.532 55.05 118.604-55.05zm-1.19 208.463q-17.529 0-24.58-12.273-7.053-12.273-7.053-34.988 0-22.714 7.052-35.047 7.052-12.332 24.582-12.344 17.53 0 24.582 12.332 7.052 12.333 7.052 35.047 0 22.715-7.052 34.988-7.053 12.273-24.582 12.285zm10.538-71.807q2.497 7.968 2.497 24.546 0 15.817-2.497 24.201-2.498 8.384-10.537 8.325-8.04 0-10.632-8.325-2.593-8.324-2.593-24.2 0-16.579 2.593-24.547t10.632-7.968q8.015-.012 10.513 7.956z" fill="#fff" fill-opacity="1" filter="url(#shadow-1)" transform="translate(128, 128) scale(0.5, 0.5) rotate(-30, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/destinee.svg
+++ b/assets/ui/destinee.svg
@@ -0,0 +1,90 @@
+<?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 437.49716 437.38699"
+   version="1.1"
+   id="svg13"
+   sodipodi:docname="destinee.svg"
+   width="437.49716"
+   height="437.38699"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1776"
+     inkscape:window-height="1711"
+     id="namedview15"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="217.3254"
+     inkscape:cy="228.937"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg13" />
+  <defs
+     id="defs7">
+    <radialGradient
+       id="lorc-aura-gradient-1"
+       gradientTransform="scale(1.0001259,0.9998741)"
+       cx="257.54889"
+       cy="253.53915"
+       fx="257.54889"
+       fy="253.53915"
+       r="243.02338"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0%"
+         stop-color="#f8e71c"
+         stop-opacity="1"
+         id="stop2" />
+      <stop
+         offset="100%"
+         stop-color="#f5a623"
+         stop-opacity="0.53"
+         id="stop4" />
+    </radialGradient>
+  </defs>
+  <g
+     class=""
+     transform="translate(-38.6746,-35.063004)"
+     id="g11">
+    <path
+       d="m 320.938,13.28 c -16.646,34.584 -38.466,60.157 -63.094,60.157 -24.522,0 -47.035,-25.275 -63.656,-59.593 0.366,39.358 -9.71,90.884 -30.938,105.125 -21.228,14.24 -49.64,-12.002 -78.844,-32.126 17.455,34.04 42.095,67.5 29.78,92.28 -12.21,24.576 -59.172,35.96 -92.874,35.626 29.338,19.29 78.842,45.803 78.844,74.188 0.002,28.384 -49.504,53.71 -78.844,73 33.702,-0.333 80.663,11.612 92.876,36.187 12.227,24.61 -9.03,56.31 -33.75,85.563 44.826,-15.413 65.142,-5.735 85.374,10.812 h 31.75 C 154.822,459.086 125.5,386.671 125.5,302.936 125.498,184.316 184.42,88.03 256.906,88.03 c 72.488,0 131.406,96.29 131.406,214.907 0,83.74 -29.317,156.153 -72.062,191.563 h 27.313 c 19.847,-14.62 39.796,-25.65 89.687,-9.28 -26.233,-30.264 -42.2,-62.484 -29.97,-87.095 12.257,-24.665 56.658,-36.612 90.533,-36.188 -29.4,-19.297 -75.344,-44.584 -75.344,-73 0,-28.415 45.943,-54.89 75.342,-74.187 -33.874,0.424 -78.273,-10.962 -90.53,-35.625 -12.315,-24.78 9.982,-58.24 27.437,-92.28 -29.202,20.12 -57.583,46.385 -78.845,32.124 -21.262,-14.263 -31.382,-66.13 -30.938,-105.69 z m -68.97,93.75 c -19.56,2.543 -37.343,25.564 -37.343,55.407 0,16.447 5.67,30.986 14,41.032 l 10.156,12.218 -15.593,2.937 c -10.815,2.035 -18.743,7.737 -25.53,17.063 -6.79,9.325 -11.984,22.344 -15.626,37.343 -6.585,27.128 -8.078,60.24 -8.31,89.47 h 36.093 l 0.656,8.656 9.124,122.563 h 76.187 l 8.095,-122.5 0.563,-8.72 h 34.375 c -0.026,-29.592 -0.44,-63.166 -6.407,-90.5 -3.295,-15.095 -8.287,-28.096 -15.156,-37.313 -6.87,-9.216 -15.133,-14.897 -27.28,-16.78 l -15.94,-2.47 10.064,-12.593 c 7.97,-9.996 13.375,-24.36 13.375,-40.406 -0.002,-31.817 -19.884,-55.313 -41.44,-55.313 -2.54,0 -3.96,-0.103 -4.03,-0.094 h -0.03 z"
+       fill="url(#lorc-aura-gradient-1)"
+       stroke="#d03d02"
+       stroke-opacity="1"
+       stroke-width="4"
+       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
+       id="path9"
+       style="fill:url(#lorc-aura-gradient-1)" />
+  </g>
+</svg>
--- a/assets/ui/fatigue.svg
+++ b/assets/ui/fatigue.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M249.094 18.25c-42.675 0-81.852 25.486-110.938 68.438C109.07 129.637 90.72 189.74 90.72 256.28c0 66.543 18.35 126.643 47.436 169.595s68.263 68.47 110.938 68.47 81.883-25.518 110.97-68.47c29.084-42.952 47.436-103.052 47.436-169.594 0-66.54-18.352-126.64-47.438-169.592C330.978 43.736 291.77 18.25 249.094 18.25zm-128.97 241.313c18.356 18.096 37.528 26.765 55.72 27.562 18.19.797 35.927-6.096 52.125-21.5l12.874 13.53c-19.214 18.274-42.25 27.658-65.813 26.626-23.56-1.03-47.1-12.3-68-32.905l13.095-13.313zm264.782 0 13.125 13.312C377.135 293.48 353.564 304.75 330 305.78c-23.563 1.033-46.598-8.35-65.813-26.624l12.875-13.53c16.2 15.403 33.934 22.296 52.125 21.5 18.192-.798 37.365-9.467 55.72-27.563zM251.562 371.656c36.423-.156 72.996 19.144 77.438 58.406-51.33 13.296-102.67 12.767-154 0 3.858-38.638 40.14-58.25 76.563-58.406z" fill="#fff" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/icon_sidebar_cards.svg
+++ b/assets/ui/icon_sidebar_cards.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M119.436 36c-16.126 0-29.2 17.237-29.2 38.5v363c0 21.263 13.074 38.5 29.2 38.5h275.298c16.126 0 29.198-17.237 29.198-38.5v-363c0-21.263-13.072-38.5-29.198-38.5zm26.369 10.951 11.002 32.856 34.648.312-27.848 20.617 10.41 33.05-28.212-20.114-28.215 20.113L128 100.736 100.152 80.12l34.649-.312zM363.979 161.84c7.127 9.459 12.739 20.689 16.832 32.04 3.8 10.544 6.197 21.211 6.668 31.02-.163 19.015-3.915 23.274-14.557 36.934l-6.703-11.48c-10.85-13.106-30.779-48.4-47.383-43.672-6.521 6.11-8.996 13.37-10.313 20.802 2.898 8.8 4.477 18.43 4.477 28.516 0 15.293-3.615 29.54-9.996 41.416 22.643 4.537 57.927 19.332 57.973 39.223-.27 3.783-1.835 7.68-4.362 10.42-10.743 12.528-36.958 4.125-45.2 10.072.796 6.947 4.112 14.118 4.355 20.174.136 4.36-1.768 10.58-6.508 13.996-5.67 4.087-12.968 4.551-18.52 3.045C279.94 392.226 272 379.649 256 377c-13.544 3.491-22.412 13.87-34.742 17.346-5.552 1.506-12.85 1.042-18.52-3.045-4.74-3.417-6.644-9.636-6.508-13.996-.058-7.142 4.107-13.794 4.356-20.174-15.741-7.788-33.816 1.97-45.201-10.072-2.527-2.74-4.093-6.637-4.362-10.42 6.146-27.341 35.374-34.684 57.973-39.223C202.615 285.54 199 271.293 199 256c0-11.489 2.047-22.385 5.764-32.135-2.357-7.923-3.441-15.988-9.438-22.441-8.758-.925-14.079 6.897-17.842 12.63-11.683 19.5-18.718 30.606-32.88 46.192-16.604-23.4-19.314-49.29-13.157-70.988 6.065-20.331 19.17-38.798 37.926-47.924 21.216-9.766 39.872-10.03 58.885.203 5.163-13.053 10.4-25.65 18.035-36.209 9.625-13.31 23.8-25.631 43.707-25.295 38.8.656 73.993 51.156 73.979 81.807zm-72.22-63.893c-35.759 2.409-44.771 44.746-55.189 71.29l-9.447-7.087c-18.428-12.31-31.076-13.732-49.875-4.63-12.924 6.288-23.701 20.62-28.553 36.882-3.38 11.329-3.765 23.225-.949 33.645 9.45-13.549 15.806-30.08 28.317-39.178 7.486-7.975 26.27-8.498 35.45 3.897 4.838 7.02 7.437 14.54 9.5 22.234h72.165c.592-1.944 1.067-3.762 2.017-6.033 2.956-7.064 7.765-16.266 18.395-19.504 18.09-3.862 32.494 7.106 43.498 18.514 4.517 4.717 8.492 9.696 12.098 14.517-.69-6.798-2.477-14.651-5.31-22.508-13.127-36.707-37.889-51.031-70.386-32.011 2.556-16.423 16.87-35.72 46.25-26.962-9.094-17.135-30.355-42.471-47.98-43.066zM220.644 233c-2.31 6.965-3.643 14.753-3.643 23 0 15.85 4.892 30.032 12.26 39.855C236.628 305.68 245.988 311 256 311s19.372-5.32 26.74-15.145C290.108 286.032 295 271.85 295 256c0-8.247-1.334-16.035-3.643-23zM232 280h48s-8 14-24 14-24-14-24-14zm-11.14 33.566c-13.86 3.34-50.369 8.9-51.842 21.42 9.621 1.947 20.446.838 28.998 2.235 5.993 1.018 12.82 3.323 17.285 9.517 3.375 4.683 3.577 10.103 3.037 14.21-.543 5.89-3.317 10.557-3.975 16.32 15.955-2.59 28.264-17.532 41.637-18.268 16-.702 29.313 17.402 41.637 18.268-.893-5.59-3.262-11.158-3.975-16.32-.54-4.107-.338-9.527 3.037-14.21 4.465-6.194 11.292-8.5 17.285-9.517 9.742-2.229 19.975.396 28.998-2.235-5.77-13.125-39.813-19.454-51.841-21.42C281.665 323.01 269.45 329 256 329c-13.452 0-25.665-5.991-35.14-15.434zm117.122 64.649 28.213 20.113 28.215-20.113L384 411.264l27.848 20.617-34.649.312-11.004 32.856-11.002-32.856-34.648-.312 27.848-20.617z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/icon_sidebar_chat.svg
+++ b/assets/ui/icon_sidebar_chat.svg
@@ -1,449 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512.07 512" style="enable-background:new 0 0 512.07 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#DCDCDC;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st1{display:none;}
-	.st2{display:inline;}
-</style>
-<g id="icon_x5F_sidebar_x5F_chat">
-	<g>
-		<g>
-			<g>
-				<path class="st0" d="M180,480.93c14-15.25,27.95-29.3,40.56-44.47c14.18-17.05,23.54-36.69,26.34-59.05
-					c1.66-13.29-0.67-25.98-5.04-38.48c-1.8-5.15-5.7-5.52-10.23-5.78c-18.92-1.08-37.99-1.21-56.71-3.83
-					c-40-5.59-76.63-19.99-107.18-47.16c-36.18-32.19-46.99-77.73-26.93-122.29c15.37-34.14,40.96-59.17,71.93-78.94
-					c47.68-30.44,100.22-45.65,156.55-49.23c41.61-2.64,81.81,2.91,120.81,17.42c26.15,9.73,48.71,24.87,66.74,46.2
-					c29.1,34.42,32.23,80.62,8.86,120.58c-23.61,40.37-58.93,67.06-100.58,86.28c-10.17,4.7-20.81,8.38-31.3,12.36
-					c-4.3,1.63-6.47,4.24-6.8,9.02c-2.04,29.43-14.23,54.78-32.77,77.05c-29.18,35.06-66,59.86-107.6,77.9
-					C184.67,479.39,182.56,480.01,180,480.93z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_rolltable" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M255.1,55.46c6.7,2.37,12.64,3.53,17.63,6.38c47.83,27.36,95.49,55,143.19,82.58
-					c1.76,1.02,3.5,2.14,5.06,3.43c4.67,3.85,4.73,8.08-0.19,11.57c-4.48,3.18-9.3,5.9-14.07,8.66
-					c-43.81,25.34-87.68,50.58-131.43,76.01c-12.79,7.43-25.19,8.02-38.18,0.44c-47.26-27.53-94.66-54.81-141.95-82.29
-					c-11.67-6.78-11.5-10.86,0.17-17.61c45.93-26.57,91.78-53.27,137.82-79.64C240.07,61.03,247.84,58.57,255.1,55.46z
-					 M256.6,177.07c8.18-2.74,15.83-4.76,23.02-7.85c6.75-2.9,11.12-8.42,11.32-16.12c0.2-7.86-4.55-13.18-10.98-16.36
-					c-16.34-8.07-32.92-8.99-48.94,0.93c-13.18,8.17-13.33,23.46,0.28,30.9C238.94,172.75,248.01,174.3,256.6,177.07z
-					 M139.44,174.49c10.51,0.36,20.31-1.78,28.43-8.85c7.92-6.9,8.07-17.96,0.6-25.36c-13.09-12.97-44.39-13.07-57.62-0.19
-					c-8.94,8.7-8.15,19.73,2.02,27.08C120.8,172.91,129.82,174.83,139.44,174.49z M371.05,174.5c13.13,0.01,20.45-1.93,27.72-7.04
-					c11.22-7.88,11.04-21.8-0.38-29.44c-14.58-9.76-37.05-9.78-51.54-0.06c-11.6,7.78-11.75,21.98-0.23,29.88
-					C354.29,173.1,362.88,175.12,371.05,174.5z M257.2,200.1c-10.74-0.21-20.43,1.8-28.51,8.53c-9.63,8.02-9.2,19.91,0.7,27.6
-					c13.81,10.71,40.59,10.4,54.05-0.63c9.82-8.05,9.29-21.21-1.19-28.54C274.59,201.7,265.94,199.86,257.2,200.1z M255.77,105.95
-					c10.86-0.08,20.49-2.25,28.35-9.28c8.51-7.61,8.52-17.75,0.3-25.54c-13.52-12.81-43.78-12.59-57.1,0.4
-					c-7.45,7.27-7.44,17.61,0.19,24.78C235.62,103.93,245.78,105.61,255.77,105.95z"/>
-			</g>
-			<g>
-				<path class="st0" d="M73.56,270.29c-0.01-23.47-0.01-46.95,0-70.42c0-2.24-0.04-4.5,0.09-6.73c0.55-9.08,4.45-11.43,12.3-7.03
-					c14.77,8.29,29.43,16.78,44.1,25.25c31.29,18.06,62.49,36.27,93.87,54.16c13.59,7.75,19.9,19.03,19.84,34.61
-					c-0.18,47.56-0.07,95.12-0.07,142.68c0,1.02,0,2.04-0.03,3.06c-0.37,10.88-4.46,13.26-13.91,7.81
-					c-46.51-26.8-93.02-53.6-139.43-80.56c-11.08-6.44-16.76-16.38-16.77-29.35C73.56,319.28,73.57,294.79,73.56,270.29z
-					 M238.89,301.12c-1.04-15.22-9.94-29.1-25.87-37.67c-12.78-6.88-25.53,0.97-25.17,15.07c0.45,18,8.76,32.2,24.15,41.47
-					C226.27,328.58,238.87,320.93,238.89,301.12z M238.88,424.25c-0.03-14.84-11.77-33.85-24.91-40.35
-					c-13.82-6.83-27.24,1.36-26.24,16.4c1.14,17.22,9.44,30.68,24.03,39.63C226.22,448.8,238.92,441.17,238.88,424.25z
-					 M78.36,336.56c-0.07,16.35,12.18,35.46,26.64,41.57c13.6,5.74,24.53-1.52,24.14-16.28c-0.47-17.75-9.44-30.82-23.63-40.54
-					c-5.85-4.01-12.62-5.05-19.12-1.43C80,323.43,78.2,329.62,78.36,336.56z M78.16,216.83c1.81,17.43,9.33,31.66,25.03,40.21
-					c13.84,7.55,26.4-0.25,25.96-15.46c-0.51-17.56-9.43-30.51-23.26-40.31c-5.78-4.1-12.64-5.27-19.16-1.76
-					C80.09,203.09,78.12,209.49,78.16,216.83z"/>
-			</g>
-			<g>
-				<path class="st0" d="M438.48,269.36c0,23.88-0.09,47.77,0.04,71.65c0.08,14.95-5.66,26.05-19.04,33.69
-					c-45.56,26.01-90.87,52.43-136.3,78.66c-1.93,1.11-4.02,2.03-6.14,2.72c-4.13,1.36-6.9-0.45-7.9-4.42
-					c-0.69-2.73-0.78-5.65-0.78-8.49c-0.04-48.18,0.04-96.35-0.07-144.53c-0.03-14.73,6.49-25.32,19.04-32.56
-					c44.18-25.53,88.36-51.07,132.54-76.6c1.24-0.71,2.5-1.39,3.75-2.08c11.32-6.2,14.8-4.14,14.84,9.08
-					C438.53,220.78,438.48,245.07,438.48,269.36z M273.14,421.22c0.05,19.9,12.39,27.34,26.79,18.9
-					c14.92-8.75,23.03-22.32,24.24-39.46c1.09-15.44-12.22-24.3-25.6-16.81C282.99,392.57,274.73,406.59,273.14,421.22z
-					 M273.19,300.58c-0.25,19.57,10.43,26.62,25.43,19.95c14.02-6.23,26.59-26.94,25.75-42.41c-0.77-14.26-13.04-21.55-25.73-14.51
-					C283.1,272.22,275.12,286.19,273.19,300.58z M378.55,373.28c0.05-21.14-11.77-28.95-25.77-20.61
-					c-15.26,9.09-24.61,22.51-24.5,41.07c0.1,15.52,11.79,22.77,25.39,15.25C369.25,400.38,377.63,386.78,378.55,373.28z
-					 M433.65,340.47c0.1-20.18-12.26-27.99-26.62-19.24c-14.51,8.85-23.33,22.09-24,39.66c-0.62,16.14,11.34,23.92,25.59,16.37
-					C424.57,368.82,431.83,354.54,433.65,340.47z M378.56,249.19c0.11-16.72-10.87-24.46-24.88-17.53
-					c-15.12,7.48-26.59,27.54-25.35,44.37c0.88,11.94,10.06,18.07,21.51,14.37C365.3,285.38,378.44,266.54,378.56,249.19z
-					 M433.67,217.08c0.11-15.23-9.9-22.9-23.27-17.86c-16.2,6.12-29.92,29.74-27.12,46.71c1.73,10.53,10.4,15.95,20.67,12.93
-					C419.6,254.24,433.54,234.65,433.67,217.08z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_actor" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M194.72,240.85c-18.71-10.84-37.43-21.65-56.1-32.56c-4.38-2.56-3.72-6.78-3.09-10.93
-					c4.53-29.87,16.49-56.68,33.54-81.37c22.53-32.64,51.22-59.09,83.04-82.38c1.94-1.42,4.08-2.55,6.44-4.01
-					c2.95,1.91,5.76,3.52,8.35,5.44c34.2,25.36,64.61,54.39,87.21,90.87c13.92,22.47,23.34,46.63,27.11,72.93
-					c0.74,5.19-0.6,8.42-5.19,11.05c-17.12,9.83-34.08,19.93-51.1,29.92c-0.35-0.42-0.7-0.84-1.06-1.26
-					c7.2-7.59,13.9-15.74,21.74-22.61c6.97-6.11,8.08-12.73,6.54-21.27c-5.03-27.96-18.41-51.68-36.13-73.32
-					c-14.99-18.3-32.86-33.43-51.91-47.27c-3.26-2.37-6.29-3.56-10-0.89c-28.94,20.8-54.74,44.63-72.73,75.88
-					c-9.25,16.07-15.58,33.21-17.65,51.81c-0.5,4.49,0.65,7.78,3.76,10.99c9.23,9.52,18.23,19.25,27.32,28.9L194.72,240.85z"/>
-			</g>
-			<g>
-				<path class="st0" d="M168.55,345.65c-12.76,3.01-23.81-2.22-35.94-5.83c-3.63,12.02-1.15,22.71,4.28,33.16
-					c-0.52,0.49-1.04,0.98-1.56,1.47c-7.28-3.95-14.57-7.89-22.66-12.28c-0.94,40.71,5.85,79.96,12.76,120.22
-					c-9.73,0-18.21,0-28.31,0c0-4.71-0.17-8.65,0.03-12.57c2.77-54.5,0.73-108.5-16.69-160.88c-1.7-5.12-1.02-8.86,2.98-12.56
-					c15.25-14.13,30.3-28.49,45.51-42.67c1.86-1.73,4.21-2.92,7.2-4.95c12.66,31.79,36.38,51.55,65.92,65.71
-					c-23.56,4.18-43.99-5.23-64.98-14.12C142.45,319.03,153.45,333.5,168.55,345.65z"/>
-			</g>
-			<g>
-				<path class="st0" d="M378.56,342.15c-11.2,1.29-21.2,6.91-34.38,4.02c17.38-13.12,29.62-28.02,35.34-49.86
-					c-22.86,11.18-44.29,22.27-69.86,17.87c29.22-14.58,53.47-34,65.19-66.51c3.09,2.11,5.44,3.31,7.29,5.04
-					c15.49,14.48,30.83,29.13,46.36,43.57c3.94,3.66,4.92,7.36,3.13,12.52c-12.8,37.05-17.33,75.43-17.57,114.4
-					c-0.11,17.53,0.54,35.07,0.78,52.6c0.02,1.77-0.35,3.55-0.66,6.4c-8.97,0-17.6,0-27.36,0c6.32-39.97,13.54-79.18,12.38-120.61
-					c-8.84,4.81-16.27,8.85-23.71,12.89c-0.49-0.48-0.97-0.96-1.46-1.44C378.33,363.41,381.6,353.68,378.56,342.15z"/>
-			</g>
-			<g>
-				<path class="st0" d="M207.81,179.57c3.71-5.83,8.78-8.93,15.2-8.75c5.91,0.17,10.65,3.14,13.82,8.68
-					c-3.37,5.93-8.7,7.74-14.45,7.81C216.53,187.39,211.48,185.04,207.81,179.57z"/>
-			</g>
-			<g>
-				<path class="st0" d="M277.66,179.72c3.23-6.12,7.85-9.04,14-9c6.15,0.04,10.67,3.08,13.58,8.58c-2.43,6.15-7.58,7.55-12.87,7.82
-					C286.5,187.42,281.29,185.46,277.66,179.72z"/>
-			</g>
-			<g>
-				<path class="st0" d="M194.81,240.77c0,0-0.08,0.08-0.08,0.08C194.72,240.85,194.81,240.77,194.81,240.77z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_scene" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M141.31,362.45c10.55-10.81,21.11-21.61,32.39-33.17c-4.23-4.4-7.78-8.52-11.78-12.13
-					c-4.39-3.96-5.23-7.87-1.64-12.78c2.36-3.24,4.31-6.78,7.52-11.92c29.68,29.65,58.51,58.45,88.28,88.2
-					c29.63-29.58,58.38-58.28,88.43-88.27c3.76,6.48,7.17,11.44,9.48,16.88c0.68,1.6-1.26,4.92-2.82,6.75
-					c-3.78,4.43-8.04,8.45-12.61,13.15c3.87,4.06,7.01,7.46,10.26,10.75c6.02,6.1,12.2,12.04,18.09,18.27
-					c1.5,1.58,2.14,3.98,2.19,6.78c-11.12-2.35-15.32-13.36-25.7-18.87c-4.53,5.37-9.27,11-14.4,17.08
-					c4.03,8.46,15.77,12.55,18.84,22.89c-0.64,0.7-1.28,1.4-1.92,2.1c-2.18-1.32-4.7-2.29-6.49-4.01
-					c-7.5-7.21-14.75-14.68-22.17-21.99c-1.69-1.67-3.67-3.05-6.41-5.3c-5.41,5.88-10.51,11.42-16,17.4
-					c1.57,1.94,2.93,3.92,4.6,5.61c7.3,7.42,14.75,14.69,22,22.16c1.66,1.71,2.69,4.01,3.13,6.87
-					c-10.84-2.35-15.01-13.32-25.2-18.68c-4.93,5.38-10.02,10.94-15.43,16.85c4.67,9.02,15.38,13.49,19.26,23.07
-					c-0.54,0.67-1.09,1.34-1.63,2.01c-2.14-1.31-4.59-2.29-6.35-3.98c-7.49-7.22-14.75-14.69-22.17-21.99
-					c-1.69-1.66-3.68-3.01-5.89-4.79c-3.8,3-7.23,5.71-11.03,8.71c-3.77-2.97-7.19-5.68-11.01-8.69c-2.19,1.75-4.19,3.08-5.87,4.74
-					c-7.42,7.3-14.69,14.75-22.16,22c-1.73,1.67-4.02,2.76-6.91,3.23c2.31-10.77,13.12-15.02,18.63-25.24
-					c-5.42-4.76-11.09-9.74-17.21-15.11c-8.81,4.1-12.9,15.32-22.79,18.83c-0.62-0.47-1.25-0.95-1.87-1.42
-					c1.25-2.13,2.15-4.6,3.81-6.33c7.21-7.5,14.68-14.75,21.99-22.17c1.67-1.7,3.05-3.67,5.27-6.37
-					c-5.69-5.59-11.06-10.87-16.79-16.51c-2.48,2-4.47,3.36-6.16,5.02c-7.42,7.3-14.69,14.75-22.16,22c-1.71,1.66-4,2.72-6.87,3.19
-					c2.16-10.9,13.44-14.89,18.41-25.47c-5.23-4.81-10.76-9.89-16.39-15.06c-9.69,4.24-13.75,16.43-24.15,19.15
-					C143.03,364.74,142.17,363.6,141.31,362.45z"/>
-			</g>
-			<g>
-				<path class="st0" d="M441,403.48c-16.69-27.59-33.44-55.13-50.04-82.77c-42.46-70.68-84.85-141.39-127.26-212.1
-					c-1.34-2.23-2.47-4.58-4.3-8.02c13.34-3.15,24.63-8.77,32.97-20.46c1.71,2.53,2.89,3.85,3.6,5.4
-					c28.28,61.55,56.51,123.12,84.77,184.68c19.15,41.72,38.37,83.41,57.51,125.14c1.18,2.58,1.92,5.36,2.86,8.04L441,403.48z"/>
-			</g>
-			<g>
-				<path class="st0" d="M217.61,82.38c2.39,3.13,3.85,4.73,4.95,6.53c4.59,7.48,8.69,15.3,13.71,22.47
-					c4.35,6.21,4.12,11.18,0.16,17.73c-47.28,78.28-94.26,156.74-141.31,235.16c-6.51,10.85-13.01,21.71-19.54,32.55
-					c-1.13,1.88-2.39,3.68-4.72,4.92C119.57,295.76,168.27,189.77,217.61,82.38z"/>
-			</g>
-			<g>
-				<path class="st0" d="M477.25,255.92c-10.87-10.64-21.54-21.09-32.91-32.23c-5.58,5.75-10.68,11.01-16.24,16.75
-					c1.84,2.26,3.31,4.39,5.1,6.21c7.43,7.56,15,15,22.43,22.56c2.12,2.16,4.52,4.52-0.17,8.58c-7.22-6.76-14.48-13.55-21.88-20.47
-					c-6.08,5.51-11.66,10.57-17.97,16.3c7.88,8.42,14.65,15.65,21.42,22.88c-0.62,0.85-1.25,1.7-1.87,2.56
-					c-2.14-1.03-4.53-1.72-6.36-3.13c-13.8-10.59-21.18-25.52-27.46-41.16c-5.78-14.38-8.33-11.03,4.45-23.75
-					c7.23-7.19,14.4-14.44,21.65-21.61c1.71-1.69,3.62-3.17,5.84-5.08c1.73,1.12,3.41,1.86,4.63,3.06
-					c13.32,13.21,26.59,26.48,39.81,39.79C479.85,249.34,482.22,251.73,477.25,255.92z"/>
-			</g>
-			<g>
-				<path class="st0" d="M68.55,223.56c-12.92,10.59-22.16,23.11-34.32,32.22c-0.78-0.53-1.57-1.06-2.35-1.59
-					c0.43-1.85,0.25-4.3,1.39-5.46c14.33-14.51,28.84-28.83,43.34-43.18c0.39-0.38,1.12-0.42,1.97-0.71
-					c0.75,0.34,1.86,0.54,2.53,1.2c10.88,10.75,21.84,21.43,32.39,32.51c1.47,1.54,1.83,5.55,0.94,7.69
-					c-4.29,10.36-8.17,21.11-14.15,30.47c-5.16,8.08-12.9,14.53-19.62,21.58c-0.65,0.69-2.18,0.54-5.2,1.2
-					c3.65-11.71,15.03-15.79,20.22-26.77c-5.23-4.62-10.83-9.57-16.64-14.7c-9.41,4.67-13.78,15.49-23.35,19.4
-					c-0.67-0.54-1.35-1.07-2.02-1.61c1.11-1.99,1.87-4.32,3.4-5.91c7.07-7.35,14.38-14.47,21.55-21.72c1.84-1.86,3.48-3.92,6.4-7.23
-					C79.61,235.25,74.35,229.69,68.55,223.56z"/>
-			</g>
-			<g>
-				<path class="st0" d="M256.05,428.1c7.93,7.53,16.37,15.55,24.7,23.47c-8.21,8.27-16.4,16.51-24.37,24.54
-					c-8.23-7.98-16.67-16.16-25.11-24.34C239.8,443.62,248.21,435.58,256.05,428.1z"/>
-			</g>
-			<g>
-				<path class="st0" d="M254.88,73.27c6.48-5.93,12.68-11.6,18.52-16.94C275.4,65.47,265.2,75.93,254.88,73.27z"/>
-			</g>
-			<g>
-				<path class="st0" d="M238.87,49.47c0.54-7.99,6.12-13.62,15.88-13.57c-4.81,4.98-9.61,9.96-14.42,14.93
-					C239.84,50.38,239.35,49.92,238.87,49.47z"/>
-			</g>
-			<g>
-				<polygon class="st0" points="441.11,403.38 441.22,403.67 441,403.48 				"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_item" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M86.57,379.95c0-48.58,0-96.33,0-143.79c5.64-2.82,112.01-3.19,119.52-0.33c0.25,2.68,0.79,5.83,0.8,8.98
-					c0.07,26.94,0.01,53.88,0.08,80.83c0.01,3.17,0.51,6.33,0.85,10.3c32.36,0,63.92,0,97.01,0c0-33.87,0-66.95,0-99.19
-					c6.41-3.36,112.58-3.86,119.48-1.35c2.55,5.28,2.8,137.43-0.09,144.56C312.19,379.95,199.8,379.95,86.57,379.95z"/>
-			</g>
-			<g>
-				<path class="st0" d="M351.95,96.52c0,37.52,0,74.24,0,111.87c-15.41,0-30.07,0-45.61,0c-0.81-5.04-1.56-9.72-2.59-16.15
-					c-31.78-0.12-63.35-0.24-95.41,0.16c-1.01,5.85-1.81,10.52-2.76,16c-15.49,0-30.54,0-46.27,0c-0.48-3.17-1.18-5.7-1.19-8.24
-					c-0.08-31.43-0.09-62.85-0.03-94.28c0.02-8.73,1.64-10.33,10.48-10.33c58.36-0.05,116.72-0.03,175.09,0.01
-					C346.04,95.56,348.42,96.09,351.95,96.52z"/>
-			</g>
-			<g>
-				<path class="st0" d="M132.51,208.42c-9.52,0-18.03,0-27.47,0c0-37.52,0-74.16,0-111.86c9.22,0,17.87,0,27.47,0
-					C132.51,133.9,132.51,170.54,132.51,208.42z"/>
-			</g>
-			<g>
-				<path class="st0" d="M378.57,96.39c10.31,0,18.82,0,29.12,0c0.27,37.43,0.14,74.07,0.08,111.82c-10.01,0-18.66,0-29.13,0
-					C378.39,170.99,378.51,134.35,378.57,96.39z"/>
-			</g>
-			<g>
-				<path class="st0" d="M107.03,407.31c99.7,0,198.42,0,297.14,0c0.31,0.74,0.62,1.47,0.93,2.21c-3.8,2.18-7.48,4.61-11.44,6.42
-					c-1.72,0.78-4.02,0.36-6.06,0.36c-87.72,0.01-175.44-0.01-263.17,0.06C117.35,416.37,111.13,415.25,107.03,407.31z"/>
-			</g>
-			<g>
-				<path class="st0" d="M280.03,311.38c-16.62,0-31.68,0-47.61,0c0-31.35,0-61.94,0-93.7c15.6-1.68,30.82-0.85,47.53-0.45
-					C280.76,248.97,280.56,279.53,280.03,311.38z M267.36,293.14c0.39-3.77,0.85-6.35,0.89-8.94c0.12-7.13-0.2-14.28,0.21-21.39
-					c0.17-2.85,1.14-6.13,2.88-8.31c8.15-10.27,8.56-19.5,0.67-27.25c-8.45-8.3-21.51-8.87-30.61-1.33
-					c-8.41,6.98-10.24,17.21-3.09,25.35c4.73,5.38,5.6,10.91,5.4,17.36c-0.17,5.7-0.14,11.42,0.05,17.12
-					c0.08,2.32,0.82,4.63,1.34,7.39C252.64,293.14,259.56,293.14,267.36,293.14z"/>
-			</g>
-			<g>
-				<path class="st0" d="M459.64,208.46c-9.05,0-17.17,0-26.05,0c-0.44-3.46-1.09-6.2-1.09-8.93c-0.07-31.16-0.05-62.33-0.04-93.49
-					c0-1.22,0.07-2.44,0.15-3.66c0.3-4.41,2.7-6.57,7.1-6.7c4.5-0.13,6.66,2.09,7.24,6.46c4.34,32.91,8.76,65.81,13.07,98.73
-					C460.3,202.98,459.83,205.2,459.64,208.46z"/>
-			</g>
-			<g>
-				<path class="st0" d="M77.56,97.23c0,36.74,0,73.41,0,111.08c-8.48,0-16.35,0-25.02,0c-0.25-2.71-0.9-5.08-0.6-7.34
-					c4.21-32.52,8.49-65.04,12.9-97.53C65.84,96.02,68.83,94.5,77.56,97.23z"/>
-			</g>
-			<g>
-				<path class="st0" d="M451.71,362.72c0-42.84,0-84.74,0-127.72c3.45-0.21,6.42-0.39,10.08-0.61c0.46,3.5,1.09,6.04,1.1,8.58
-					c0.06,34.46-0.08,68.92,0.12,103.38C463.06,354.24,458.99,358.62,451.71,362.72z"/>
-			</g>
-			<g>
-				<path class="st0" d="M50.26,234.87c2.86,0,5.32,0,7.56,0c2.47,5.02,3.24,118.46,0.9,126.79c-5.37-3.13-9.67-6.58-9.66-13.41
-					c0.02-35.65-0.01-71.31,0.05-106.96C49.12,239.34,49.79,237.4,50.26,234.87z"/>
-			</g>
-			<g>
-				<path class="st0" d="M51.56,390.71c7.99,7.72,15.99,15.44,25.01,24.15c-9.12,2.16-16.82,2.02-24.49,0.42
-					c-1.03-0.21-2.41-2.03-2.45-3.14c-0.23-6.78-0.11-13.57-0.11-20.36C50.2,391.43,50.88,391.07,51.56,390.71z"/>
-			</g>
-			<g>
-				<path class="st0" d="M436.46,413.79c8.05-7.65,16.1-15.3,24.15-22.95c0.61,0.34,1.23,0.69,1.84,1.03
-					c0,6.76,0.19,13.52-0.17,20.26c-0.07,1.29-2.24,3.46-3.53,3.53c-7.16,0.35-14.35,0.17-21.53,0.17
-					C436.96,415.15,436.71,414.47,436.46,413.79z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_fight" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M98.54,121.71c7.19,0.33,14.38,0.67,22.81,1.06c1.18-7.93,2.28-15.34,3.38-22.75
-					c0.65-0.23,1.3-0.46,1.95-0.69c70.17,84.04,140.34,168.07,211.57,253.38c-9.84,8.24-18.85,15.78-28.82,24.13
-					C238.18,291.6,167.84,207.47,97.5,123.34C97.85,122.8,98.2,122.26,98.54,121.71z"/>
-			</g>
-			<g>
-				<path class="st0" d="M74.25,462.04c-10.75-7.58-20.15-14.21-30.69-21.64C87.39,378.65,130.68,317.64,175,255.19
-					c8.95,10.7,16.69,19.95,24.95,29.82C158.02,344.06,116.54,402.48,74.25,462.04z"/>
-			</g>
-			<g>
-				<path class="st0" d="M425.22,103.01c0.37,2.17,1.08,4.12,0.96,6.02c-1.52,23.89-10.41,44.55-26.71,62.21
-					c-17.85,19.34-40.04,31.93-63.81,42.21c-1.98,0.86-4.11,1.36-7.64,2.49c1.24-4.12,1.91-6.97,2.94-9.69
-					c6.52-17.26,11.93-34.75,11.33-53.5c-0.09-2.84-0.01-5.86-0.93-8.47c-2.37-6.7,0.06-11.13,5.24-15.36
-					c8.52-6.96,16.52-14.54,24.94-21.63c1.91-1.61,4.59-3.05,6.99-3.2c14.23-0.85,28.48-1.32,42.72-1.86
-					C422.24,102.2,423.23,102.61,425.22,103.01z"/>
-			</g>
-			<g>
-				<path class="st0" d="M291.85,453.14c-4.87-5.91-8.93-10.84-14.08-17.09c41.71-34.89,82.71-69.18,124.58-104.2
-					c4.79,5.78,8.96,10.8,14.01,16.89C374.53,383.82,333.55,418.17,291.85,453.14z"/>
-			</g>
-			<g>
-				<path class="st0" d="M273.79,115.61c10.76,7.57,20.25,14.24,30.73,21.61c-17.52,24.77-34.23,48.41-51.86,73.34
-					c-8.76-10.27-16.69-19.55-25.21-29.54C242.84,159.29,257.83,138.14,273.79,115.61z"/>
-			</g>
-			<g>
-				<path class="st0" d="M310.02,250.99c3.13-1.7,6.08-3.97,9.41-5.02c21.89-6.92,42.92-15.68,62.36-28.02
-					c29.04-18.43,51.93-42.06,63.17-75.38c4.67-13.85,6.52-28.16,6.18-42.77c-0.05-2.01-0.01-4.02-0.01-6.78
-					c3.9-2.17,7.86-4.37,12.69-7.05c1.31,3.33,2.56,5.61,3.12,8.05c3.1,13.52,1.31,26.78-2.57,39.85
-					c-16.18,54.48-81.45,113.08-140.32,120.1c-4.27,0.51-8.65,0.07-12.98,0.07C310.71,253.03,310.37,252.01,310.02,250.99z"/>
-			</g>
-			<g>
-				<path class="st0" d="M389.79,472.78c-11.28-13.51-21.9-26.23-33.01-39.54c8.13-9.93,17.68-16.81,28.3-24.44
-					c11.08,13.21,21.71,25.89,33.02,39.37C409.83,457.64,400.05,464.37,389.79,472.78z"/>
-			</g>
-			<g>
-				<path class="st0" d="M321.15,118.13c-11.98-8.39-23.18-16.22-35.16-24.61c4.46-12.23,8.63-23.66,13.37-36.67
-					c17.45,12.36,33.25,23.54,50.46,35.73C339.82,101.49,330.87,109.47,321.15,118.13z"/>
-			</g>
-			<g>
-				<path class="st0" d="M98.58,95.77c-7.12-0.81-13.28-1.35-19.35-2.36c-1.23-0.2-2.8-2.02-3.15-3.37
-					c-2.23-8.67-4.18-17.41-6.14-26.14c-0.15-0.68,0.35-1.51,0.74-2.98c1.89,0.47,3.64,0.68,5.2,1.33
-					c6.2,2.59,12.29,5.47,18.53,7.94c4.9,1.94,7.04,5.25,6.33,10.43C100.13,85.01,99.49,89.39,98.58,95.77z"/>
-			</g>
-			<g>
-				<path class="st0" d="M263.6,72.75c-4.58-8.72-9.17-17.44-14.34-27.29c9.64-1.5,17.2,0.6,26.32,3.04
-					c-3.26,8.72-6.26,16.73-9.26,24.75C265.41,73.08,264.5,72.92,263.6,72.75z"/>
-			</g>
-			<g>
-				<path class="st0" d="M328.1,39.22c10.42,7.7,21.69,12.69,29.96,23.17C349.73,64.21,326.41,46.59,328.1,39.22z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_compendium" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M172.73,49.37c21.98,0,43.98,0,66.87,0c0,137.52,0,274.28,0,412.73c-22.56,0.64-44.71,0.55-66.23,0.05
-					C170.22,455.66,169.78,57.56,172.73,49.37z M200.52,429.88c3.18-7.29,2.79-312.57-0.29-318.12c-6.66,0-13.58,0-20.13,0
-					c-3.18,7.31-2.79,312.56,0.29,318.12C187.06,429.88,193.98,429.88,200.52,429.88z M210.72,299.22
-					c-3.15,7.38-2.74,125.16,0.33,130.65c6.67,0,13.59,0,21.35,0c0-43.84,0-86.81,0-130.65
-					C224.64,299.22,217.72,299.22,210.72,299.22z"/>
-			</g>
-			<g>
-				<path class="st0" d="M145.38,142.76c0,85.62,0,170.31,0,256.67c-17.42,1.03-34.25,0.66-51.8,0.12
-					c-0.49-3.88-1.14-6.62-1.14-9.36c-0.05-79.17-0.06-158.34-0.03-237.52c0-9.54,1.47-10.94,11.07-11
-					c11.02-0.07,22.04-0.07,33.06,0.03C139.11,141.74,141.67,142.3,145.38,142.76z"/>
-			</g>
-			<g>
-				<path class="st0" d="M363.52,456.03c-12.7,2.35-23.74,4.39-35.68,6.6c-1.26-4.11-2.57-7.24-3.16-10.5
-					c-10.85-60.07-21.6-120.15-32.38-180.23c-7.75-43.2-15.53-86.4-23.26-129.6c-0.49-2.72-0.59-5.51-1-9.55
-					c12.13-2.2,23.57-4.27,36.31-6.58C324.11,236.33,343.65,345.24,363.52,456.03z"/>
-			</g>
-			<g>
-				<path class="st0" d="M30.77,95.93c12.29,0,23.52,0,35.63,0c0.49,3.12,1.29,5.83,1.29,8.53c0.07,53.47,0.07,106.95,0.02,160.42
-					c0,2.37-0.57,4.75-0.98,8c-11.97,0-23.53,0-35.96,0C30.77,213.88,30.77,155.54,30.77,95.93z"/>
-			</g>
-			<g>
-				<path class="st0" d="M367.58,238.23c7-3.03,12.81-5.54,20.08-8.69c31.66,74.22,62.88,147.39,94.52,221.55
-					c-7.17,3.14-12.98,5.68-20.06,8.77C430.48,385.69,399.26,312.48,367.58,238.23z"/>
-			</g>
-			<g>
-				<path class="st0" d="M65.98,461.62c-11.43,0-22.81,0-35.96,0c-0.23-38.48-0.1-76.1-0.08-114.56c13.02,0,24.42,0,35.56,0
-					C68.27,352.44,68.8,453.4,65.98,461.62z"/>
-			</g>
-			<g>
-				<path class="st0" d="M145.31,461.62c-17.64,0-34.34,0-51.98,0c0-12.22,0-23.59,0-34.65c5.83-2.99,44.82-3.3,51.98-0.36
-					C145.31,437.66,145.31,449.07,145.31,461.62z"/>
-			</g>
-			<g>
-				<path class="st0" d="M66.94,299.04c0,7.68,0,14,0,20c-5.68,3.23-28.48,3.6-36.48,0.32c0-5.15-0.23-10.92,0.17-16.64
-					c0.09-1.3,2.32-3.48,3.61-3.52C44.72,298.91,55.21,299.04,66.94,299.04z"/>
-			</g>
-			<g>
-				<path class="st0" d="M344.77,183.51c1.37-6.24,13.25-11.41,18.86-8.56C361.93,179.91,351.56,184.78,344.77,183.51z"/>
-			</g>
-			<g>
-				<path class="st0" d="M376.69,203.79c-1.47,1.58-2.66,3.99-4.46,4.57c-4.85,1.58-9.26,6.71-16.33,2.77
-					c5.69-6.11,12.27-7.7,18.8-9.41C375.37,202.41,376.03,203.1,376.69,203.79z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_settings" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M167.35,468.66c-13.39-1.77-50.61-24-55.69-33.14c1.08-1.73,2.27-3.8,3.62-5.75
-					c9.08-13.11,15.46-27.19,17.17-43.32c2.08-19.66-8.6-38.21-26.93-45.65c-18.45-7.49-36.8-5.28-55.13,0.52
-					c-2.27,0.72-4.61,1.24-7.95,2.13c-8.74-20.07-13.97-40.42-16.04-62.21c3.72-1,6.27-1.51,8.71-2.36
-					c10.15-3.55,20.93-5.98,30.28-11.03c32.02-17.29,37.2-51.45,11.57-77.58c-7.69-7.84-18.02-13.11-27.21-19.46
-					c-1.8-1.24-3.88-2.08-6.88-3.65c7.46-20.81,19.04-38.63,32.65-56.07c2.6,1.58,4.49,2.63,6.28,3.83
-					c12.84,8.66,26.44,15.16,42.16,16.87c27.62,3.01,49.81-16.05,50.75-43.89c0.44-12.98-0.7-25.69-5.26-37.95
-					c-0.57-1.52-0.94-3.13-1.27-4.72c-0.16-0.77-0.03-1.6-0.03-3.56c19.48-9.06,40.19-13.46,62.14-15.74
-					c1.02,3.75,1.82,6.21,2.34,8.72c3.47,16.64,9.06,32.26,21.51,44.52c15.73,15.49,38.24,17.59,56.71,5.52
-					c12.09-7.9,21.07-18.51,27.72-31.22c1.77-3.4,3.56-6.79,5.82-11.11c21.09,7.8,39.67,18.42,56.8,32.93
-					c-1.64,2.8-2.68,4.95-4.05,6.86C388.21,94.64,382,108.15,380,123.56c-3.04,23.55,11.24,44.26,34.61,49.71
-					c15.81,3.69,31.2,1.62,46.42-3.22c2.48-0.79,5-1.42,8.46-2.39c8.98,19.98,13.9,40.42,16.18,62.37c-3.8,0.94-6.46,1.76-9.18,2.25
-					c-16.65,3.01-31.7,9.36-43.86,21.42c-17.55,17.41-17.87,44.76-1.08,62.94c9.09,9.85,19.19,18.29,31.47,23.91
-					c1.97,0.9,3.73,2.29,6.35,3.94c-7.98,20.35-18.77,38.4-32.84,55.12c-3.06-1.75-5.24-2.79-7.18-4.15
-					c-11.9-8.34-24.87-13.72-39.36-15.81c-25.9-3.73-48.07,12.39-52.41,38.17c-2.51,14.96-0.26,29.24,4.49,43.36
-					c0.89,2.64,1.57,5.34,2.63,8.96c-20.39,9.22-41.13,13.92-63.52,15.93c-1.27-5.66-2.36-10.56-3.47-15.47
-					c-2.68-11.93-7.48-22.97-15.18-32.45c-19.22-23.66-48.23-25.35-70.63-3.31c-8,7.87-13.67,18.12-20.35,27.33
-					C170.02,464.25,168.74,466.5,167.35,468.66z M255.86,400.9c76.17,1.14,145.09-60.6,145.17-144.58
-					c0.07-81.43-64.18-146.3-147.02-145.43c-80.82,0.84-143.17,67.24-143.11,145.2C110.95,336.29,175.57,400.89,255.86,400.9z"/>
-			</g>
-			<g>
-				<path class="st0" d="M255.9,375.07c-66.32-0.01-119.05-52.79-119.18-119.01c-0.12-60.41,46.51-119.03,119.17-119.37
-					c66.88-0.31,119,51.98,119.5,119.66C375.87,322.28,322.28,375.08,255.9,375.07z M256.32,367.82
-					c61.81,0.01,112.28-50.05,111.82-111.65c-0.45-60.76-47.78-111.81-111.76-112.13c-63.11-0.31-112.37,51.07-112.41,112.06
-					C143.95,318.19,193.87,367.82,256.32,367.82z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_journal" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M448.42,92.12c-17.01,7.17-36.38,3.32-52.81,13.34c13.35,7.59,25.04,14.25,36.73,20.9
-					c-0.07,0.7-0.15,1.39-0.22,2.09c-10.32,2.08-20.63,4.16-30.95,6.23c-0.13,0.63-0.27,1.25-0.4,1.88
-					c14.07,8.7,28.14,17.4,42.66,26.38c-0.79,3.42-1.29,6.39-2.17,9.24c-9.51,30.75-25.84,57.54-47.17,81.49
-					c-28.41,31.88-43.98,69.29-47.66,111.76c-0.21,2.39-0.8,4.75-1.37,8.08c-3.69,0.38-7.21,1.06-10.74,1.07
-					c-52.87,0.07-105.74-0.15-158.6,0.15c-23.87,0.13-41.44,11.18-51.15,33.28c-13.04,29.65,8.96,66.89,45.53,62.06
-					c6.73-0.89,13.59-0.76,20.39-1.1c0.18,0.69,0.36,1.39,0.54,2.08c-1.95,1.11-3.78,2.8-5.87,3.23
-					c-13.93,2.87-27.83,6.21-41.92,7.89c-9.63,1.15-19.71,0.93-29.3-0.54c-25.73-3.96-39.5-20.96-46.09-44.94
-					c-7.68-27.98-4.86-55.9,1.11-83.65c2.48-11.54,6.41-22.77,9.52-34.19c1.48-5.44,4.92-7.99,10.38-8.84
-					c14.32-2.22,28.6-4.7,42.88-7.15c2.31-0.4,4.55-1.17,8.35-2.18c-12.43-12.92-23.92-24.85-35.68-37.07
-					c10.82-18.72,21.31-36.6,31.53-54.63c10.13-17.88,18.72-36.44,25.46-57.28c-4.1-0.52-6.79-1.1-9.48-1.17
-					c-19.98-0.48-39.99-0.43-59.95-1.38c-24.37-1.15-41.44-13.86-51.3-35.78c-9.41-20.93-7.08-40.88,7.01-59.34
-					c19.06-24.97,49.5-32.54,79.33-22.79c21.47,7.01,43.03,8.54,65.03,9.07c24.68,0.59,49.38,1.73,74.03,1.02
-					c37.08-1.07,74.08-3.17,111.05-7.28c35.35-3.93,63.98,16.8,71.28,52.84C448.69,88.4,448.42,90.05,448.42,92.12z M159.2,70.78
-					c0-1.99,0.18-2.66-0.04-3.16c-0.48-1.12-1.19-2.13-1.74-3.22c-6.25-12.36-16.75-18.76-29.81-22.21
-					c-18.28-4.83-36.2-6.22-53.53,3.12c-21.82,11.76-31.94,33.41-26.21,55.84c5.97,23.41,24.48,37.29,49.57,37.18
-					c17.77-0.08,24.02-8.04,17.19-24.49c-5.04-12.13-12.63-23.2-19.09-34.74c-1.22-2.18-2.46-4.34-4.73-8.33
-					C114.8,70.78,137.01,70.78,159.2,70.78z M125.86,137.58c1.23,0.84,1.72,1.47,2.22,1.47c10.98,0.11,21.98,0.38,32.94-0.05
-					c1.75-0.07,4.42-3.12,4.9-5.2c3.31-14.42,3.93-28.99,1.39-43.67c-1-5.82-3.9-8.4-9.91-8.3c-12.83,0.22-25.67,0.01-38.51,0.11
-					c-2.02,0.02-4.04,0.76-6.94,1.34C121.1,101.11,132.77,117.32,125.86,137.58z"/>
-			</g>
-			<g>
-				<path class="st0" d="M437.3,403.69c-12.05,6.13-24.1,12.27-36.16,18.4c0.06,0.71,0.11,1.41,0.17,2.12
-					c24.23,2.92,48.45,5.83,72.88,8.77c0.85,2.39,1.74,4.21,2.15,6.14c4.1,19.37-9.24,40.07-28.6,44.05
-					c-5.16,1.06-10.51,1.63-15.78,1.64c-68.14,0.11-136.27,0.08-204.41,0.06c-2.4,0-4.79-0.23-9.27-0.46
-					c10.87-12.42,17.06-25.54,17.43-40.56c0.37-14.77-2.14-29.17-10.26-43.31c3.8-0.56,6.28-1.23,8.77-1.24
-					c60.59-0.06,121.18-0.1,181.76,0.05c7,0.02,13.99,1.22,20.99,1.88C437.07,402.06,437.18,402.88,437.3,403.69z"/>
-			</g>
-			<g>
-				<path class="st0" d="M208.78,442.37c-2.84,0.3-5.59,0.73-8.35,0.86c-11.77,0.56-23.55,0.9-35.32,1.59
-					c-11.74,0.69-20.7-11.09-17.7-23.56c2.84-11.78,14.12-20.41,27.04-20.71C193.39,400.09,213.19,416.86,208.78,442.37z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="icon_x5F_sidebar_x5F_music" class="st1">
-	<g class="st2">
-		<g>
-			<g>
-				<path class="st0" d="M261.65,225.6c0.7,2.64,1.55,5.26,2.07,7.94c1.62,8.25,2.65,8.79,11.01,8.46c15-0.58,29.14,2.2,41.74,11.16
-					c14.6,10.37,19.64,25.5,21.71,42.14c2.78,22.32-10.19,36.76-25.52,49.9c-0.44,0.37-1.09,0.54-1.67,0.69
-					c-0.37,0.09-0.8-0.03-1.59-0.08c-3.15-4.92-2.8-9.59,0.96-14.33c6.14-7.74,11.54-15.89,12.05-26.24
-					c1.24-25.02-14.28-44.09-39.26-47.94c-4.59-0.71-9.31-0.53-15-0.81c0.44,4.72,0.51,7.73,1.03,10.66
-					c8.8,49.42,17.66,98.83,26.47,148.26c1.07,6.03,2.01,12.08,2.81,18.15c1.93,14.59-2.85,26.51-14.6,35.46
-					c-18.51,14.1-39.18,15.5-60.44,8.72c-16.02-5.1-25.76-22.74-22.74-38.34c3.49-18.02,17.24-29.36,35.42-29.2
-					c17.96,0.16,31.41,11.98,34.49,30.27c0.42,2.52,1.01,5.02,1.49,7.33c10.2,0.4,17.08-7.88,15.5-18.5
-					c-3.27-22-6.51-44.01-10.45-65.89c-5.72-31.73-12.04-63.35-18.15-95.01c-0.4-2.07-1.27-4.05-2.29-7.23
-					c-7.24,4.84-12.49,9.93-15.47,17.08c-5.54,13.32-3.63,26.35,1.74,39.25c1.25,3.01,1.98,6.23,2.95,9.35
-					c-0.69,0.48-1.39,0.96-2.08,1.44c-1.98-1.63-4.28-2.98-5.89-4.92c-14.99-18.11-14.14-48.78,1.75-66.18
-					c2.06-2.26,4.06-4.69,6.52-6.45c5.79-4.17,9.56-8.69,8.28-16.73c-0.43-2.71,3.11-6.04,4.83-9.09
-					C260.1,225.14,260.88,225.37,261.65,225.6z"/>
-			</g>
-			<g>
-				<path class="st0" d="M242.98,129.77c-0.54-2.18-1.24-3.66-1.24-5.15c0.06-27.65,5.24-53.97,20.63-77.55
-					c0.78-1.19,1.62-2.36,2.52-3.47c15.38-18.96,34.82-17.62,45.72,4.2c15.14,30.31,13.51,60.55-6.91,87.73
-					c-13.67,18.2-29.81,34.59-45.42,51.26c-18.14,19.38-36.83,38.27-50.39,61.34c-4.74,8.07-9.5,16.33-12.73,25.07
-					c-8.46,22.81-4.26,43.77,11.57,62.22c9.81,11.44,22.06,19.31,36.6,23.44c5.39,1.53,7.9,4.61,6.35,11.29
-					c-2.86,0-5.84,0.44-8.66-0.07c-31-5.57-50.06-25.12-60.87-53.46c-11.63-30.51-8.06-59.85,11.23-86
-					c15.34-20.81,32.18-40.57,49.3-59.97c15.92-18.03,33.27-34.79,49.64-52.44c11.16-12.03,12.87-27,10.85-42.48
-					c-1.06-8.1-5.98-13.73-14.13-16.01c-7.39-2.07-12.75,1.54-17.1,6.79c-2.57,3.1-5.27,6.57-6.35,10.32
-					c-3.64,12.7-7.02,25.51-9.61,38.46C252.62,122.04,249,126,242.98,129.77z"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M211.313 21.094c-51.776 0-98.754 12.252-133.5 32.718C43.066 74.28 19.874 103.78 19.874 137.69c0 33.54 22.692 62.81 56.813 83.25L48.156 327.094l96.97-79.844c20.65 4.58 42.924 7.063 66.186 7.063 51.776 0 98.786-12.252 133.532-32.72 34.746-20.466 57.937-49.997 57.937-83.905s-23.19-63.41-57.936-83.875c-34.746-20.467-81.756-32.72-133.53-32.72zm0 18.687c48.8 0 92.866 11.77 124.03 30.126 31.165 18.357 48.75 42.447 48.75 67.78 0 25.338-17.585 49.457-48.75 67.814-31.164 18.357-75.23 30.125-124.03 30.125S118.445 223.857 87.28 205.5c-31.163-18.357-48.718-42.476-48.718-67.813 0-25.336 17.555-49.424 48.72-67.78C118.445 51.55 162.51 39.78 211.31 39.78zM96.53 89.938v18.688h93.126V89.937H96.53zm111.814 0v18.688h28.094V89.937h-28.094zm46.78 0v18.688h71.97V89.937h-71.97zM96.532 129.844v18.72h29.657v-18.72H96.53zm48.345 0v18.72h65.938v-18.72h-65.938zm84.656 0v18.72h38.095v-18.72H229.53zm56.782 0v18.72h40.782v-18.72h-40.78zM96.532 166.78v18.69h70.874v-18.69H96.53zm89.562 0v18.69h57.03v-18.69h-57.03zm75.72 0-.002 18.69h65.282v-18.69h-65.28zm92.342 90.25c-74.88 0-135.594 41.762-135.594 93.283 0 51.52 60.716 93.28 135.594 93.28 18.23 0 35.623-2.48 51.5-6.968l68.53 51.156-24.873-71.03c24.947-16.918 40.437-40.432 40.437-66.438 0-51.518-60.714-93.28-135.594-93.28zm-70.344 42.345h32.907v18.688H283.81v-18.688zm51.594 0h90.344v18.688h-90.344v-18.688zm-78.97 41.75h78.314v18.688h-78.313v-18.688zm97.002 0h20.968v18.688h-20.97l.002-18.688zm39.656 0h51v18.688h-51v-18.688zm-109.28 39h79.06v18.688h-79.062v-18.688zm97.748 0h44.188v18.688h-44.188v-18.688z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/icon_sidebar_macros.svg
+++ b/assets/ui/icon_sidebar_macros.svg
@@ -0,0 +1,54 @@
+<?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 640 640"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="icon_sidebar_macros.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2666"
+     inkscape:window-height="1514"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.6241359"
+     inkscape:cx="170.14667"
+     inkscape:cy="292.89075"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4"
+     units="in" />
+  <path
+     d="m 378.25,116.16 c -13.6,-3.92 -27.76,4 -31.68,17.6 l -102.4,358.4 c -3.92,13.6 4,27.76 17.6,31.68 13.6,3.92 27.76,-4 31.68,-17.6 l 102.4,-358.4 c 3.92,-13.6 -4,-27.76 -17.6,-31.68 z m 51.68,108.88 c -10,10 -10,26.24 0,36.24 l 58.72,58.72 -58.72,58.72 c -10,10 -10,26.24 0,36.24 10,10 26.24,10 36.24,0 l 76.8,-76.8 c 10,-10 10,-26.24 0,-36.24 l -76.8,-76.8 c -10,-10 -26.24,-10 -36.24,0 z m -219.76,0 c -10,-10 -26.24,-10 -36.24,0 l -76.8,76.8 c -10,10 -10,26.24 0,36.24 l 76.8,76.8 c 10,10 26.24,10 36.24,0 10,-10 10,-26.24 0,-36.24 L 151.45,320 210.09,261.28 c 10,-10 10,-26.24 0,-36.24 z"
+     id="path2"
+     style="fill:#ffffff;stroke-width:0.8" />
+</svg>
--- a/assets/ui/maladresse.svg
+++ b/assets/ui/maladresse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M221.313 16a23.682 23.695 0 0 0-23.688 23.688v106.406a23.682 23.695 0 0 0 2.156 9.72 23.682 23.695 0 0 0 3.157 13.81l41.75 71.626-79 55.438 6.094-48.625a23.682 23.695 0 0 0-8.186-20.97l-66.28-81.937a23.682 23.695 0 0 0-33.314-3.5l-9.188 7.438a23.682 23.695 0 0 0-3.53 33.344l59.78 73.906-11.25 89.937a23.682 23.695 0 0 0 12.47 23.876l37.468 53.47a23.695 23.682 1.57 0 0 2.344 2.812 23.682 23.695 0 0 0 13.594 20.062L262 491.53a23.682 23.695 0 0 0 9.97 2.22 23.682 23.695 0 0 0 23.53-2.063l87.156-60.937a23.682 23.695 0 0 0 5.844-33l-6.78-9.688a23.682 23.695 0 0 0-32.97-5.875l-72.406 50.657-59.063-27.625 120.595-84.626a23.695 23.682 1.57 0 0 5.53-5.5 23.682 23.695 0 0 0 14.626-13.594l37.22-91.53 87.813-44.845a23.694 23.682 1.18 0 0 10.312-31.875L488 122.687a23.694 23.682 1.18 0 0-31.875-10.343l-94.688 48.375a23.694 23.682 1.18 0 0-9.843 9.436 23.682 23.695 0 0 0-8.344 10.47l-27.375 67.31-5.22-7.436a23.682 23.695 0 0 0-3-8.844l-50.81-87.094V39.688A23.682 23.695 0 0 0 233.154 16h-11.843zM77.75 376A59.994 60 0 0 0 16 436a59.994 60 0 1 0 120 0 59.994 60 0 0 0-58.25-60z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/ui/part-finesse.svg
+++ b/assets/ui/part-finesse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M45.95 14.553c-19.38.81-30.594 11.357-30.282 30.283l19.768 30.78c4.43-1.213 9.36-3.838 14.248-7.335l42.474 59.935c-17.018 20.83-31.258 44.44-42.71 70.836l26.55 26.552c11.275-23.6 24.634-44.826 39.918-63.864l210.82 297.475 166.807 33.213L460.33 325.62 162.78 114.745c19.907-16.108 41.842-29.91 65.652-41.578l-26.553-26.55c-27.206 11.803-51.442 26.576-72.735 44.292L69.39 48.56c3.443-4.823 6.062-9.735 7.342-14.242l-30.78-19.765zm400.84 86.933v.008l.003-.008h-.002zm0 .008-28.028 124.97-25.116-80.593-18.105 70.667-26.862-49.64-.584 57.818 128.484 91.69 15.184 87.017-1.168-186.885-34.457 39.713-9.346-154.756zm-300.95 27.98 222.224 196.368 25.645 66.75-66.75-25.645L130.6 144.734a308.453 308.453 0 0 1 15.238-15.26zm32.305 196.274v.004h.005l-.005-.004zm.005.004 28.028 22.775-36.21 4.088 57.82 19.272-105.706 4.09 115.05 27.45L136.1 422.114l127.316 25.696-67.164 43.803 208.494 1.752-87.017-15.185-104.54-150.676-35.037-1.752z" fill="#fff" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/part-force.svg
+++ b/assets/ui/part-force.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M227.227 21.777c-1.845 0-3.704.05-5.567.157-15.314.875-30.76 5.305-39.494 10.863l-.008 73.15c2.884-.094 5.777-.147 8.676-.142 23.382.036 47.104 3.286 68.47 9.513l.01-87.507c-7.034-3.518-19.178-6.03-32.087-6.033zm80.74 9.16c-11.925.15-23.077 2.364-29.967 5.596l-.008 77.602v7.658c38.486 15.67 64.814 42.48 58.735 78.764l-.96 5.73-5.562 1.674c-17.45 5.253-34.872 9.703-52.225 13.335v25.234c25.562-.704 51.327-2.687 77.145-6.098l.02-197.928c-8.284-5.563-23.508-10.243-38.842-11.328a100.065 100.065 0 0 0-8.336-.238zM143.223 46.294a99.206 99.206 0 0 0-16.491 1.172c-15.67 2.454-31.477 8.565-40.406 15.402l-.01 72.955c18.808-15.81 46.704-25.143 77.15-28.54l.007-57.966c-4.82-1.752-12.018-2.916-20.25-3.023zm258.394 3.46c-10.804.117-20.722 1.93-27.043 4.655l-.02 183.182c25.074-4.02 50.16-9.412 75.122-16.358l1.99-158.447c-8.352-5.9-23.648-11.025-39.05-12.553a100.98 100.98 0 0 0-11-.478zm-222.775 74.202c-53.72.702-101.407 20.365-97.887 66.6 15.836-3.918 30.84-5.893 44.94-6.1 34.84-.51 64.213 9.704 87.318 27.613 34.608-3.11 69.852-10 105.412-20.314.14-41.287-74.098-68.657-139.783-67.8zm-48.877 78.65c-1.296-.003-2.603.012-3.92.045-17.256.436-36.45 4.03-57.566 11.037 5.79 53.808 26.325 106.41 58.5 143.346 6.226 7.15 12.856 13.712 19.875 19.615 29.303 9.282 69.26 12.917 110.534 12.14 3.777-55.805-8.717-108.357-36.193-142.74-21.265-26.61-51.064-43.39-91.232-43.444zm129.326 22.282a545.177 545.177 0 0 1-27.995 4.15 138.77 138.77 0 0 1 4.502 5.346c3.146 3.937 6.094 8.062 8.873 12.334 9.916.144 19.868.125 29.857-.106H259.29v-21.723zm191.817 15.343c-65.406 17.826-131.462 25.41-195.85 25.315 16.998 35.144 23.828 78.093 21.013 122.6 42.482-2.08 85.03-8.23 118.187-15.983 26.693-32.78 47.37-77.118 56.65-131.932zM400.51 389.9c-38.334 9.145-87.95 16.056-136.873 17.454-47.67 1.36-94.336-2.228-129.448-15.262l-.01 78.93c27.187 12.568 76.414 20.205 127.318 20.298 51.224.094 104.214-7.173 139-20.773l.012-80.647z" fill="#fff" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/part-rapidite.svg
+++ b/assets/ui/part-rapidite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M275.03 20c35.223 49.563 53.59 113.64 55.69 173.47C315.154 143 289.092 88.423 250.81 48.75c40.294 79.527 51.15 172.312 37.938 256.094-12.287-75.777-40.564-159.524-92.375-227.156 29.6 70.937 36.64 149.785 24.813 221.843-8.745-51.804-25.41-107.4-52.594-158.81 13.023 54.315 12.854 107.64 3.437 159.28l21.657 6.813 15 4.718-11.28 10.908c-10.68 10.332-19.868 21.905-27.345 34.343 93.614 35.486 232.952 64.53 298.032 41.376-41.02 56.466-210.332 13.822-309.313-18.687-1.514 3.775-2.918 7.594-4.124 11.467a152.536 152.536 0 0 0-6.062 29.657l176.47 66.375c98.5 31.095 150.5-24.62 158.655-81.72C505.253 254.472 485.016 105.66 426.06 20h-22.187c40.092 65.52 66.67 154.216 60.47 255.344-8.154-79.833-42.8-157.214-98.44-219.5 38.676 85.094 56.566 185.746 34.376 288.625.057-118.816-33.1-225.865-105.092-324.47H275.03zm-110.186 1.594c41.255 29.176 74.328 74.093 97.5 120.656-7.702-46.15-21.3-86.79-44-120.656h-53.5zm176.375 0c28.882 15.143 52.096 36.614 71.28 66.78-7.14-27.79-17.217-49.85-31.438-66.78H341.22zM123.686 304.406a179.344 179.344 0 0 1-4.062 64L18.812 336.344V366l91.938 29.094a178.602 178.602 0 0 1-30.313 48.28l50.094 15.75c-3.038-24.898-1.136-49.885 6.282-73.718 7.446-23.92 20.223-46.108 37.032-65.22l-50.156-15.78z" fill="#fff" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/players-border.webp
+++ b/assets/ui/players-border.webp
--- a/assets/ui/recul.svg
+++ b/assets/ui/recul.svg
@@ -0,0 +1,66 @@
+<?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 433.39499 347.36221"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="recul.svg"
+   width="433.39499"
+   height="347.36221"
+   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" />
+        <dc:title></dc:title>
+      </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="1053"
+     inkscape:window-height="498"
+     id="namedview8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4355469"
+     inkscape:cx="216.6975"
+     inkscape:cy="201.682"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <g
+     class=""
+     transform="translate(-39.3025,-82.318)"
+     id="g4">
+    <path
+       d="M 274.663,63.02 90.792,80.26 244.985,99.533 c 5.063,-13.339 12.952,-24.341 22.541,-31.828 a 52.072,52.072 0 0 1 7.137,-4.683 z m 19.832,12.803 c -5.092,0.166 -10.492,2.296 -15.879,6.502 -7.835,6.118 -15.009,16.575 -18.83,29.688 -3.821,13.112 -3.477,26.099 -0.289,35.927 3.188,9.829 8.73,16.071 15.633,18.395 6.903,2.324 14.766,0.596 22.601,-5.522 7.835,-6.117 15.01,-16.574 18.83,-29.687 3.822,-13.113 3.48,-26.1 0.292,-35.928 -3.189,-9.828 -8.73,-16.07 -15.633,-18.394 a 19.017,19.017 0 0 0 -6.725,-0.98 z m 166.85,9.485 c -24.113,13.949 -46.193,20.298 -87.233,17.252 L 340.48,228.452 c -0.675,2.682 -0.318,6 1.922,10.87 2.243,4.876 6.355,10.89 11.836,17.607 9.99,12.242 24.527,27.16 39.573,44.238 14.56,-5.5 28.23,-12.828 38.972,-20.19 11.841,-8.113 20.234,-16.95 21.965,-19.939 l 42.027,-118.22 c -16.748,-14.613 -29.471,-33.974 -35.43,-57.51 z m -288.07,51.261 -149.623,21.762 89.309,12.988 2.158,-5.052 z m 286.265,2.325 16.941,6.078 -39.123,109.037 -37.212,19.181 -8.247,-15.998 30.913,-15.933 z m -259.842,4.394 -70.586,36.043 -29.222,68.422 19.218,8.809 24.905,-57.764 59.299,-22.973 -14.702,75.955 -0.963,1.477 c -32.725,50.18 -71.654,93.41 -118.464,134.28 l -26.461,45.443 17.021,7.245 31.875,-43.989 1.38,-0.906 c 45.476,-29.872 75.93,-62.333 112.255,-94.492 l 4.533,-4.012 5.426,2.686 c 23.365,11.571 42.934,24.117 62.107,37.705 l 8.924,6.324 -69.006,65.643 24.649,39.794 17.67,-10.308 -20.078,-28.477 8.224,-5.004 c 29.884,-18.186 49.986,-39.43 71.938,-66.039 -23.653,-35.6 -42.006,-49.433 -71.592,-71.267 l 9.908,-7.227 c 34.703,-25.312 38.132,-54.476 41.61,-79.449 -9.203,4.441 -19.498,5.772 -29.473,2.414 -13.488,-4.54 -22.924,-16.472 -27.465,-30.473 -0.17,-0.522 -0.321,-1.054 -0.479,-1.584 z m 116.62,45.04 c -1.355,7.027 -3.324,14.17 -6.092,21.349 l 14.056,9.666 5.938,-22.223 z m -174.243,97.476 -126.85,17.953 99.67,14.105 a 598.987,598.987 0 0 0 27.18,-32.058 z m 91.781,82.73 -95.892,21.432 59.406,13.277 z"
+       fill="#ffffff"
+       fill-opacity="1"
+       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
+       id="path2" />
+  </g>
+</svg>
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,140 @@
 # 13.0
+## 13.0.14 - Le familier d'Illysis
+
+- Les réussites particulières en demi-surprise sont de simples réussites
+- Les images des scènes par défaut sont corrigées
+- Ajout d'une image de status "sur-encombré"
+- Correction V13
+  - couleur lisible dans les sommaires des journaux et des compendiums
+- Amélioration des entités:
+  - l'attaquant ne sait plus que c'est une entité de cauchemar (surprise!)
+  - l'encaissement indique une blessure dans le tchat... même si ce n'est que de l'endurance
+  - les blurettes suivent les règles des entités de cauchemar (p322)
+- Nouvelle fenêtre de jets de dés
+  - attaque/défense des créatures
+  - les attaques/parades avec une arme trop lourde se font en demi-surprise
+  - les demandes de défense disparaîssent une fois prises en compte
+  - empoignade
+    - l'empoignade est possible avec une initiative d'empoignade, ou en cours d'empoignade
+    - seule la dague, le pugilat et la dague sont possibles en cours d'empoignade
+    - jet de Dextérité/Dague pour utiliser la dague en cours d'empoignade (p136)
+    - attaquer avec une arme un empoigneur donne un +4 si pas d'empoignade (p134)
+    - la différence de taille donne un bonus/malus en cours d'empoignade (p135)
+    - les dommages de l'empoignade ajoutent/enlèvent un point d'empoignade
+    - le statut d'empoignade est affiché sur les tokens
+    - les défenses contre une empoignade sont corrigées
+
+## 13.0.13 - L'épanouissement d'Illysis
+
+- Fix d'erreur au chargement de templates RollDialog
+- Nouvelle fenêtre de jets de dés
+  - Fix: affichage des points de tâche
+  - Fix: affichage des ajustements cohérent
+  - L'ouverture depuis les caractéristiques permet plusieurs types de jets
+  - On peut créer ou modifier les tâches dans la fenêtre de jets de tâches
+  - attaque/défense
+    - les maladresses sont affichées dans le résultat du jet
+    - le message au défenseur s'affiche correctement
+    - la difficulté d'attaque s'applique à la défense
+    - on peut choisir les particulières en rapidité
+
+## 13.0.12 - La méditation d'Illysis
+
+- les signes draconiques éphémères de 1 round sont supprimés à la descente des TMRs
+- Générateur de description
+  - correction des termes pour les couleurs des yeux/cheveux
+  - ajout de boutons pour forcer le sexe masculin/féminin
+- Nouvelle fenêtre de jets de dés
+  - les méditations proposent un bouton pour monter dans les TMRs
+  - fenêtre de lancer de sorts
+  - Correction: les compétences de jeux ne remplacent plus les compétences en dehors des jets de jeu
+  - gestion des maladresses d'attaque et défense
+
+## 13.0.11 - Le gambit d'Illysis
+
+- Nouvelle fenêtre de jets de dés
+  - jeux
+  - cuisine et préparation de nourriture
+
+## 13.0.10 - Les papilles d'Illysis
+
+- Ajout d'un statut "saignement" en cas de blessure grave ou critique sans premiers soins
+
+- Nouvelle fenêtre de jets de dés
+  - jets de méditation
+  - jets de tâches
+  - jets de caractéristiques
+  - jets de compétences
+  - Boutons d'initiative et d'attaque V2
+  - fenêtre d'attaque
+    - choix des armes
+    - gestion des particulières
+    - message au défenseur
+    - gestion des demi-surprises (attaquant/défenseur)
+    - gestion des tactiques (attaquant/défenseur)
+  - en cours nouvelle fenêtre de jets
+    - jets de compétence avec messages
+    - jets de cuisine séparés avec messages (pour gérer plus tard les spécificités: fabricatioon de plats)
+    - gestion des empoignades
+
+- Technique: suppression de warnings foundry sur renderTemplate
+
+## 13.0.9 - Le combat d'Illysis
+- Fix
+  - La montée en TMR fonctionne
+- ajout d'un status "Force insuffisante"
+- clarification des maladresses à l'attaque (en demi surprise, ou à cause d'un échec total)
+- Nouvelle fenêtre de jets de dés
+  - ajout du statut "Force insuffisante" aux acteurs si la 
+    force est insuffisante pour l'arme
+  - avancement du mode attaque
+    - choix de tactique
+    - choix mortel/non-mortel pour les dommages
+    - affichage des dommages ajustés delon les choix
+    - affichage du statut de surprise de l'attaquant
+    - affichage du statut de surprise du défenseur
+    - prise en compte des significatives (demi-surprises)
+  - avancement du mode défense
+    - sélection esquive/parade
+    - affichage du statut de surprise du défenseur
+    - prise en compte des significatives (demi-surprises, armes disparates,
+      particulière en finesse)
+    - gestion de l'appel à la chance
+    - gestion de l'utilisation de la destinée
+    - gestion du recul depuis le messages
+    - gestion de l'encaissement depuis le messages
+  - impossible de faire un jet "actif" en surprise totale (attaque, parade, ...)
+
+## 13.0.8 - Le renouveau d'Illysis
+
+- Fix Foundry V13
+  - Les états sont de nouveau affichés en ligne dans la feuille de personnage
+  - les icones spécifiques Rêve de Dragon de la barre de droite sont de nouveau utilisées
+
+- Nouvelle fenêtre de jets de dés
+  - uniquement pour les oeuvres (chant, danse, musique, cuisine,...)
+  - à activer dans les options avancées
+
+## 13.0.7 - Sous le signe d'Illysis
+
+- Fix Foundry V13
+  - les tooltips des ajustements sont correctement visible
+  - correction des affichages des signes d'heures dans la fenêtre d'astrologie
+
+- en cas d'appel au moral lorsqu'une double significative est requise,
+  le moral est perdu si la réussite est insuffisante
+- transformation du niveau des musiques/danses/chants/recettes de cuisine en valeur numérique
+- les effets draconiques sur une case inconnue (A0) ne causent plus de problèmes dans les TMRs
+
+## 13.0.6 - Le bandage d'Illysis
+
+- Les soins sont de nouveau disponibles depuis les tokens
+- Correction des boutons de la feuille simplifiée
+- On peut de nouveau acheter dans les commerces
+
+## 13.0.5
+
+- Export CSV/Scriptarium à nouveau disponible dans les menus d'acteurs

 ## 13.0.4 - Le long discours d'Illysis

@@ -26,17 +162,21 @@
 - Migration vers la version 13 de Foundry

 # 12.0
+
 ## 12.0.50 - Le sommeil d'Astrobazzarh
+
 - Le don de double rêve n'interrompt plus le sommeil toutes les heures
 - la perte de fatigue à la descente des TMR est visible immédiatement

 ## 12.0.49 - La deuxième lame d'Astrobazzarh
+
 - Corrections
  - les défenses particulières sont correctement affichées
  - les vieux boucliers (sans catégorie de parade car créés il y a longtemps) peuvent parer...
  - Les attaques à distance n'ont pas de difficulté libre

 ## 12.0.48 - La chèvre d'Astrobazzarh
+
 - le Bandersnatch a une protection de 10
 - la consistance chèvre est maintenant possible dans les recettes
  alchimiques (et toutes les consistances avec accents)
@@ -45,10 +185,12 @@
 - Correction: les réussites particulières fonctionnent avec les caractéristiques dérivées

 ## 12.0.47
+
 - Correction sur les mise à jour en cascade -
 - Correction sur le force rendering après un changement de competence

 ## 12.0.46 - Le double demi d'Astrobazzarh
+
 - correction des raffraîchissement lors du sommeil qui empêchait de dormir
  plusieurs heures
 - Si la fatigue n'est pas utilisée, les rounds dans les TMR font perdre de l'endurance (au lieu d'en gagner)
@@ -75,18 +217,22 @@
 - Correction des jets `@roll[vue/-2]` qui tentaient de chercher une compétence -2 (à cause des armes à 1/2 mains)

 ## 12.0.41 - La loupe d'Astrobazzarh
+
 - On peut de nouveau effectuer des tirages cachés
 - Le stress transformé est bien diminué lorsqu'on met le stress dans une compétence

 ## 12.0.40 - Les mains d'Astrobazzarh
+
 - correction des attaques particulières en combat
 - correction de message sur les min/max liés aux modificateurs de races (s'applique uniquement sur la taille)

 ## 12.0.39 - Les mains d'Astrobazzarh
+
 - les armes à 1 ou 2 mains fonctionnent dans les liens de jets de dés
 - commande `/jet` pour poster une demande de jet de dés

 ## 12.0.38 - Les prévisions d'Astrobazzarh
+
 - Correction de modifications de personnages qui ne s'affichaient pas:
  - changements d'endurance/vie/fatigue, transformé, ...
 - Migration des compétences "Ecriture" en "Écriture" dans les tâches, livres, oeuvres et méditations
@@ -96,12 +242,14 @@
  - utilisation de l'extension hbs pour tous les fichiers handlebars

 ## 12.0.37 - Les enchantements d'Astrobazzarh
+
 - les potions ont un état, seules les potions liquides sont enchantables
 - les lancements de sorts du jour sont conservés jusqu'à chateau dormant
 - lorsqu'un joueur souhaite enchanter une potion, les sorts d'enchantements/purification/permanence doivent avoir été lancés auparavant
 - on peut enchanter des gemmes exactement comme des potions

 ## 12.0.36 - L'alchimie d'Astrobazzarh
+
 - Nouveautés
  - ajout d'un bouton pour enchanter les potions
  - standardisation des boutons d'actions sur les items
@@ -116,9 +264,11 @@
  - Corrections de descriptions pour proposer les jet de dés

 ## 12.0.35 - La Solution d'Astrobazzarh
+
 - Fix problème d'initialisation des feuilles d'items

 ## 12.0.34 - la tête d'Astrobazzarh
+
 - support de liens "jets de dés"
  - on peut ajouter des liens "jet de dés" dans les journaux, descriptions, notes, maladresses, ...
  - avec la syntaxe `@roll[...]` on peut ajouter le lien vers:
@@ -133,28 +283,35 @@
 - gestion des blocs secrets dans les descriptions

 ## 12.0.33 - la vieillesse d'Astrobazzarh
+
 - retour de l'expérience pour les joueurs
 - suppression du message "Pas de caractéristique" sur les jets d'odorat-goût

 ## 12.0.32 - les rêveries d'Astrobazzarh
+
 - Ajout des Items Race pour gérer les ajustements liés aux races

 ## 12.0.31 - le mausolée d'Astrobazzarh
+
 - Correction: les automatisation de combat jouer-MJ fonctionnentde nouveau

 ## 12.0.30 - le cauchemar d'Astrobazzarh
+
 - calcul automatique du niveau des entités selon leur rêve
 - la description des créatures venimeuses contient un lien vers leur venin
 - Correction: les messages de combats ne marchaient plus (Changement combiné Foundry + rêve de Dragon)

 ## 12.0.29 - L'indexation d'Astrobazzarh
+
 - les liens dans la descriptions des sorts pointent vers les sorts du compendium
 - la description du chrasme contient le lien vers son venin plutôt qu'un tableau

 ## 12.0.28 - Les réserves d'Astrobazzarh
+
 - possibilité de mettre en réserve depuis un sort connu

 ## 12.0.27 - Les vêtements d'Astrobazzarh
+
 - Ajout de la liste des armures dans l'onglet caractéristiques
 - Ajout d'une option pour choisir une carte des TMR alternatives
 - Le Gardien peut créer des sorts en réserve parmi les sorts d'un personnage
@@ -175,12 +332,14 @@
  - les modèles de personnages non joueurs sont non-liés par défaut

 ## 12.0.26 - Astrobazzarh le Haut-rêvant
+
 - bouton pour le don de haut-rêve en un clic
 - les compétences de draconic ne sont plus précédées de "Voie de"
  - migration des compétences & compendiums
 - Correction feuille simplifiée qui ne s'affichait pas en cas de sort variable

 ## 12.0.24 - Les ajustements d'Astrobazzarh
+
 - amélioration
  - meilleure gestion des noms des voies de draconic
  - affichage du détail des sorts avec le nom de voie, 'court', la difficulté, le coût
@@ -190,6 +349,7 @@
  - on peut maintenant saisir et supprimer les bonus de cases de manière intuitive

 ## 12.0.23 - La bibliothèque d'Astrobazzarh
+
 - corrections mineures
  - meilleure gestion de la parade des armes naturelles
  - cas de "User lacks permission to update" pour les blessures et les StatusEffects
@@ -205,19 +365,23 @@
  - dans les compendiums, les compétences Écriture et Épée ont une majuscule accentuée. Les Épée dans le compendium d'équipements référence le nom de compétence accentué.

 ## 12.0.21 - La nomination d'Astrobazzarh
+
 - Les noms pour les messages dans le tchat sont maintenant ceux des tokens plutôt que ceux des acteurs
 - Fix: le choix des effets dans les options s'affiche correctement

 ## 12.0.20 - Le tableau d'Astrobazzarh
+
 - Ecran d'accueil officiel Scriptarium

 ## 12.0.19 - La témérité d'Astrobazzarh
+
 - Fix
  - les défenses des créatures sont correctement filtrées
  - le lancer d'initiative pour tous les personnages/PNJs fonctionne correctement
  - les lieux et commerces n'ont pas d'initiative

 ## 12.0.18 - A la barbe d'Astrobazzarh
+
 - Améliorations sur la feuille de PNJ simplifiée
  - Ajout du portrait
  - Ajout du corps à corps
@@ -234,11 +398,13 @@
 - Ajout d'un indicateur pour les armes de parade nécessitant une significative

 ## 12.0.16 - Le secret d'Astrobazzarh
+
 - Fix: les jets envoyés messages uniquement au MJ ne sont plus envoyés à tous les autres joueurs (et dupliqués)
 - Les noms affichés dans les automatisations de combat sont maintenant ceux des tokens plutôt que ceux des acteurs
 - Ajout d'une option pour la localisation des blessures

 ## 12.0.15 - Le messager d'Astrobazzarh
+
 - Correction des faces de dés personalisés dice-so-nice
 - Les messages de maladies ne sont plus publics
 - Les messages privés dans les TMR sont aussi envoyés au GM
@@ -246,6 +412,7 @@
 - Amélioration du rendu des tables de compendiums (commande /table)

 ## 12.0.14 - Les légions d'Astrobazzarh
+
 - Feuille de PNJ:
  - boutons standard (encaissement, ...)
  - boutons pour ajuster les compteurs
@@ -254,15 +421,18 @@
  - gestion des armes

 ## 12.0.13 - La Chance d'Astrobazzarh
+
 - Fix: jets de caractéristiques

 ## 12.0.12 - L'étalage d'Astrobazzarh
+
 - Fix: On peut de nouveau vendre des items sans propriétaire, depuis les compendiums ou depuis l'onglet des Objets
 - Début de Feuille PNJ au format des encarts Scriptarium
  - support des jets de caractéristiques
  - support des jets de compétences

 ## 12.0.11 - Le scriptorium d'Astrobazzarh
+
 - ajout d'un bouton pour générer les éléments de description d'un personnage
 - ajout du logo en background dans la liste des systèmes Foundry
 - ajout d'un champ pour le métier
@@ -271,10 +441,12 @@
  - export de l'esquive avec armure et sans armure

 ## 12.0.9 - 12.0.10 - Le scriptorium d'Astrobazzarh
+
 - corrections de l'export scriptarium
 - ajout d'une fonction avancée pour un exporter "scriptarium" des personnages

 ## 12.0.8 - La quincaillerie d'Astrobazzarh
+
 - le propriétaire est indiqué dans les feuilles d'équipements/compétences/...
 - Ecaille d'efficacité
  - l'écaille d'efficacité est prise en compte même si on n'utilise pas le ciblage en combat
@@ -284,6 +456,7 @@
  - le tooltip de l'initiative affiche correctement l'initiative

 ## 12.0.7 - La propriété d'Astrobazzarh
+
 - correction des opérations faites à la création d'un Item:
  - la durée des queues/rencontres/souffles
  - les effets draconiques d'un souffle/queue
@@ -298,6 +471,7 @@
 - la commande /voyage affiche maintenant les compétences liées au terrain

 ## 12.0.6 - Le bazar d'Astrobazzarh
+
 - Corrections de l'inventaire en bazar:
  - un problème pouvait survenir en déplaçant les objets
    l'inventaire, qui fait qu'un conteneur se retrouve récursivement dans son
@@ -312,22 +486,26 @@
 - Fix: restaurer la compatibilité Foundry 11

 ## 12.0.5 - Les mauvais jours d'Astrobazzarh
+
 - Fix: on peut de nouveau ouvrir l'édition de calendrier
 - Fix: on ne peut plus ouvrir plusieurs fenêtres de lancer de sort
 - Fix: Failed to execute 'getComputedStyle' on 'Window'

 ## 12.0.4 - La plaie d'Astrobazzarh
+
 - **Support V12**
  - Fix: les boutons d'encaissement dans le tchat fonctionnent de nouveau
  - Fix warnings sur "Die" et AudioHelper

 ## 12.0.3 - L'hémorragie d'Astrobazzarh
+
 - **Support V12**
  - On peut de nouveau ouvrir un acteur blessé après redémarrage du monde
  - On peut de nouveau ouvrir les Items avec une rareté par environnement
  - Le choix de ne plus afficher les demandes de suppression est bien pris en compte

 ## 12.0.2 - Les pluies d'Astrobazzarh
+
 - **Support V12**
  - correction des actions techniques déleguées au MJ qui bloquaient les fenêtre de lancer de dés des joueurs (et plein d'autres)
  - la fenêtre de calendrier s'ouvre correctement
@@ -342,13 +520,16 @@
  - correction d'erreurs intempestives 'User ... lacks permission to update ...'

 # 11.2
+
 ## 11.2.21 - Le questionnement d'Akarlikarlikar
+
 - Une confirmation spécifique est demandée pour monter dans les terres médianes en cas de rencontre en attente
 - L'expérience en caractéristique sur les jets de chance et rêve actuels est mise dans la caractéristique correspondante
 - Les effets s'appliquent correctement sur les créatures
 - La date et l'heure (draconiques) sont affichées dans les messages du tchat

 ## 11.2.20 - Le soulagement d'Akarlikarlikar
+
 - L'option "ajout de la difficulté d'attaque à l'encaissement" est affichée comme un modificateur d'encaissement
 - Les options d'encaissement alternatives fonctionnent avec la validation de l'encaissement par le gardien
 - La fenêtre d'astrologie du gardien affiche toutes les heures lues par un personnage
@@ -358,12 +539,15 @@
 - Les messages de récupération de rêve en cas de Rêve de Dragon sont clarifiés

 ## 11.2.19 - Les hémorroïdes d'Akarlikarlikar
+
 - La validation des jets d'encaissement par le Gardien fonctionne de nouveau

 ## 11.2.18 - Le bourrichon d'Akarlikarlikar
+
 - Les différentes listes de la feuille de personnage ont maintenant le bouton pour envoyer dans le tchat

 ## 11.2.17 - Le cache-oeil d'Akarlikarlikar
+
 - Le titre des fenêtre d'objet affiche de nouveau le type traduit
 - Les tooltips des boutons edit/delete sont maintenant en Français
 - La case à cocher "Cacher les points de tâches" fonctionne de nouveau
@@ -372,35 +556,43 @@
 - La fenêtre des TMRs ne devrait plus afficher une zone noire au lieu de la carte.

 ## 11.2.16 - Le Tri d'Akarlikarlikar
+
 - Tri alphabétique des items dans la fenêtre de création
 - Mise à jour comptage de monde

 ## 11.2.15 - La Table d'Akarlikarlikar
+
 - Tirage automatique de la foce d'une rencontre (via la commande /tmrr)
 - Ajout de boutons pour ajouter des blessures "complètes" (ie avec perte d'endurance/vie)

 ## 11.2.14 - Les petits pas d'Akarlikarlikar
+
 - Correction sur la gestion de la surprise
 - Ordre des messages sur les cases humides

 ## 11.2.13 - Les cent pas d'Akarlikarlikar
+
 - Ajout de la commande /voyage pour gérer la fatigue de marche des voyageurs

 ## 11.2.12 - Le somnifère  d'Akarlikarlikar
+
 - Fix: les potions enchantées n'empêchent plus de finir correctement Château Dormant

 ## 11.2.11 - Le miroir d'Akarlikarlikar
+
 - Changement des images de compétence de créatures morsure/pinces pour être dans le thème
 - Suppression de la bordure autour des portraits d'acteurs, remplacés par un légèr éclaircissement du fond
 - Fix: le refoulement ajoute correctement un souffle et revient à 0 en cas d'échec

 ## 11.2.10 - Les expériences d'Akarlikarlikar
+
 - En cas d'expérience des caractéristiques dérivées,
  - si plusieurs caractéristiques pourraient recevoir l'expérience, une fenêtre demande au joueur
  - si une seule caractéristique peut recevoir de l'expérience, c'est attribué automatiquement
 - Si la force est au maximum pour la taille personnage, on ne peut plus gagner d'expérience

 ## 11.2.9 - La barbe d'Akarlikarlikar
+
 - Amélioration des textes de tooltips
 - Les tooltips sont plus dans le thème de couleur du système Rêve de Dragon
 - Ajouts d'icones pour les attaque/initiative/soins dans les raccourcis sur les tokens (HUD)
@@ -412,19 +604,23 @@
 - Changement de l'icône d'état d'empoignade pour suivre les couleurs des autres icônes d'état

 ## 11.2.8 - L'éclairage d'Akarlikarlikar
+
 - l'ajustement de la lumière jour/nuit s'étale sur moins de temps (vaisseau et Lyre)
 - les nouveaux tooltips ne masquent plus l'information d'expérience
 - les jets de dés pour maîtriser les rencontres fonctionnent de nouveau

 ## 11.2.7 - Les explications d'Akarlikarlikar
+
 - Ajout de tooltips sur la plupart des boutons, liens clickables, objets, tâches, ...
 - Fix: on peut de nouveau regarder l'inventaire avec les droits limités/observateur

 ## 11.2.6 - Les réveils difficiles d'Akarlikarlikar
+
 - Les changements de points de Cœur sont temporaires jusqu'à fin Château Dormant
 - Fix: tous les petits fixes (feuille qui s'ouvre plus, compagnons animaux, potions qui bloquent Château Dormant, ...)

 ## 11.2.2 - Les tendres moments d'Akarlikarlikar
+
 - On peut maintenant avoir des points de Cœur pour des suivants/compagnons
  - diminuer les points de coeurs fait perdre du moral
  - on peut proposer un tendre moment
@@ -443,11 +639,14 @@
    ne bloquent plus les jets de dés

 ## v11.2.1 - La technique d'Akarlikarlikar
+
 - On peut créer des armes pour Corps à corps et Esquive. Barreaux de chaise, armes improvisées, techniques d'art martiaux, pas de côté pour faire trébucher l'adversaire... A vous de voir comment imaginer de nouvelles "armes".
 - Les armes avec une résistance de 0 ne peuvent pas être utilisées, une image et un rappel indiquent qu'elles sont cassées

 Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
+
 ## 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:
@@ -461,12 +660,15 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
 - 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é
 - Fix: l'encaissement à valider par le MJ fonctionne de nouveau

 ## v11.1.5 - Werther de Zloth l'Onirique
+
 - Fixes:
  - la demande de défense ne marchait plus
  - la tête réserve extensible crée bien une case de réserve extensible (à modifier)
@@ -481,6 +683,7 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
  - pas de jets de vie pour les morts

 ## v11.1.4 - Werther de Zloth l'Onirique
+
 - Ajout du facteur de significative à côté du pourcentage dans le résultat des jets de dés pour rappeler que le pourcentage n'est pas diviasé
 - Fix: dans les TMRs, les tooltips affichent bien les informations de tous les effets sur la case
 - Fix: la fatigue et l'éthylisme sont de nouveau pris en compte dans le calcul de l'éthylisme
@@ -490,15 +693,18 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
 - Esthétique: ne pas afficher "+0" pour les ajustements de jets/encaissement

 ## v11.1.2 - Les vertèbres de Werther de Zloth
+
 - Fix: les jets d'encaissement fonctionnent de nouveau normalement
 - Macro "Mon personnage" permettant au joueur d'accéder à sa feuille de personnage depuis la barre de macros

 ## v11.1.1 - Les fumebols de Werther de Zloth
+
 - Fix: on peut de nouveau afficher les vues détaillées
 - Fix: on peut ouvrir les sacs et contenants portés par les véhicules et créatures
 - Fix: cuisiner du gibier prend maintenant bien les proportaions en compte

 ## v11.1.0 - Les choix de Werther de Zloth
+
 - Les options suivantes peuvent être désactivées:
  - La transformation de stress à Château Dormant
  - La récuperation de chance à Château Dormant
@@ -516,7 +722,9 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
  - 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
  - le message annonçant le joueur dont c'est le tour ne contient plus d'informations de santé
@@ -528,12 +736,14 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
  - le moral est indiqué avant l'icone d'appel au moral

 ## v11.0.27 - Khrachtchoum le méticuleux
+
 - le tooltip dans les TMR reste visible si on ne bouge pas la souris
 - le surencombrement n'affecte QUE les actions physiques
 - on peut de nouveau fabriquer une potion depuis la fenêtre d'édition de l'herbe
 - si les TMR sont minimisées alors qu'une action est requise, elles sont bien réaffichées lorsque l'action est faite

 ## v11.0.26 - le crépuscule de Khrachtchoum
+
 - gestion correcte des TMRs
  - les TMRs ne sont jamais minimisées (par le système) quand le haut-rêvant est en demi-rêve
  - lorsqu'une fenêtre liée aux demi-rêve est affichée, cliquer sur les TMRs n'a pas d'effet
@@ -552,45 +762,57 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
 - les jets de compétences d'attaque des créatures fonctionnent de nouveau

 ## v11.0.25 - la vision du rêve de Khrachtchoum
+
 - Les TMRs restent affichées tant que le Haut-rêvant est en demi-rêve

 ## v11.0.24 - les couleurs de Khrachtchoum
+
 - nouvelle carte des TMRs

 ## v11.0.23 - la lumière de Khrachtchoum
+
 - ajustement automatique de la luminosité selon l'heure pour les scènes:
-   - avec une vision des tokens (sinon: ce n'est pas une scène de carte pour tokens)
-   - avec illumination globale (correspondant à une illumination extérieure)
-   - quand lampe "allumée" dans la fenêtre du calendrier
+  - avec une vision des tokens (sinon: ce n'est pas une scène de carte pour tokens)
+  - avec illumination globale (correspondant à une illumination extérieure)
+  - quand lampe "allumée" dans la fenêtre du calendrier

 ## v11.0.22 - les automatismes de Khrachtchoum le Problémeux
+
 - Macro pour attaquer avec les compétences de créatures

 ## v11.0.20
+
 - Macro pour attaquer avec les armes des personnages

 ## v11.0.17
+
 - Fix: les actions de commerce ne s'appliquait pas bien aux personnages des tokens non liés

 ## v11.0.15 - L'apprentissage de Khrachtchoum
+
 - Fix: l'expérience ne s'appliquait plus sur certaines réussites particulières (régression depuis la 11.0.7)

 ## v11.0.14 - Les pincettes de Khrachtchoum le Problémeux
+
 - Correction du calcul de la place restante lors de l'ajout dans un conteneur

 ## v11.0.13 - La multiplication de l'eau de Khrachtchoum le Problémeux
+
 - Correction de la vente depuis un commerce ayant des quantités illimitées

 ## v11.0.12 - Les poids de la mesure de Khrachtchoum le Problémeux
+
 - Correction des malus de surencombrement
 - Le malus armure est correctement affiché dans l'onglet des caractéristiques
 - Correction d'orthographe et amélioration des messages des oeuvres d'art

 ## v11.0.11 - Les bleus de Khrachtchoum le Problémeux
+
 - si le gardien configure le sommeil, les joueurs sont notifiés que chateau dormant vient de passer
 - possibilité de créer des armes et des compétences de créatures non-mortelles.

 ## v11.0.10 - Les Songes de Khrachtchoum le Problémeux
+
 - on peut de nouveau se déplacer dans les TMRs d'un clic sur la case à atteindre
 - Lire un livre depuis l'inventaire permet de nouveau de faire un jet de la tâche
  créée au lieu de créer toujours une nouvelle tâche
@@ -601,12 +823,14 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
  les heures dormies sont déduites des heures restant à dormir

 ## v11.0.9 - Les Souvenirs de Khrachtchoum le Problémeux
+
 - mode de saisie de l'archétype en vue détaillée
 - création  une nouvelle incarnation depuis l'archétype
 - réorganisation de la fenêtre de sélection des règles optionnelles
 - correction de l'affichage du type dans les fenêtres d'objets

 ## v11.0.8 - la poigne de Sémolosse
+
 - lien vers le changelog
 - organisation des compendiums du système
 - correction de l'empoignade
--- a/css/foundryvtt-reve-de-dragon.css
+++ b/css/foundryvtt-reve-de-dragon.css
--- a/icons/cuisine/gibier.svg
+++ b/icons/cuisine/gibier.svg
--- a/icons/cuisine/herbe.svg
+++ b/icons/cuisine/herbe.svg
--- a/icons/cuisine/mortadelle.svg
+++ b/icons/cuisine/mortadelle.svg
--- a/icons/cuisine/plante.svg
+++ b/icons/cuisine/plante.svg
--- a/icons/cuisine/ragout.svg
+++ b/icons/cuisine/ragout.svg
--- a/icons/cuisine/saucisson.svg
+++ b/icons/cuisine/saucisson.svg
--- a/icons/cuisine/volaille.svg
+++ b/icons/cuisine/volaille.svg
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,6 +1,6 @@
 {
  "TYPES": {
-    "Actor": { 
+    "Actor": {
      "personnage": "Personnage",
      "creature": "Créature",
      "entite": "Entité de cauchemar",
@@ -66,6 +66,8 @@
    "StatusRestrained": "Immobilisé",
    "StatusComma": "Comma",
    "StatusDead": "Mort",
-    "StatusDemiReve": "Demi-rêve"
+    "StatusDemiReve": "Demi-rêve",
+    "StatusSurEnc": "Sur-encombrement",
+    "StatusForceWeak": "Force insuffisante"
  }
-}
+}
--- a/less/colors.less
+++ b/less/colors.less
@@ -12,14 +12,14 @@

  /* =================== 3. some constants ============ */
    --fieldset-background: url(/ui/parchment.jpg);
-    --rdd-color-text-primary: rgba(10, 10, 10, 0.9);
-    --rdd-input-background:rgba(0, 0, 0, 0.05);
-    --rdd-color-border-input: rgba(0, 0, 0, 0.2);
-    --rdd-bg-input: rgba(255, 255, 255, 0.1);
-    --color-controls:rgba(0, 0, 0, 0.9);
+    --rdd-color-text-primary: hsla(0, 0%, 4%, 0.9);
+    --rdd-input-background:hsla(0, 0%, 0%, 0.1);
+    --rdd-color-border-input: hsla(0, 0%, 0%, 0.2);
+    --rdd-bg-input: hsla(0, 0%, 100%, 0.1);
+    --color-controls:hsla(0, 0%, 0%, 0.9);
    --color-controls-light:hsla(0, 0%, 20%, 0.8);
    --color-controls-hover:hsla(60, 100%, 75%, 0.7);
-    --color-control-border-hover:rgba(255, 128, 0, 0.8);
+    --color-control-border-hover:hsla(30, 100%, 50%, 0.8);
    --color-gold: rgba(191, 149, 63, 0.8);
    --gradient-gold: linear-gradient(30deg, rgba(191, 149, 63, 0.3), rgba(252, 246, 186, 0.3), rgba(179, 135, 40, 0.3), rgba(251, 245, 183, 0.3), rgba(170, 119, 28, 0.3));
    --gradient-silver: linear-gradient(30deg, rgba(61, 55, 93, 0.3), rgba(178, 179, 196, 0.3), rgba(59, 62, 63, 0.6), rgba(206, 204, 199, 0.3), rgba(61, 46, 49, 0.3));
@@ -27,6 +27,11 @@
    --gradient-red: linear-gradient(150deg, rgba(255, 0, 0, 0.3), rgba(255, 200, 128, 0.05),rgba(255, 200, 128, 0.1), rgba(255,10,0,0.3));
    --gradient-violet: linear-gradient(150deg, rgba(100, 45, 124, 0.6), rgba(216, 157, 192, 0.3), rgba(177, 157, 216, 0.5), rgba(107, 62, 121, 0.3), rgba(100, 45, 124, 0.6));
    --gradient-purple-black: linear-gradient(150deg,  rgba(0, 0, 0, 0.7), rgba(100, 45, 124, 0.4), rgba(82, 17, 131, 0.3),rgba(100, 45, 124, 0.4), rgba(0, 0, 0, 0.7));
+    --gradient-warning: linear-gradient(150deg,
+      hsla(32, 100%, 50%, 0.3),
+      hsla(52, 60%, 50%, 0.1),
+      hsla(32, 60%, 50%, 0.1),
+      hsla(32, 100%, 50%, 0.3));
    --gradient-silver-light: linear-gradient(30deg, rgba(61, 55, 93, 0.2), rgba(178, 179, 196, 0.1), rgba(59, 62, 63, 0.2), rgba(206, 204, 199, 0.1), rgba(61, 46, 49, 0.2));
    --gradient-daylight: conic-gradient(
      from 0deg,
@@ -39,12 +44,20 @@
      hsla(50, 100%, 80%, 0.7)
    );

-    --background-custom-button: linear-gradient(to bottom, rgba(33, 55, 74, 0.988) 5%, rgba(21, 40, 51, 0.671) 100%);
-    --background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%);
+    --background-custom-button: linear-gradient(to bottom, hsla(208, 38%, 21%, 0.988) 5%, hsla(202, 42%, 14%, 0.671) 100%);
+    --background-custom-button-hover: linear-gradient(to bottom, hsla(0, 100%, 25%, 1) 5%, hsla(0, 97%, 12%, 1) 100%);
    --background-control-selected: linear-gradient(to bottom, hsla(0, 100%, 25%, 0.5) 5%, hsla(0, 100%, 12%, 0.5) 100%);
    --background-tooltip: hsla(60, 12%, 85%, 0.95);
+    --background-tooltip-alt: hsla(60, 12%, 74%, 0.95);
    --color-tooltip:hsla(282, 47%, 33%, 0.9);
    --color-tooltip-faint:hsla(282, 47%, 66%, 0.5);
    --background-error:hsla(16, 100%, 50%, 0.8);
    --color-profile-border: hsla(0, 0%, 80%, 0.05);
+
+    --color-background-chat-message: hsla(60, 12%, 85%, 0.9);
+    --color-background-chat-whisper: repeating-linear-gradient(120deg,
+      hsla(60, 12%, 85%, 0.75),
+      hsla(60, 12%, 85%, 0.75) 1rem, 
+      hsla(60, 12%, 85%, 0.8) 1rem, 
+      hsla(60, 12%, 85%, 0.75) 1.5rem);
  }
--- a/less/fonts.less
+++ b/less/fonts.less
@@ -59,6 +59,7 @@
 }

 /* Global styles & Font */
+.application,
 .window-app {
  font-family: CaslonAntique;
  text-align: justify;
@@ -80,5 +81,5 @@
 .sheet header.sheet-header .header-compteurs,
 .sheet header.sheet-header .flex-group-center.flex-fatigue,
 select,  .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
-    font-family: "CaslonAntique"; /* For sheet parts; For nav and title */
+  font-family: "CaslonAntique"; /* For sheet parts; For nav and title */
 }
--- a/less/foundryvtt-reve-de-dragon.less
+++ b/less/foundryvtt-reve-de-dragon.less
--- a/less/roll-chat.less
+++ b/less/roll-chat.less
@@ -0,0 +1,89 @@
+.chat-message div.roll-chat,
+.dialog-content div.roll-chat {
+  font-family: CaslonAntique;
+  display: grid;
+  grid-template-areas:
+    "img     header  buttons"
+    "img     resume  buttons"
+    "details details details"
+    "actions actions actions";
+  grid-template-columns: 3rem 1fr 1.4rem;
+  grid-template-rows: max-content max-content max-content max-content;
+  gap: 0 0.5rem;
+
+  div.chat-img {
+    grid-area: img;
+    display: flex;
+    flex-direction: column;
+    img {
+      border: 0;
+      max-height: 3rem;
+      max-width: 3rem;
+      object-fit: contain;
+      height: 100%;
+    }
+  }
+  div.chat-header {
+    grid-area: header;
+    font-weight: bold;
+    font-size: 0.9rem;
+  }
+  div.chat-resume {
+    grid-area: resume;
+    text-align: justify;
+  }
+  div.chat-details {
+    grid-area: details;
+    text-align: justify;
+    display: flex;
+    flex-direction: column;
+    div {
+      display: block;
+    }
+  }
+  div.chat-actions {
+    grid-area: actions;
+    display: flex;
+    flex-direction: column;
+    a {
+      display: flex;
+      flex-direction: row;
+      img {
+        margin-right: 0.5rem;
+      }
+    }
+  }
+  
+  div.chat-buttons {
+    grid-area: buttons;
+    display: flex;
+    flex-direction: column;
+
+    a {
+      border-radius: 0.2rem;
+      cursor: pointer;
+      padding: 0.2rem;
+      position: relative;
+      box-shadow: inset 1x 1px #a6827e;
+      color: var(--color-controls);
+      border: 1px ridge #846109;
+      display: inline-block;
+      align-items: center;
+      
+      img {
+        max-width: 1rem;
+        max-height: 1rem;
+      }
+    }
+    
+    a:hover {
+      background: var(--background-custom-button-hover);
+    }
+
+    a:active{
+      position:relative;
+      top:1px;
+    }
+
+  }
+}
--- a/less/roll-dialog.less
+++ b/less/roll-dialog.less
@@ -0,0 +1,254 @@
+.roll-dialog {
+  font-family: CaslonAntique;
+  display: grid;
+  grid-template-areas:
+    "header header     header     header     header     header     header"
+    "action action     action     action     action     action     action"
+    "type   separation separation separation separation separation separation"
+    "type   carac      carac      carac      comp       comp       resume"
+    "type   choix      choix      choix      choix      choix      conditions"
+    "type   resolution resolution resolution resolution resolution conditions"
+    "type   chances    chances    chances    chances    chances    buttons"
+    "footer footer     footer     footer     footer     footer     footer";
+  grid-template-columns: 2rem 1rem 1fr 1fr 2fr 2fr 3fr;
+  gap: 0.2rem;
+
+  roll-header { grid-area: header; }
+  roll-line  { grid-area: separation; }
+  roll-action { grid-area: action; }
+  roll-carac { grid-area: carac; }
+  roll-comp { grid-area: comp; }
+  
+  roll-choix { grid-area: choix; }
+  
+  roll-table { grid-area: resolution; }
+  roll-conditions { grid-area: conditions; }
+  roll-chances { grid-area: chances; }
+  roll-resume { grid-area: resume; }
+  roll-buttons  { grid-area: buttons; }
+  
+  roll-type {
+    grid-area: type;
+    display: flex;
+    flex-direction: column;
+  }
+  roll-conditions roll-section[name="rollmode"],
+  roll-type {
+    button[data-checked="true"] {
+      background-color: var(--color-text-selection-bg);
+      color: var(--color-controls);
+      i { filter: invert(0.8); }
+      img { filter: invert(0.2); }
+    }
+    button {
+      height: 1.8rem;
+      width: 1.8rem;
+      gap: 0.5rem;
+      padding: 0.2rem;
+      background-color: var(--button-background-color);
+      color: var(--color-controls);
+      i { filter: invert(0.2); }
+      img { filter: invert(0.8); }
+    }
+  }
+  
+  :is(roll-carac, roll-comp) {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+  }
+  
+  roll-section,
+  roll-section div {
+    display: flex;
+    flex-direction: row;
+    align-items: anchor-center;
+    margin: 0 0.2rem;
+  }
+  
+  roll-resume {
+    display: flex;
+    flex-direction: row;
+    img.button-effect-img {
+      filter: invert(0.8);
+    }
+  }
+
+  roll-choix roll-section {
+    display: grid;
+    grid-template-areas:
+      "selection selection"
+      "img roll-part";
+    grid-template-columns: 3.2rem 1fr;
+    gap: 0.2rem;
+    align-items: start;
+
+    
+    subline {
+      grid-area: selection;
+      display: flex;
+      flex-direction: row;
+      margin: 0.1rem 0;
+      .warning {
+        border-radius: 0.5rem;
+        background: var(--gradient-warning);
+      }
+    }
+
+    roll-part-img {
+      display: flex;
+      flex-direction: column;
+      grid-area: img;
+      img {
+        border: 0;
+        padding: 1px;
+        max-height: 3rem;
+        max-width: 3rem;
+        object-fit: contain;
+        height: 100%;
+      }
+    }
+    roll-part-detail {
+      grid-area: roll-part;
+      display: flex;
+      flex-direction: column;
+      align-items: normal;
+      
+      subline {
+        display: flex;
+        flex-direction: row;
+        margin: 0.1rem 0;
+        div.poesie-extrait{
+          display: flex;
+          flex-direction: column;
+          align-items: normal;
+        }
+        span.status-surprise{
+          display: flex;
+          flex-direction: row;
+          flex-flow: wrap;
+          img {
+            filter: invert(0.8);
+          }
+        }
+        label {
+          align-content: center;
+        }
+      }
+    }
+  }
+
+  roll-section selected-numeric-value {
+    display: flow;
+    width: 2.5rem;
+    text-align: right;
+    margin: 0 0.2rem;
+    padding: 0 0.2rem;
+    border: 1px solid ;
+    border-radius: 0.2rem ;
+    background: hsla(0, 0%, 0%, 0.2);
+    height: 1.5rem;
+    background: hsla(0, 0%, 0%, 0.2);
+  }
+
+  roll-action {
+    flex-basis: content;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: 0.2rem solid;
+    font-size: 1.2rem;
+    font-weight: bold;
+    
+    roll-section {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      img.action-img {
+        float: left;
+      }
+      img {
+        max-width: 3rem;
+        max-height: 3rem;
+        margin: 0 1rem;
+        padding: 0;
+      }
+    }
+  }
+
+  roll-conditions {
+    display: flex;
+    flex-direction: column;
+  }
+  :is(roll-action, roll-carac, roll-comp) roll-section {
+    flex-basis: content;
+  }  
+
+  :is(roll-choix, roll-conditions, roll-carac, roll-comp) {
+    select {
+      max-height: 1.6rem;
+      margin: 0 0.2rem;
+      padding: 0 0.2rem;
+    }
+    input[type="number"] {
+      max-height: 1.6rem;
+      max-width: 2.5rem;
+      margin: 0 0.2rem;
+      padding: 0 0.2rem;
+    }
+    img {
+          max-width: 1.8rem;
+          max-height: 1.8rem;
+          margin: 0 0.2rem;
+          padding: 0;
+    }
+    img.button-effect-img {
+          max-width: 1rem;
+          max-height: 1rem;
+          margin: 0 0.1rem;
+    }
+  }
+
+  roll-carac select[name="select-carac"] {
+    min-width: 6.5rem;
+    max-width: 8rem;
+  }
+  roll-comp select[name="select-comp"] {
+    min-width: 8rem;
+    max-width: 10rem;
+    margin-left: 1.5rem;
+  }
+
+  roll-conditions roll-section[name="coeur"] select[name="coeur"]  {
+    max-width: 4rem;
+  }
+
+  roll-conditions roll-section img {
+    max-width: 1rem;
+    max-height: 1rem;
+    gap: 0;
+    margin: 0;
+    padding: 0;
+    filter: invert(0.8);
+  }
+  roll-conditions roll-section[name="tricher"] img {
+    /* image de d100 */
+    max-width: 2.5rem;
+    max-height: 2.5rem;
+  }
+
+  roll-buttons { 
+    display: flex;
+    flex-direction: row-reverse;
+  }
+
+  roll-table {
+    table tr :is(th, td) {
+        padding: 0.1rem;
+        width: 1.5rem;
+        text-align: center;
+    }
+  }
+
+}
--- a/less/sheets.less
+++ b/less/sheets.less
@@ -8,7 +8,7 @@
    min-height: 100px; // Hauteur minimale pour la description
    background: var(--rdd-bg-input-alt); // Une couleur de fond alternative
    padding: 5px;
-    border-radius: 3px;
+    border-radius: 0.2rem;
    color: var(--rdd-color-text-primary);
  }

@@ -28,7 +28,7 @@
    background: var(--fieldset-background);
    color: var(--rdd-color-text-primary);
    margin-bottom: 4px;
-    border-radius: 6px;
+    border-radius: 0.5rem;
    border-color: var(--rdd-color-text-primary);
    border-width: 2px;
  }
@@ -64,7 +64,7 @@
        --rdd-color-text-input
      ); // Assurez-vous que cette variable existe
      padding: 2px 2px; // Augmentation du padding vertical
-      border-radius: 3px;
+      border-radius: 0.2rem;
    }

    input[type="checkbox"] {
--- a/module/achat-vente/chat-vente.js
+++ b/module/achat-vente/chat-vente.js
@@ -1,4 +1,4 @@
-import { SYSTEM_RDD } from "../constants.js";
+import { renderTemplate, SYSTEM_RDD } from "../constants.js";
 import { RdDUtility } from "../rdd-utility.js";

 const DETAIL_VENTE = 'detailVente';
--- a/module/achat-vente/dialog-item-achat.js
+++ b/module/achat-vente/dialog-item-achat.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "../constants.js";
 import { Misc } from "../misc.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { ChatVente } from "./chat-vente.js";
--- a/module/achat-vente/dialog-item-vente.js
+++ b/module/achat-vente/dialog-item-vente.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "../constants.js";
 import { HtmlUtility } from "../html-utility.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { ChatVente } from "./chat-vente.js";
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -1,19 +1,17 @@
 import { RdDUtility } from "./rdd-utility.js";
 import { HtmlUtility } from "./html-utility.js";
-import { RdDItemArme } from "./item-arme.js";
-import { RdDItemCompetence } from "./item-competence.js";
 import { RdDBonus } from "./rdd-bonus.js";
 import { Misc } from "./misc.js";
 import { RdDCombatManager } from "./rdd-combat.js";
-import { RdDCarac } from "./rdd-carac.js";
+import { CARACS, RdDCarac } from "./rdd-carac.js";
 import { DialogSplitItem } from "./dialog-split-item.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
-import { STATUSES } from "./settings/status-effects.js";
 import { MAINS_DIRECTRICES } from "./actor.js";
 import { RdDBaseActorReveSheet } from "./actor/base-actor-reve-sheet.js";
 import { ITEM_TYPES } from "./constants.js";
 import { RdDItem } from "./item.js";
+import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemBlessure } from "./item/blessure.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { RdDBaseActorSangSheet } from "./actor/base-actor-sang-sheet.js";
@@ -34,7 +32,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      width: 550,
      showCompNiveauBase: false,
      vueArchetype: false,
-    }, { inplace: false });
+    }, { inplace: false })
  }

  /* -------------------------------------------- */
@@ -50,7 +48,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    });
    foundry.utils.mergeObject(formData.calc, {
      surenc: this.actor.computeMalusSurEncombrement(),
-      surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
+      surprise: RdDBonus.find(this.actor.getSurprise(false)).label,
      resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
      caracTotal: RdDCarac.computeTotal(this.actor.system.carac, this.actor.system.beaute),
      surEncombrementMessage: this.actor.isSurenc() ? "Sur-Encombrement!" : "",
@@ -78,14 +76,10 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      });

      // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
-      const actor = this.actor;
-      formData.combat = foundry.utils.duplicate(formData.armes);
-      RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
-      formData.combat.push(RdDItemArme.corpsACorps(actor));
-      formData.combat.push(RdDItemArme.empoignade(actor));
+      const actor = this.actor

      formData.esquives = this.actor.getCompetencesEsquive()
-      formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
+      formData.combat = actor.listActionsAttaque()
      formData.empoignades = this.actor.getEmpoignades();

      this.armesList = formData.combat;
@@ -95,7 +89,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      formData.difficultesLibres = CONFIG.RDD.difficultesLibres;

      formData.hautreve = {
-        isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
+        isDemiReve: this.actor.isDemiReve(),
        cacheTMR: this.actor.isTMRCache()
      }

@@ -180,7 +174,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      await this.getBlessure(event)?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
    });

-    this.html.find('.roll-chance-actuelle').click(async event => await this.actor.rollCarac('chance-actuelle'))
+    this.html.find('.roll-chance-actuelle').click(async event => await this.actor.rollCarac(CARACS.CHANCE_ACTUELLE))
    this.html.find('.button-appel-chance').click(async event => await this.actor.rollAppelChance())

    this.html.find('[name="jet-astrologie"]').click(async event => await this.actor.astrologieNombresAstraux())
@@ -214,16 +208,20 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    }

    // Points de reve actuel
-    this.html.find('.roll-reve-actuel').click(async event => await this.actor.rollCarac('reve-actuel', { resistance: true }))
+    this.html.find('.roll-reve-actuel').click(async event => await this.actor.rollCarac(CARACS.REVE_ACTUEL, { resistance: true }))
    this.html.find('.action-empoignade').click(async event => await RdDEmpoignade.onAttaqueEmpoignadeFromItem(RdDSheetUtility.getItem(event, this.actor)))

-    this.html.find('.roll-arme').click(async event => await this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event)), 'competence'))
+    this.html.find('.roll-arme').click(async event => {
+      const action = this._getActionCombat(event);
+      await this.actor.rollArme(action.arme, action.main)
+
+    })

    // Initiative pour l'arme
    this.html.find('.roll-init-arme').click(async event => {
      let combatant = game.combat.combatants.find(c => c.actor.id == this.actor.id)
      if (combatant) {
-        RdDCombatManager.rollInitiativeAction(combatant._id, this._getEventArmeCombat(event));
+        RdDCombatManager.rollInitiativeAction(combatant._id, this._getActionCombat(event));
      } else {
        ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
      }
@@ -237,11 +235,11 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {

    this.html.find('.carac-xp-augmenter').click(async event => await this.actor.updateCaracXPAuto(event.currentTarget.name.replace("augmenter.", "")))
    this.html.find('.competence-xp-augmenter').click(async event => await this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event)))
-    this.html.find('.competence-stress-augmenter').click(async event =>{
+    this.html.find('.competence-stress-augmenter').click(async event => {
      await this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event))
      this.render(true)
-    } 
-  )
+    }
+    )

    if (this.options.vueDetaillee) {
      // On carac change
@@ -344,16 +342,20 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {

  /* -------------------------------------------- */
  async createEmptyTache() {
-    await this.actor.createItem('tache', 'Nouvelle tache');
+    await this.actor.createItem(ITEM_TYPES.tache, 'Nouvelle tache')
  }

-  _getEventArmeCombat(event) {
+  _getActionCombat(event) {
    const li = this.html.find(event.currentTarget)?.parents(".item");
    let armeName = li.data("arme-name");
    let compName = li.data('competence-name');
-    const arme = this.armesList.find(a => a.name == armeName && a.system.competence == compName);
+    const arme = this.armesList.find(a => a.arme.name == armeName && a.comp.name == compName);
    if (!arme) {
-      return { name: armeName, system: { competence: compName } };
+      return {
+        name: armeName,
+        arme: { name: armeName },
+        comp: { name: compName }
+      }
    }
    return arme;
  }
@@ -373,14 +375,6 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    return position;
  }

-
-  /* -------------------------------------------- */
-  /** @override */
-  _updateObject(event, formData) {
-    // Update the Actor
-    return this.actor.update(formData);
-  }
-
  async splitItem(item) {
    const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
    dialog.render(true);
--- a/module/actor.js
+++ b/module/actor.js
--- a/module/actor/base-actor-reve-sheet.js
+++ b/module/actor/base-actor-reve-sheet.js
@@ -56,13 +56,15 @@ export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
    if (this.options.vueDetaillee) {
      // On carac change
      this.html.find('.carac-value').change(async event => {
-        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "")
-        await this.actor.updateCarac(caracName, parseInt(event.target.value))
-      });
+        if (event.currentTarget.name.includes("carac.")) {
+          let caracName = event.currentTarget.name.replace("carac.", "")
+          await this.actor.updateCarac(caracName, parseInt(event.currentTarget.value))
+        }
+      })
      // On competence change
      this.html.find('.competence-value').change(async event => {
        let compName = event.currentTarget.attributes.compname.value
-        await this.actor.updateCompetence(compName, parseInt(event.target.value))
+        await this.actor.updateCompetence(compName, parseInt(event.currentTarget.value))
      });
    }
  }
--- a/module/actor/base-actor-reve.js
+++ b/module/actor/base-actor-reve.js
@@ -1,4 +1,4 @@
-import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
+import { renderTemplate, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
 import { Grammar } from "../grammar.js";
 import { Misc } from "../misc.js";
 import { RdDResolutionTable } from "../rdd-resolution-table.js";
@@ -8,22 +8,27 @@ import { RdDUtility } from "../rdd-utility.js";
 import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
 import { RdDBaseActor } from "./base-actor.js";
 import { ITEM_TYPES } from "../constants.js";
-import { RdDItemCompetence } from "../item-competence.js";
-import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
-import { RdDItemArme } from "../item-arme.js";
-import { StatusEffects } from "../settings/status-effects.js";
+import { StatusEffects, STATUSES } from "../settings/status-effects.js";
 import { Targets } from "../targets.js";
 import { RdDConfirm } from "../rdd-confirm.js";
-import { RdDCarac } from "../rdd-carac.js";
+import { CARACS, RdDCarac } from "../rdd-carac.js";
 import { RdDRollResult } from "../rdd-roll-result.js";

+import { RdDItemArme } from "../item/arme.js";
+import { RdDItemCompetence } from "../item-competence.js";
+
 import { ChatUtility } from "../chat-utility.js";
 import { DialogValidationEncaissement } from "../dialog-validation-encaissement.js";
 import { RdDCombat } from "../rdd-combat.js";
 import { RdDEmpoignade } from "../rdd-empoignade.js";
 import { RdDPossession } from "../rdd-possession.js";
 import { BASE_CORPS_A_CORPS, BASE_ESQUIVE, POSSESSION_SANS_DRACONIC } from "../item/base-items.js";
-import { RollDataAjustements } from "../rolldata-ajustements.js";
+import { RollDataAjustements } from "../rolldata-ajustements-v1.js";
+import { MappingCreatureArme } from "../item/mapping-creature-arme.mjs";
+import RollDialog from "../roll/roll-dialog.mjs";
+import { ATTAQUE_ROLL_TYPES, DEFAULT_ROLL_TYPES, DIFF, ROLL_TYPE_ATTAQUE, ROLL_TYPE_COMP, ROLL_TYPE_JEU, ROLL_TYPE_MEDITATION, ROLL_TYPE_OEUVRE, ROLL_TYPE_TACHE } from "../roll/roll-constants.mjs";
+import { OptionsAvancees, ROLL_DIALOG_V2 } from "../settings/options-avancees.js";
+import { PART_COMP } from "../roll/roll-part-comp.mjs";

 /**
 * Classe de base pour les acteurs disposant de rêve (donc, pas des objets)
@@ -79,11 +84,11 @@ export class RdDBaseActorReve extends RdDBaseActor {
  getBonusDegat() { return RdDCarac.getCaracDerivee(this.getEncombrementMax()).plusdom }

  getMoralTotal() { return 0 }
+  listeAmoureux() { return [] }
  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
  getSConst() { return 0 }

  /* -------------------------------------------- */
-  isSurenc() { return false }
  computeMalusSurEncombrement() { return 0 }

  ajustementAstrologique() { return 0 }
@@ -108,18 +113,20 @@ export class RdDBaseActorReve extends RdDBaseActor {
    }
    return this.system.carac[competence.system.defaut_carac].value;
  }
-  listActionsCombat() {
+
+  listActions({ isAttaque = false, isEquipe = false }) {
    return this.itemTypes[ITEM_TYPES.competencecreature]
-      .filter(it => RdDItemCompetenceCreature.isAttaque(it))
-      .map(it => RdDItemCompetenceCreature.armeCreature(it))
+      .filter(it => it.isAttaque())
+      .map(it => it.attaqueCreature())
      .filter(it => it != undefined);
  }

-
-  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
+  async computeArmure(dmg) { return this.getProtectionNaturelle() }
  async remiseANeuf() { }
  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }

+  computeResumeBlessure() { }
+  countBlessures(filter = it => !it.isContusion()) { return 0 }
  async santeIncDec(name, inc, isCritique = false) { }

  async finDeRound(options = { terminer: false }) {
@@ -164,11 +171,17 @@ export class RdDBaseActorReve extends RdDBaseActor {
    if (idOrName instanceof Item) {
      return idOrName.isCompetence() ? idOrName : undefined
    }
-    return RdDItemCompetence.findCompetence(this.items, idOrName, options)
+    return RdDItemCompetence.findCompetence(
+      this.items.filter(it => [ITEM_TYPES.competence, ITEM_TYPES.competencecreature].includes(it.type)),
+      idOrName, options)
  }

-  getCompetences(name, options = { onMessage: message => { } }) {
-    return RdDItemCompetence.findCompetences(this.items, name, options)
+  getCompetences(name = undefined, options = { onMessage: message => { } }) {
+    const all = [...this.itemTypes[ITEM_TYPES.competence], ...this.itemTypes[ITEM_TYPES.competencecreature]]
+    if (name == undefined) {
+      return all
+    }
+    return RdDItemCompetence.findCompetences(all, name, options)
  }

  getCompetenceCorpsACorps(options = { onMessage: message => { } }) {
@@ -183,11 +196,16 @@ export class RdDBaseActorReve extends RdDBaseActor {
    return RdDItemArme.getArme(armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined)
  }

+  isForceInsuffisante(forceRequise) {
+    return false
+  }
+
  getDraconicOuPossession() { return POSSESSION_SANS_DRACONIC }

  getPossession(possessionId) {
    return this.itemTypes[ITEM_TYPES.possession].find(it => it.system.possessionid == possessionId);
  }
+
  getEmpoignades() {
    return this.itemTypes[ITEM_TYPES.empoignade];
  }
@@ -212,54 +230,12 @@ export class RdDBaseActorReve extends RdDBaseActor {
  }

  /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return false }
-
-  getEffects(filter = e => true) {
-    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
+  isDemiReve() {
+    return this.getEffectsByStatus(STATUSES.StatusDemiReve).length > 0
  }

-  getEffect(effectId) {
-    return this.getEmbeddedCollection("ActiveEffect").find(it => it.statuses?.has(effectId));
-  }
-
-  async setEffect(effectId, status) {
-    if (this.isEffectAllowed(effectId)) {
-      const effect = this.getEffect(effectId);
-      if (!status && effect) {
-        await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
-      }
-      if (status && !effect) {
-        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.prepareActiveEffect(effectId)]);
-      }
-    }
-  }
-
-  async removeEffect(id) {
-    const effect = this.getEmbeddedCollection("ActiveEffect").find(it => it.id == id);
-    if (effect) {
-      await this.deleteEmbeddedDocuments('ActiveEffect', [id]);
-    }
-  }
-
-  async removeEffects(filter = e => true) {
-    if (game.user.isGM) {
-      const ids = this.getEffects(filter).map(it => it.id);
-      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
-    }
-  }
-
-  /* -------------------------------------------- */
-  getSurprise(isCombat = undefined) {
-    let niveauSurprise = this.getEffects()
-      .map(effect => StatusEffects.valeurSurprise(effect, isCombat))
-      .reduce(Misc.sum(), 0);
-    if (niveauSurprise > 1) {
-      return 'totale';
-    }
-    if (niveauSurprise == 1) {
-      return 'demi';
-    }
-    return '';
+  getSurprise(isCombat = undefined, forceRequise = undefined) {
+    return StatusEffects.getSurprise(this.getEffects(e => true, isCombat, forceRequise), isCombat)
  }

  /* -------------------------------------------- */
@@ -277,13 +253,41 @@ export class RdDBaseActorReve extends RdDBaseActor {
    return dialog
  }

-  createCallbackExperience() { return { action: r => { } } }
-  createCallbackAppelAuMoral() { return { action: r => { } } }
+
+  /* -------------------------------------------- */
+  createCallbackExperience() {
+    return { action: r => this.appliquerAjoutExperience(r) }
+  }
+
+  /* -------------------------------------------- */
+  createCallbackAppelAuMoral() {
+    /* Si l'appel au moral est utilisé, on l'affiche dans le chat et on diminue éventuellement le moral */
+    return { action: r => this.appliquerAppelMoral(r) }
+  }
+
+  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
+  async appliquerAppelMoral(rollData) { }

  async _onCloseRollDialog(html) { }

  async rollCaracCompetence(caracName, compName, diff, options = { title: "" }) {
    RdDEmpoignade.checkEmpoignadeEnCours(this)
+
+    if (OptionsAvancees.isUsing(ROLL_DIALOG_V2)) {
+      const competence = this.getCompetence(compName);
+      const rollData = {
+        ids: { actorId: this.id },
+        type: { allowed: DEFAULT_ROLL_TYPES, current: PART_COMP },
+        selected: {
+          carac: { key: caracName },
+          comp: { key: competence.name },
+          diff: { value: diff }
+        }
+      }
+      RollDialog.create(rollData, options)
+      return
+    }
+
    const competence = this.getCompetence(compName);
    await this.openRollDialog({
      name: 'jet-competence',
@@ -356,9 +360,22 @@ export class RdDBaseActorReve extends RdDBaseActor {
  }
  /* -------------------------------------------- */
  async rollCarac(caracName, options = {}) {
-    if (Grammar.equalsInsensitive(caracName, 'taille')) {
+    if (Grammar.equalsInsensitive(caracName, CARACS.TAILLE)) {
      return
    }
+    if (OptionsAvancees.isUsing(ROLL_DIALOG_V2)) {
+      const rollData = {
+        ids: { actorId: this.id },
+        type: { allowed: DEFAULT_ROLL_TYPES, current: PART_COMP },
+        selected: {
+          carac: { key: caracName },
+          comp: options.resistance ? { key: undefined, forced: true } : undefined
+        }
+      }
+      RollDialog.create(rollData, options)
+      return
+    }
+
    foundry.utils.mergeObject(options, { resistance: false, diff: 0 }, { overwrite: false })
    RdDEmpoignade.checkEmpoignadeEnCours(this)
    let selectedCarac = this.getCaracByName(caracName)
@@ -385,10 +402,24 @@ export class RdDBaseActorReve extends RdDBaseActor {
    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-general.hbs');
  }

-  /* -------------------------------------------- */
  async rollCompetence(idOrName, options = { tryTarget: true, arme: undefined }) {
    RdDEmpoignade.checkEmpoignadeEnCours(this)
+
    const competence = this.getCompetence(idOrName);
+    if (OptionsAvancees.isUsing(ROLL_DIALOG_V2)) {
+      const rollData = {
+        ids: { actorId: this.id },
+        type: { allowed: options.arme ? ATTAQUE_ROLL_TYPES : DEFAULT_ROLL_TYPES },
+        selected: {
+          carac: competence.type == ITEM_TYPES.competencecreature ? { key: competence.name } : undefined,
+          comp: { key: competence.name },
+          diff: { type: options.arme ? DIFF.ATTAQUE : DIFF.LIBRE, value: competence.system.default_diffLibre ?? 0 },
+          attaque: options.arme ? { arme: { key: options.arme.id } } : undefined
+        }
+      }
+      return await RollDialog.create(rollData)
+    }
+
    let rollData = {
      carac: this.system.carac,
      competence: competence,
@@ -396,7 +427,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
    }
    if (competence.type == ITEM_TYPES.competencecreature) {
      const token = RdDUtility.getSelectedToken(this)
-      const arme = RdDItemCompetenceCreature.armeCreature(competence)
+      const arme = MappingCreatureArme.armeCreature(competence)
      if (arme && options.tryTarget && Targets.hasTargets()) {
        Targets.selectOneTargetToken(target => {
          if (arme.action == "possession") {
@@ -406,10 +437,10 @@ export class RdDBaseActorReve extends RdDBaseActor {
            RdDCombat.rddCombatTarget(target, this, token).attaque(competence, arme)
          }
        });
-        return;
+        return
      }
      // Transformer la competence de créature
-      RdDItemCompetenceCreature.setRollDataCreature(rollData)
+      MappingCreatureArme.setRollDataCreature(rollData)
    }
    const dialogLabel = 'Jet ' + Grammar.apostrophe('de', competence.name);
    await this.openRollDialog({
@@ -428,16 +459,50 @@ export class RdDBaseActorReve extends RdDBaseActor {
    }
  }

+  rollAttaque(token) {
+    token = token ?? RdDUtility.getSelectedToken(this)
+
+    if (Targets.hasTargets()) {
+      Targets.selectOneTargetToken(target => {
+        if (Targets.isTargetEntite(target)) {
+          ui.notifications.warn(`Vous ne pouvez pas attaquer une entité non incarnée!!!!`)
+          return
+        }
+
+        RdDCombat.rddCombatTarget(target, this, token).attaqueV2();
+      })
+    }
+    else {
+      return RdDConfirm.confirmer({
+        settingConfirmer: "confirmer-combat-sans-cible",
+        content: `<p>Voulez vous faire une attaque sans choisir de cible valide?
+                  <br>Tous les jets de combats devront être gérés à la main
+                  </p>`,
+        title: 'Ne pas utiliser les automatisation de combat',
+        buttonLabel: "Pas d'automatisation",
+        onAction: async () => {
+          const rollData = {
+            ids: { actorId: this.id, actorTokenId: token?.id, },
+            type: {
+              allowed: [ROLL_TYPE_ATTAQUE], current: ROLL_TYPE_ATTAQUE
+            }
+          };
+          return await RollDialog.create(rollData)
+        }
+      })
+    }
+  }
+
  /** --------------------------------------------
   * @param {*} arme item d'arme/compétence de créature
   * @param {*} categorieArme catégorie d'attaque à utiliser: competence (== melee), lancer, tir; naturelle, possession
-   * @returns 
+   * @returns
   */
-  rollArme(arme, categorieArme, token) {
+  rollArme(arme, categorieArme = 'competence', token = undefined) {
    token = token ?? RdDUtility.getSelectedToken(this)
-    const compToUse = this.$getCompetenceArme(arme, categorieArme)
+    const compToUse = RdDItemArme.getCompetenceArme(arme, categorieArme)
    if (!RdDItemArme.isUtilisable(arme)) {
-      ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
+      ui.notifications.warn(`Arme inutilisable: ${arme.name} non équipée ou avec une résistance de 0 ou moins`)
      return
    }
    if (!Targets.hasTargets()) {
@@ -469,38 +534,42 @@ export class RdDBaseActorReve extends RdDBaseActor {
    })
  }

-  $getCompetenceArme(arme, competenceName) {
-    return RdDItemArme.getCompetenceArme(arme, competenceName)
-  }
-
  verifierForceMin(item) { }

  /* -------------------------------------------- */
  async encaisser() { await RdDEncaisser.encaisser(this) }

-  async encaisserDommages(rollData, attacker = undefined, show = undefined, attackerToken = undefined, defenderToken = undefined) {
+  async encaisserDommages(dmg, attacker = undefined, show = undefined, attackerToken = undefined, defenderToken = undefined) {
    if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
-      return;
+      return
    }
-    const armure = await this.computeArmure(rollData);
+    if (!Misc.isOwnerPlayer(this)) {
+      return RdDBaseActor.remoteActorCall({
+        tokenId: attackerToken?.id ?? this.token?.id,
+        actorId: this.id,
+        method: 'encaisserDommages', args: [dmg, attacker, show, attackerToken, defenderToken]
+      })
+    }
+
+    const armure = await this.computeArmure(dmg)
    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')) {
-      await this.encaisserDommagesValidationGR(rollData, armure, show, attackerToken, defenderToken);
+      await this.encaisserDommagesValidationGR(dmg, armure, show, attackerToken, defenderToken);
    }
    else {
-      const jet = await RdDUtility.jetEncaissement(this, rollData, armure, { showDice: SHOW_DICE });
+      const jet = await RdDUtility.jetEncaissement(this, dmg, armure, { showDice: SHOW_DICE });
      await this.$onEncaissement(jet, show, attackerToken, defenderToken)
    }
  }

-  async encaisserDommagesValidationGR(rollData, armure, show, attackerToken, defenderToken) {
+  async encaisserDommagesValidationGR(dmg, armure, show, attackerToken, defenderToken) {
    if (!game.user.isGM) {
      RdDBaseActor.remoteActorCall({
        tokenId: this.token?.id,
        actorId: this.id,
-        method: 'encaisserDommagesValidationGR', args: [rollData, armure, show, attackerToken, defenderToken]
+        method: 'encaisserDommagesValidationGR', args: [dmg, armure, show, attackerToken, defenderToken]
      })
    } else {
-      DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
+      DialogValidationEncaissement.validerEncaissement(this, dmg, armure,
        jet => this.$onEncaissement(jet, show, attackerToken, defenderToken));
    }
  }
@@ -537,15 +606,37 @@ export class RdDBaseActorReve extends RdDBaseActor {
    }
  }

+  async encaisserRecul(force, dmgArme = 0) {
+    const diffRecul = this.getTaille() - force - dmgArme
+    const rolled = await RdDResolutionTable.roll(10, diffRecul)
+    if (rolled.isSuccess) {
+      return 'encaisse'
+    }
+    if (rolled.isETotal || (await this.rollEquilibre(diffRecul)).isEchec) {
+      await this.setEffect(STATUSES.StatusProne, true)
+      return 'chute'
+    }
+    return 'recul'
+  }
+
+  /* -------------------------------------------- */
+  async rollEquilibre(diff) {
+    // TODO: accrobatie optionnelle sur jet d'équilibre?
+    if (ReglesOptionnelles.isSet('acrobatie-pour-recul')) {
+      diff += Math.max(0, this.getCompetence('acrobatie')?.system.niveau ?? 0)
+    }
+    return await RdDResolutionTable.roll(this.getAgilite(), diff);
+  }
+
  /* -------------------------------------------- */
  async accorder(entite, when = 'avant-encaissement') {
    if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
      || entite == undefined
-      || !entite.isEntite([ENTITE_INCARNE])
+      || !entite.isEntiteIncarnee()
      || entite.isEntiteAccordee(this)) {
-      return true;
+      return true
    }
-    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.getNiveau()));
+    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.getNiveau()))
    const rollData = {
      alias: this.getAlias(),
      rolled: rolled,
@@ -554,11 +645,11 @@ export class RdDBaseActorReve extends RdDBaseActor {
    };

    if (rolled.isSuccess) {
-      await entite.setEntiteReveAccordee(this);
+      await entite.setEntiteReveAccordee(this)
    }

-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-accorder-cauchemar.hbs');
-    await this.appliquerAjoutExperience(rollData, true);
+    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-accorder-cauchemar.hbs')
+    await this.appliquerAjoutExperience(rollData, true)
    return rolled.isSuccess;
  }

--- a/module/actor/base-actor-sang.js
+++ b/module/actor/base-actor-sang.js
@@ -34,17 +34,17 @@ export class RdDBaseActorSang extends RdDBaseActorReve {

  getFatigueActuelle() {
    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
-      return Math.max(0, Math.min(this.getFatigueMax(),  Misc.toInt(this.system.sante.fatigue?.value)))
+      return Math.max(0, Math.min(this.getFatigueMax(), Misc.toInt(this.system.sante.fatigue?.value)))
    }
    return 0;
  }

-  isCumulFatigueCauseSommeil(cumulFatigue){
+  isCumulFatigueCauseSommeil(cumulFatigue) {
    return ReglesOptionnelles.isUsing("appliquer-fatigue")
-    ? (this.getFatigueRestante() <= cumulFatigue)
-    : (this.getEnduranceActuelle() <= cumulFatigue)
+      ? (this.getFatigueRestante() <= cumulFatigue)
+      : (this.getEnduranceActuelle() <= cumulFatigue)
  }
-  getFatigueRestante() {return this.getFatigueMax() - this.getFatigueActuelle() }
+  getFatigueRestante() { return this.getFatigueMax() - this.getFatigueActuelle() }
  getFatigueMin() { return this.system.sante.endurance.max - this.system.sante.endurance.value }

  malusFatigue() {
@@ -116,6 +116,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
      blessure: blessure
    });
  }
+
  /* -------------------------------------------- */
  async santeIncDec(name, inc, isCritique = false) {
    if (name == 'fatigue' && !ReglesOptionnelles.isUsing("appliquer-fatigue")) {
@@ -161,7 +162,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    if (ReglesOptionnelles.isUsing("appliquer-fatigue") && sante.fatigue && fatigue > 0) {
      sante.fatigue.value = Math.max(sante.fatigue.value + fatigue, this.getFatigueMin());
    }
-    await this.update({ "system.sante": sante })
+    await this.update({ "system.sante": sante }, { render: true })
    if (this.isDead()) {
      await this.setEffect(STATUSES.StatusComma, true);
    }
@@ -179,6 +180,28 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    return Math.max(0, Math.min(maxEndVie, maxEndGraves, maxEndCritiques));
  }

+  async onCreateItem(item, options, id) {
+    switch (item.type) {
+      case ITEM_TYPES.blessure:
+        await this.changeBleedingState()
+        break
+    }
+    await super.onCreateItem(item, options, id)
+  }
+
+  async onUpdateItem(item, options, id) {
+    switch (item.type) {
+      case ITEM_TYPES.blessure:
+        await this.changeBleedingState()
+        break
+    }
+    await super.onUpdateItem(item, options, id)
+  }
+
+  async changeBleedingState() {
+    const bleeding = this.itemTypes[ITEM_TYPES.blessure].find(it => it.isBleeding())
+    await this.setEffect(STATUSES.StatusBleeding, bleeding ? true : false)
+  }

  /* -------------------------------------------- */
  async ajouterBlessure(encaissement, attackerToken = undefined) {
@@ -195,7 +218,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
    const endActuelle = this.getEnduranceActuelle();
    const blessure = await RdDItemBlessure.createBlessure(this, encaissement.gravite, encaissement.dmg?.loc.label ?? '', attackerToken);
    if (blessure.isCritique()) {
-      encaissement.endurance = endActuelle;
+      encaissement.endurance = endActuelle
    }

    if (blessure.isMort()) {
@@ -292,7 +315,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
  }

  isSonne() {
-    return this.getEffect(STATUSES.StatusStunned)
+    return this.getEffectsByStatus(STATUSES.StatusStunned).length > 0
  }

  isEffectAllowed(effectId) { return true }
--- a/module/actor/base-actor-sheet.js
+++ b/module/actor/base-actor-sheet.js
@@ -5,9 +5,9 @@ import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { Monnaie } from "../item-monnaie.js";
 import { ITEM_TYPES } from "../constants.js";
 import { RdDItem } from "../item.js";
-import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
 import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
 import { ItemAction } from "../item/item-actions.js";
+import { RdDItemCompetenceCreature } from "../item-competencecreature.js";

 /* -------------------------------------------- */
 /**
@@ -49,14 +49,14 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
    formData.calc = {
      fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
-      encTotal: await this.actor.computeEncTotal(),
+      encTotal: this.actor.getEncTotal(),
    }

    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
    this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
    formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
-      .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
+      .forEach(it => it.isdommages = it.isDommages())

    return formData;
  }
@@ -229,14 +229,6 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
    return position;
  }

-
-  /* -------------------------------------------- */
-  /** @override */
-  _updateObject(event, formData) {
-    // Update the Actor
-    return this.actor.update(formData);
-  }
-
  async splitItem(item) {
    const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
    dialog.render(true);
--- a/module/actor/base-actor.js
+++ b/module/actor/base-actor.js
@@ -1,6 +1,6 @@
 import { ChatVente } from "../achat-vente/chat-vente.js";
 import { ChatUtility } from "../chat-utility.js";
-import { SYSTEM_SOCKET_ID } from "../constants.js";
+import { renderTemplate, SYSTEM_SOCKET_ID } from "../constants.js";
 import { Grammar } from "../grammar.js";
 import { Monnaie } from "../item-monnaie.js";
 import { ITEM_TYPES } from "../constants.js";
@@ -9,6 +9,8 @@ import { RdDAudio } from "../rdd-audio.js";
 import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { SystemCompendiums } from "../settings/system-compendiums.js";
+import { RdDItem } from "../item.js";
+import { StatusEffects, STATUSES } from "../settings/status-effects.js";

 export class RdDBaseActor extends Actor {

@@ -27,6 +29,7 @@ export class RdDBaseActor extends Actor {
    }
    return entry && entry.length > 0 ? carac[entry[0]] : undefined;
  }
+
  static getDefaultValue(actorType, path) {
    if (path.includes('.')) {
      path = path.split('.')
@@ -43,8 +46,10 @@ export class RdDBaseActor extends Actor {
  }

  static init() {
+    Handlebars.registerHelper('actor-isFeminin', actor => actor.isFeminin())
    Hooks.on("preUpdateItem", (item, change, options, id) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
    Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
+    Hooks.on("updateItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onUpdateItem(item, options, id))
    Hooks.on("deleteItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onDeleteItem(item, options, id))
    Hooks.on("updateActor", (actor, change, options, actorId) => Misc.documentIfResponsible(actor)?.onUpdateActor(change, options, actorId))
  }
@@ -210,11 +215,15 @@ export class RdDBaseActor extends Actor {
    return game.users.players.find(player => player.active && player.character?.id == this.id);
  }

-  isCreatureEntite() { return this.isCreature() || this.isEntite() }
+  isCreatureOuEntite() { return this.isCreature() || this.isEntite() }
  isCreature() { return false }
-  isEntite(typeentite = []) { return false }
+  isEntite() { return false }
+  isEntiteIncarnee() { return false }
+  isEntiteNonIncarnee() { return false }
+  isHautRevant() { return false }
  isVehicule() { return false }
  isPersonnage() { return false }
+  isFeminin() { return false }
  getItem(id, type = undefined) {
    const item = this.items.get(id);
    if (type == undefined || (item?.type == type)) {
@@ -234,20 +243,76 @@ export class RdDBaseActor extends Actor {

  getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
  getEncombrementMax() { return 0 }
+  isSurenc() { return false }
+
+  /* -------------------------------------------- */
+  isEffectAllowed(effectId) { return false }
+
+  getEffects(filter = e => true, forceRequise = undefined) {
+    const effects = this.getEmbeddedCollection("ActiveEffect")
+    const selected = effects.filter(filter)
+    if (forceRequise && this.isForceInsuffisante(forceRequise)) {
+      selected.push(StatusEffects.prepareActiveEffect(STATUSES.StatusForceWeak))
+    }
+    return selected
+  }
+
+  getEffectsByStatus(effectId) {
+    return this.getEffects().filter(it => it.statuses.has(effectId))
+  }
+
+  async setEffect(effectId, status) {
+    if (this.isEffectAllowed(effectId)) {
+      const effects = this.getEffectsByStatus(effectId)
+      if (!status && effects.length > 0) {
+        await this.deleteEmbeddedDocuments('ActiveEffect', effects.map(it => it.id), { render: true })
+      }
+      if (status && effects.length == 0) {
+        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.prepareActiveEffect(effectId)], { render: true })
+      }
+    }
+  }
+
+  async removeEffect(id) {
+    this.removeEffects(it => it.id == id)
+  }
+
+  async removeEffects(filter = e => true) {
+    if (game.user.isGM) {
+      const effectsToRemove = this.getEffects(filter);
+      const ids = effectsToRemove.map(it => it.id);
+      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
+    }
+  }

  /* -------------------------------------------- */
  async updateCarac(caracName, to) {
  }
+
+  async onUpdateActor(change, options, actorId) {
+    const updatedCarac = change?.system?.carac
+    if (updatedCarac && (updatedCarac.force || updatedCarac.reve || updatedCarac.taille)) {
+      console.log(' onUpdateActor', change, options, actorId)
+      await this.setEffect(STATUSES.StatusSurEnc, this.isSurenc())
+    }
+  }
+
  /* -------------------------------------------- */
  async onPreUpdateItem(item, change, options, id) { }
-  async onCreateItem(item, options, id) { }
-  async onUpdateActor(update, options, actorId) { }
+
+  async onCreateItem(item, options, id) {
+  }
+
+  async onUpdateItem(item, options, id) {
+  }
+
  async onDeleteItem(item, options, id) {
    if (item.isInventaire()) {
      await this._removeItemFromConteneur(item)
    }
  }

+
  async _removeItemFromConteneur(item) {
    const updates = this.items.filter(it => it.isConteneur() && it.system.contenu.includes(item.id))
      .map(conteneur => {
@@ -496,15 +561,22 @@ export class RdDBaseActor extends Actor {

  /* -------------------------------------------- */
  async computeEncTotal() {
-    if (!this.pack) {
-      this.encTotal = this.items.map(it => it.getEncTotal()).reduce(Misc.sum(), 0);
-      return this.encTotal;
+    if (this.pack) {
+      this.encTotal = 0
+    }
+    else {
+      const wasSurenc = this.isSurenc()
+      this.encTotal = this.items.filter(it => RdDItem.getItemTypesInventaire().includes(it.type))
+        .map(it => it.getEncTotal()).reduce(Misc.sum(), 0)
+      const isSurenc = this.isSurenc()
+      if (isSurenc != wasSurenc) {
+        await this.setEffect(STATUSES.StatusSurEnc, isSurenc)
+      }
    }
-    return 0;
  }

  getEncTotal() {
-    return Math.floor(this.encTotal ?? 0);
+    return Math.floor(this.encTotal ?? 0)
  }

  async createItem(type, name = undefined) {
@@ -555,7 +627,7 @@ export class RdDBaseActor extends Actor {
        }
      }
    }
-    await this.computeEncTotal();
+    await this.computeEncTotal()
    return result;
  }

@@ -734,7 +806,7 @@ export class RdDBaseActor extends Actor {
      name: this.getAlias(),
      system: { description: this.system.description }
    }
-    foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.hbs', chatData)
+    renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.hbs', chatData)
      .then(html => ChatMessage.create(RdDUtility.chatDataSetup(html, modeOverride)));
  }

@@ -742,6 +814,7 @@ export class RdDBaseActor extends Actor {
    ui.notifications.info(`${this.getAlias()} ne peut pas faire cette action: ${action}`)
  }

+  isAlcoolise() { return false }
  async jetEthylisme() { this.actionImpossible("jet d'éthylisme") }
  async rollAppelChance() { this.actionImpossible("appel à la chance") }
  async jetDeMoral() { this.actionImpossible("jet de moral") }
@@ -754,18 +827,25 @@ export class RdDBaseActor extends Actor {
  isActorCombat() { return false }
  getCaracInit(competence) { return 0 }

-  listActionsCombat() { return [] }
+  listAttaques() {
+    return this.listActions({ isAttaque: true, isEquipe: false })
+  }
+
+  listActions({ isAttaque = false, isEquipe = false }) { return [] }
+
  listActionsPossessions() {
    return this.itemTypes[ITEM_TYPES.possession]
      .map(p => {
        return {
-          name: p.name,
+          label: p.name,
          action: 'possession',
-          system: {
-            competence: p.name,
-            possessionid: p.system.possessionid,
-          }
+          possessionid: p.system.possessionid,
        }
      })
  }
+  listActionsCombat() {
+    const possessions = this.listActionsPossessions()
+    return possessions.length > 0 ? possessions : this.listActions({})
+
+  }
 }
--- a/module/actor/creature.js
+++ b/module/actor/creature.js
@@ -1,6 +1,4 @@
-import { Grammar } from "../grammar.js";
 import { ITEM_TYPES } from "../constants.js";
-import { LIST_CARAC_AUTRES } from "../rdd-carac.js";
 import { RdDBaseActorSang } from "./base-actor-sang.js";

 export class RdDCreature extends RdDBaseActorSang {
@@ -45,5 +43,4 @@ export class RdDCreature extends RdDBaseActorSang {
    }
    return undefined
  }
-
 }
--- a/module/actor/entite-sheet.js
+++ b/module/actor/entite-sheet.js
@@ -43,7 +43,7 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
    this.html.find('.resonance-add').click(async event =>
      await DialogSelect.select({
        label: "Choisir un acteur à accorder",
-        list: game.actors.filter(it => it.isPersonnage() && it.prototypeToken.actorLink)
+        list: game.actors.filter(it => true)
      },
        it => this.resonanceAdd(it.id))
    )
--- a/module/actor/entite.js
+++ b/module/actor/entite.js
@@ -1,5 +1,6 @@
-import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
+import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
 import { ITEM_TYPES } from "../constants.js";
+import { RdDItemBlessure } from "../item/blessure.js";
 import { Misc } from "../misc.js";
 import { RdDCarac } from "../rdd-carac.js";
 import { RdDEncaisser } from "../rdd-roll-encaisser.js";
@@ -16,11 +17,10 @@ export class RdDEntite extends RdDBaseActorReve {
    return item.type == ITEM_TYPES.competencecreature
  }

-  isEntite(typeentite = []) {
-    return (typeentite.length == 0 || typeentite.includes(this.system.definition.typeentite));
-  }
-
-  isNonIncarnee() { return this.isEntite([ENTITE_NONINCARNE]) }
+  isEntite() { return true }
+  isEntiteNonIncarnee() { return this.system.definition.typeentite == ENTITE_NONINCARNE }
+  isEntiteIncarnee() { return [ENTITE_INCARNE, ENTITE_BLURETTE].includes(this.system.definition.typeentite) }
+  isEntiteBlurette() { return this.system.definition.typeentite !== ENTITE_BLURETTE }

  getReveActuel() {
    return Misc.toInt(this.system.carac.reve?.value)
@@ -49,20 +49,20 @@ export class RdDEntite extends RdDBaseActorReve {
  }

  async remiseANeuf() {
-    await this.removeEffects(e => true);
-    if (!this.isNonIncarnee()) {
+    if (!this.isEntiteNonIncarnee()) {
      await this.update({
        'system.sante.endurance.value': this.system.sante.endurance.max
      });
    }
+    await this.removeEffects(e => true)
  }

  isDead() {
-    return this.isNonIncarnee() ? false : this.system.sante.endurance.value <= 0
+    return this.isEntiteNonIncarnee() ? false : this.system.sante.endurance.value <= 0
  }

  async santeIncDec(name, inc, isCritique = false) {
-    if (name == 'endurance' && !this.isNonIncarnee()) {
+    if (name == 'endurance' && !this.isEntiteNonIncarnee()) {
      const oldValue = this.system.sante.endurance.value;
      const endurance = Math.max(0,
        Math.min(oldValue + inc,
@@ -78,7 +78,7 @@ export class RdDEntite extends RdDBaseActorReve {
  }

  async encaisser() {
-    if (this.isNonIncarnee()) {
+    if (this.isEntiteNonIncarnee()) {
      return
    }
    await RdDEncaisser.encaisser(this)
@@ -89,15 +89,19 @@ export class RdDEntite extends RdDBaseActorReve {
  }

  async onAppliquerJetEncaissement(encaissement, attackerToken) {
+    if (this.isEntiteNonIncarnee()) {
+      return
+    }
    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
    foundry.utils.mergeObject(encaissement, {
      resteEndurance: perteEndurance.newValue,
-      endurance: perteEndurance.perte
-    });
+      endurance: perteEndurance.perte,
+      blessure: RdDItemBlessure.prepareBlessure(encaissement.gravite, encaissement.dmg?.loc.label ?? '', attackerToken)
+    })
  }

  isEntiteAccordee(attacker) {
-    if (this.isEntite([ENTITE_INCARNE])) {
+    if (this.isEntiteIncarnee()) {
      let resonnance = this.system.sante.resonnance
      return (resonnance.actors.find(it => it == attacker.id))
    }
@@ -106,7 +110,7 @@ export class RdDEntite extends RdDBaseActorReve {

  /* -------------------------------------------- */
  async setEntiteReveAccordee(actor) {
-    if (this.isEntite([ENTITE_INCARNE])) {
+    if (this.isEntiteIncarnee()) {
      if (this.system.sante.resonnance.actors.find(it => it == actor.id)) {
        // déjà accordé
        return
--- a/module/actor/experience-log.js
+++ b/module/actor/experience-log.js
@@ -29,7 +29,7 @@ export class ExperienceLog {
    };
    console.log('ExperienceLog.add', newXpLog)
    const newExperienceLog = (actor.system.experiencelog ?? []).concat([newXpLog]);
-    await actor.update({ [`system.experiencelog`]: newExperienceLog });
+    await actor.update({ [`system.experiencelog`]: newExperienceLog }, { noHook: true });
  }

  static labelTopic(topic) {
--- a/module/actor/export-scriptarium/actor-encart-sheet.js
+++ b/module/actor/export-scriptarium/actor-encart-sheet.js
@@ -3,12 +3,13 @@ import { SYSTEM_RDD } from "../../constants.js";
 import { Misc } from "../../misc.js";
 import { EXPORT_CSV_SCRIPTARIUM, OptionsAvancees } from "../../settings/options-avancees.js";
 import { ExportScriptarium } from "./export-scriptarium.js";
-import { CATEGORIES_COMPETENCES, CATEGORIES_DRACONIC, Mapping } from "./mapping.js";
+import { CATEGORIES_COMPETENCES_BASE, CATEGORIES_DRACONIC, Mapping } from "./mapping.js";

 export class RdDActorExportSheet extends RdDActorSheet {
  static init() {
    foundry.applications.handlebars.loadTemplates([
      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs",
+      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme-titre.hbs",
      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/blessure.hbs",
      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/blessures.hbs",
      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac.hbs",
@@ -41,8 +42,9 @@ export class RdDActorExportSheet extends RdDActorSheet {
    const formData = await super.getData()
    // Add any structured, precomputed list of data
    formData.context = Mapping.prepareContext(this.actor)
+    formData.attaques = this.actor.listActionsAttaque()
    formData.export = this.getMappingValues(formData.context, this.actor)
-    formData.competences = this.getCompetences(CATEGORIES_COMPETENCES)
+    formData.competences = this.getCompetences(CATEGORIES_COMPETENCES_BASE)
    formData.draconic = this.getCompetences(CATEGORIES_DRACONIC)
    const legeres = this.actor.nbBlessuresLegeres()
    const graves = this.actor.nbBlessuresGraves()
--- a/module/actor/export-scriptarium/mapping.js
+++ b/module/actor/export-scriptarium/mapping.js
@@ -1,15 +1,15 @@
 import { Grammar } from "../../grammar.js"
-import { RdDItemArme } from "../../item-arme.js"
+import { EMPOIGNADE, RdDItemArme } from "../../item/arme.js"
 import { RdDItemCompetence } from "../../item-competence.js"
 import { RdDItemSort } from "../../item-sort.js"
-import { ITEM_TYPES } from "../../constants.js"
+import { ITEM_TYPES, RDD_CONFIG } from "../../constants.js"
 import { Misc } from "../../misc.js"
 import { RdDTimestamp } from "../../time/rdd-timestamp.js"
 import { RdDBonus } from "../../rdd-bonus.js"
 import { TMRType } from "../../tmr-utility.js"


-export const CATEGORIES_COMPETENCES = [
+export const CATEGORIES_COMPETENCES_BASE = [
  "generale",
  "particuliere",
  "specialisee",
@@ -88,7 +88,7 @@ const MAPPING_BASE = [
  { column: "endurance_actuel", rollClass: 'jet-endurance', getter: (actor, context) => actor.system.sante.endurance.value },
  { column: "esquive", getter: (actor, context) => Mapping.getEsquive(context) },
  { column: "esquive_armure", getter: (actor, context) => Mapping.getEsquiveArmure(context) },
-  { column: "competences", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_COMPETENCES) },
+  { column: "competences", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_COMPETENCES_BASE) },
  { column: "draconic", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_DRACONIC) },
 ]

@@ -141,10 +141,10 @@ export class Mapping {

  static prepareArmes(actor) {
    const armes = actor.items.filter(it => it.type == ITEM_TYPES.arme)
-    armes.push(RdDItemArme.corpsACorps(actor));
+    armes.push(RdDItemArme.pugilat(actor));
    armes.push(RdDItemArme.empoignade(actor));
    return armes.map(arme => [
-      arme.system.unemain ? Mapping.prepareArme(actor, arme, 'unemain') : undefined,
+      arme.system.unemain ? Mapping.prepareArme(actor, arme, '(1 main)') : undefined,
      arme.system.deuxmains ? Mapping.prepareArme(actor, arme, 'deuxmains') : undefined,
      !(arme.system.unemain || arme.system.deuxmains) ? Mapping.prepareArme(actor, arme, 'competence') : undefined,
      arme.system.lancer != "" ? Mapping.prepareArme(actor, arme, 'lancer') : undefined,
@@ -160,7 +160,7 @@ export class Mapping {
      return undefined
    }
    const categorie = Mapping.complementCategorie(arme, maniement)
-    const dommages = Mapping.dommagesArme(actor, arme, maniement)
+    const dommages = Mapping.dommages(actor, arme, maniement)
    return {
      name: arme.name + categorie,
      niveau: Misc.toSignedString(competence.system.niveau),
@@ -170,12 +170,13 @@ export class Mapping {
      arme: arme
    }
  }
-  static dommagesArme(actor, arme, maniement) {
+
+  static dommages(actor, arme, maniement) {
    const dmgArme = RdDItemArme.dommagesReels(arme, maniement)
    const dommages = Misc.toSignedString(dmgArme + RdDBonus.bonusDmg(actor, maniement, dmgArme))
    switch (arme.system.mortalite) {
-      case 'non-mortel': return `(${dommages})`
-      case 'empoignade': return '-'
+      case RDD_CONFIG.encaissement.nonmortel: return `(${dommages})`
+      case RDD_CONFIG.encaissement.empoignade: return '-'
    }
    return dommages
  }
@@ -256,8 +257,8 @@ export class Mapping {
  static descriptionSort(sort) {
    const ptSeuil = Array(sort.system.coutseuil).map(it => '*')
    const caseTMR = sort.system.caseTMRspeciale.length > 0 ? Mapping.toVar(sort.system.caseTMRspeciale) : Misc.upperFirst(TMRType[sort.system.caseTMR].name)
-    const coutReve = 'r' + RdDItemSort.addSpaceToNonNumeric(sort.system.ptreve)
-    const diff = 'R' + RdDItemSort.addSpaceToNonNumeric(sort.system.difficulte)
+    const coutReve =RdDItemSort.coutReve(sort)
+    const diff = RdDItemSort.diffReve(sort)
    return `${sort.name}${ptSeuil} (${caseTMR}) ${diff} ${coutReve}`
  }
  static toVar(caseSpeciale) {
@@ -274,11 +275,10 @@ export class Mapping {
  }

  static getDescription(actor) {
-    const sexe = actor.system.sexe
-    const sexeFeminin = sexe.length > 0 && sexe.charAt(0).toLowerCase() == 'f' ? 'Née' : 'Né'
+    const naissance = actor.isFeminin() ? 'née' : 'né'
    const race = ['', 'humain'].includes(Grammar.toLowerCaseNoAccent(actor.system.race)) ? '' : (actor.system.race + ' ')
    const heure = actor.system.heure
-    const hn = `${sexeFeminin} à l'heure ${RdDTimestamp.definition(heure).avecArticle}`
+    const hn = `${naissance} à l'heure ${RdDTimestamp.definition(heure).avecArticle}`
    const age = (actor.system.age && actor.system.age >0) ? `${actor.system.age} ans` : undefined
    const taille = actor.system.taille
    const poids = actor.system.poids
--- a/module/actor/random/app-personnage-aleatoire.js
+++ b/module/actor/random/app-personnage-aleatoire.js
@@ -20,14 +20,15 @@ const PATHS = [
 const RANDOM_VALUES = {
  'system.sexe': { 'masculin': 1, 'féminin': 1 },
  'system.main': { 'droitier': 51, 'gaucher': 15, 'ambidextre': 6 },
-  'system.cheveux': { 'noirs': 2, 'bruns': 5, 'châtains clair': 5, 'blonds': 4, 'blonds très clair': 1, 'roux carotte': 1, 'roux cuivré': 3 },
-  'system.yeux': { 'noirs': 2, 'noisettes': 3, 'bruns vert': 4, 'verts': 3, 'bleus clair': 3, 'bleus gris': 2, 'gris': 1, 'mauves': 1, 'indigos': 1 },
+  'system.cheveux': { 'noirs': 2, 'bruns': 5, 'châtains': 3, 'châtain clair': 5, 'blonds': 4, 'blond platine': 1, 'roux carotte': 1, 'roux cuivré': 3, 'chauve': 1 },
+  'system.yeux': { 'noirs': 2, 'noisette': 3, 'brun-vert': 4, 'verts': 3, 'bleu clair': 3, 'bleu gris': 2, 'gris': 1, 'mauves': 1, 'indigos': 1 },
 }

 export class AppPersonnageAleatoire extends FormApplication {
  static preloadHandlebars() {
    foundry.applications.handlebars.loadTemplates([
      'systems/foundryvtt-reve-de-dragon/templates/actor/random/champ-aleatoire.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/random/sexe-aleatoire.hbs',
    ])
  }

@@ -49,14 +50,14 @@ export class AppPersonnageAleatoire extends FormApplication {
    this.current = foundry.utils.duplicate(actor)
    this.checked = {
      'name': false,
-      'system.sexe': true,
-      'system.age': true,
-      'system.taille': true,
-      'system.poids': true,
-      'system.main': true,
-      'system.heure': true,
-      'system.cheveux': true,
-      'system.yeux': true
+      'system.sexe': (this.actor.system.sexe ?? '') == '',
+      'system.age': this.actor.system.age == 0,
+      'system.taille': (this.actor.system.taille ?? '') == '',
+      'system.poids': (this.actor.system.poids ?? '') == '',
+      'system.main': (this.actor.system.main ?? '') == '',
+      'system.heure': (this.actor.system.heure ?? '') == '',
+      'system.cheveux': (this.actor.system.cheveux ?? '') == '',
+      'system.yeux': (this.actor.system.yeux ?? '') == '',
    }
  }

@@ -76,6 +77,8 @@ export class AppPersonnageAleatoire extends FormApplication {
    this.html.find("button.button-apply").click(async event => await this.onApply())
    this.html.find("input.current-value").change(async event => await this.onChange(event))
    this.html.find("div.random-field[data-path='system.heure'] select.current-value").change(async event => await this.onChange(event))
+    this.html.find('a[data-action="sexe-masculin"]').click(async event => await this.onSexe('masculin'))
+    this.html.find('a[data-action="sexe-feminin"]').click(async event => await this.onSexe('féminin'))
    this.html.find("a.random").click(async event => await this.onRandom(event))
    this.html.find("a.reset").click(async event => await this.onReset(event))
    this.html.find("a.randomize-selected").click(async event => await this.onRandomizeSelected())
@@ -96,6 +99,10 @@ export class AppPersonnageAleatoire extends FormApplication {
    const fields = this.html.find(selector).parents("div.random-field:first")
    return fields[0].attributes['data-path'].value
  }
+  async onSexe(sexe) {
+    this.current['system.sexe'] = sexe
+    this.render()
+  }

  async onChange(event) {
    const path = this.getPath(event.currentTarget)
@@ -180,8 +187,9 @@ export class AppPersonnageAleatoire extends FormApplication {
    const variation = Math.floor((caracTaille.poidsMax - caracTaille.poidsMin + base / 5) / 2)
    const total = await RdDDice.rollTotal(`2d${variation} + ${base}`)
    const cm = total % 100
+    const dm = cm < 10 ? '0' : ''
    const m = (total - cm) / 100
-    return `${m}m${cm}`
+    return `${m}m${dm}${cm}`
  }


--- a/module/apps/textroll/text-roll-formatter.js
+++ b/module/apps/textroll/text-roll-formatter.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "../../constants.js";

 export class TextRollManager {

--- a/module/chat-utility.js
+++ b/module/chat-utility.js
@@ -1,5 +1,5 @@
 import { Misc } from "./misc.js";
-import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { renderTemplate, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";

@@ -83,8 +83,8 @@ export class ChatUtility {
  }

  /* -------------------------------------------- */
-  static async createChatWithRollMode(messageData, actor = undefined) {
-    switch (game.settings.get("core", "rollMode")) {
+  static async createChatWithRollMode(messageData, actor = undefined, rollMode = game.settings.get("core", "rollMode")) {
+    switch (rollMode) {
      case "blindroll": // GM only
        if (!game.user.isGM) {
          ChatUtility.blindMessageToGM(messageData)
@@ -106,6 +106,25 @@ export class ChatUtility {
    return await ChatMessage.create(messageData)
  }

+  static tellToUser(message) {
+    ChatMessage.create({ content: message, user: game.user.id, whisper: [game.user.id] });
+  }
+
+  static tellToGM(message) {
+    ChatMessage.create({
+      user: game.user.id,
+      content: message,
+      whisper: ChatUtility.getGMs()
+    });
+  }
+
+  static tellToUserAndGM(message) {
+    ChatMessage.create({
+      user: game.user.id,
+      content: message,
+      whisper: ChatUtility.getUserAndGMs()
+    })
+  }
  static getOwners(document) {
    return document ? game.users.filter(it => document.getUserLevel(it) == CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER) : [game.user]
  }
@@ -190,15 +209,19 @@ export class ChatUtility {
    if (rddTimestamp) {
      const timestamp = new RdDTimestamp(rddTimestamp);
      const timestampData = timestamp.toCalendrier();
-      const dateHeure = await foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
-      $(html).find('header.message-header .message-sender').after(dateHeure)
+      const dateHeure = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
+      $(html).find('header.message-header .message-timestamp').after(dateHeure)
    }
  }

  static async onCreateChatMessage(chatMessage, options, id) {
    if (chatMessage.isAuthor) {
-      await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
+      await ChatUtility.setTimestamp(chatMessage)
      await chatMessage.update({ content: await RdDTextEditor.enrichHTML(chatMessage.content, undefined, { showLink: false }) })
    }
  }
+
+  static async setTimestamp(chatMessage) {
+    await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
+  }
 }
--- a/module/coeur/rdd-coeur.js
+++ b/module/coeur/rdd-coeur.js
@@ -1,5 +1,6 @@
 import { RdDBaseActor } from "../actor/base-actor.js";
 import { ChatUtility } from "../chat-utility.js";
+import { renderTemplate } from "../constants.js";

 const INFO_COEUR = 'info-coeur';

--- a/module/constants.js
+++ b/module/constants.js
@@ -9,47 +9,67 @@ export const ENTITE_INCARNE = 'incarne'
 export const ENTITE_NONINCARNE = 'nonincarne'
 export const ENTITE_BLURETTE = 'blurette'

+export const renderTemplate = foundry.applications.handlebars.renderTemplate
+
 export const RDD_CONFIG = {
-  niveauEthylisme : [
-    {value: "1", label: "Aucun"},
-    {value: "0", label: "Eméché (0)"},
-    {value: "-1", label: "Gris (-1)"},
-    {value: "-2", label: "Pinté (-2)"},
-    {value: "-3", label: "Pas Frais (-3)"},
-    {value: "-4", label: "Ivre (-4)"},
-    {value: "-5", label: "Bu (-5)"},
-    {value: "-6", label: "Complètement fait (-6)"},
-    {value: "-7", label: "Ivre mort (-7)"}
+  niveauEthylisme: [
+    { value: '1', label: 'Aucun' },
+    { value: '0', label: 'Eméché (0)' },
+    { value: '-1', label: 'Gris (-1)' },
+    { value: '-2', label: 'Pinté (-2)' },
+    { value: '-3', label: 'Pas Frais (-3)' },
+    { value: '-4', label: 'Ivre (-4)' },
+    { value: '-5', label: 'Bu (-5)' },
+    { value: '-6', label: 'Complètement fait (-6)' },
+    { value: '-7', label: 'Ivre mort (-7)' }
  ],
  categorieEntite: {
-    "cauchemar": "Cauchemar",
-    "reve": "Rêve"
+    'cauchemar': 'Cauchemar',
+    'reve': 'Rêve'
  },
  typeEntite: {
-    "incarne": "Incarnée",
-    "nonincarne": "Non Incarnée",
-    "blurette": "Blurette"
+    [ENTITE_INCARNE]: 'Incarnée',
+    [ENTITE_NONINCARNE]: 'Non Incarnée',
+    [ENTITE_BLURETTE]: 'Blurette'
  },
-  heuresRdD : [
-    {value : "vaisseau", label: "Vaisseau", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd01.webp"},
-    {value : "sirene", label: "Sirène", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd02.webp"},
-    {value : "faucon", label: "Faucon", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd03.webp"},
-    {value : "couronne", label: "Couronne", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd04.webp"},
-    {value : "dragon", label: "Dragon", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd05.webp"},
-    {value : "epees", label: "Epées", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd06.webp"},
-    {value : "lyre", label: "Lyre", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd07.webp"},
-    {value : "serpent", label: "Serpent", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd08.webp"},
-    {value : "poissonacrobate", label: "Poisson Acrobate", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd09.webp"},
-    {value : "araignee", label: "Araignée", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd10.webp"},
-    {value : "roseau", label: "Roseau", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd11.webp"},
-    {value : "chateaudormant", label: "Chateau Dormant", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd12.webp"}    
+  heuresRdD: [
+    { value: 'vaisseau', label: 'Vaisseau', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd01.webp' },
+    { value: 'sirene', label: 'Sirène', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd02.webp' },
+    { value: 'faucon', label: 'Faucon', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd03.webp' },
+    { value: 'couronne', label: 'Couronne', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd04.webp' },
+    { value: 'dragon', label: 'Dragon', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd05.webp' },
+    { value: 'epees', label: 'Epées', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd06.webp' },
+    { value: 'lyre', label: 'Lyre', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd07.webp' },
+    { value: 'serpent', label: 'Serpent', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd08.webp' },
+    { value: 'poissonacrobate', label: 'Poisson Acrobate', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd09.webp' },
+    { value: 'araignee', label: 'Araignée', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd10.webp' },
+    { value: 'roseau', label: 'Roseau', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd11.webp' },
+    { value: 'chateaudormant', label: 'Chateau Dormant', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.webp' }
  ],
  raretes: [
-    {value: "Commune", label: "Commune"},
-    {value: "Frequente", label: "Fréquente"},
-    {value: "Rare", label: "Rare"},
-    {value: "Rarissime", label: "Rarissime"}
-  ]
+    { value: 'Commune', label: 'Commune' },
+    { value: 'Frequente', label: 'Fréquente' },
+    { value: 'Rare', label: 'Rare' },
+    { value: 'Rarissime', label: 'Rarissime' }
+  ],
+  particuliere: {
+    force: { key: 'force', descr: 'en force', img: 'systems/foundryvtt-reve-de-dragon/assets/ui/part-force.svg' },
+    finesse: { key: 'finesse', descr: 'en finesse', img: 'systems/foundryvtt-reve-de-dragon/assets/ui/part-finesse.svg' },
+    rapidite: { key: 'rapidite', descr: 'en rapidité', img: 'systems/foundryvtt-reve-de-dragon/assets/ui/part-rapidite.svg' },
+  },
+  icons: {
+    armesDisparates: 'systems/foundryvtt-reve-de-dragon/assets/actions/armes-disparates.svg',
+    demiReve: 'systems/foundryvtt-reve-de-dragon/assets/actions/sort.svg',
+    empoignade: 'systems/foundryvtt-reve-de-dragon/assets/actions/empoignade.svg',
+    forceWeak: 'systems/foundryvtt-reve-de-dragon/assets/actions/weak.svg',
+    surenc: 'systems/foundryvtt-reve-de-dragon/assets/actions/surenc.svg',
+  },
+  encaissement: {
+    mortel: 'mortel',
+    nonmortel: 'non-mortel',
+    entiteincarnee: 'entiteincarnee',
+    empoignade: 'empoignade'
+  }
 }

 export const ACTOR_TYPES = {
@@ -106,3 +126,4 @@ export const ITEM_TYPES = {
  nombreastral: 'nombreastral',
  extraitpoetique: 'extraitpoetique',
 }
+
--- a/module/dialog-choix-xp-carac.js
+++ b/module/dialog-choix-xp-carac.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "./constants.js"

 export class DialogChoixXpCarac extends Dialog {

--- a/module/dialog-chronologie.js
+++ b/module/dialog-chronologie.js
@@ -1,4 +1,4 @@
-import { SYSTEM_RDD } from "./constants.js";
+import { renderTemplate, SYSTEM_RDD } from "./constants.js";
 import { Grammar } from "./grammar.js";
 import { HtmlUtility } from "./html-utility.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
--- a/module/dialog-create-signedraconique.js
+++ b/module/dialog-create-signedraconique.js
@@ -1,4 +1,5 @@
 import { ChatUtility } from "./chat-utility.js";
+import { renderTemplate } from "./constants.js";
 import { HtmlUtility } from "./html-utility.js";
 import { RdDItemSigneDraconique } from "./item/signedraconique.js";
 import { TMRUtility } from "./tmr-utility.js";
--- a/module/dialog-fabriquer-potion.js
+++ b/module/dialog-fabriquer-potion.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "./constants.js";
 import { Misc } from "./misc.js";
 import { RdDUtility } from "./rdd-utility.js";

--- a/module/dialog-item-consommer.js
+++ b/module/dialog-item-consommer.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "./constants.js";
 import { Misc } from "./misc.js";

 export class DialogConsommer extends Dialog {
--- a/module/dialog-select.js
+++ b/module/dialog-select.js
@@ -1,3 +1,4 @@
+import { renderTemplate } from "./constants.js"

 export class DialogSelect extends Dialog {
  static extractIdNameImg(it) { return { id: it.id, name: it.name, img: it.img } }
--- a/module/dialog-split-item.js
+++ b/module/dialog-split-item.js
@@ -1,4 +1,4 @@
-import { Misc } from "./misc.js";
+import { renderTemplate } from "./constants.js";

 export class DialogSplitItem extends Dialog {

--- a/module/dialog-validation-encaissement.js
+++ b/module/dialog-validation-encaissement.js
@@ -1,4 +1,4 @@
-import { HIDE_DICE, SHOW_DICE } from "./constants.js";
+import { HIDE_DICE, renderTemplate, SHOW_DICE } from "./constants.js";
 import { RdDUtility } from "./rdd-utility.js";

 /**
@@ -7,18 +7,17 @@ import { RdDUtility } from "./rdd-utility.js";
 */
 export class DialogValidationEncaissement extends Dialog {

-  static async validerEncaissement(actor, rollData, armure, onEncaisser) {
-    const encaissement = await RdDUtility.jetEncaissement(actor, rollData, armure, { showDice: HIDE_DICE });
+  static async validerEncaissement(actor, dmg, armure, onEncaisser) {
+    const encaissement = await RdDUtility.jetEncaissement(actor, dmg, armure, { showDice: HIDE_DICE });
    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.hbs', {
      actor: actor,
-      rollData: rollData,
      encaissement: encaissement
    });
-    new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, onEncaisser).render(true);
+    new DialogValidationEncaissement(html, actor, dmg, armure, encaissement, onEncaisser).render(true);
  }

  /* -------------------------------------------- */
-  constructor(html, actor, rollData, armure, encaissement, onEncaisser) {
+  constructor(html, actor, dmg, armure, encaissement, onEncaisser) {
    // Common conf
    let buttons = {
      "valider": { label: "Valider", callback: html => this.onValider() },
@@ -42,11 +41,11 @@ export class DialogValidationEncaissement extends Dialog {
    super(dialogConf, dialogOptions);

    this.actor = actor
-    this.rollData = rollData;
-    this.armure = armure;
-    this.encaissement = encaissement;
-    this.onEncaisser = onEncaisser;
-    this.forceDiceResult = {total: encaissement.roll.result };
+    this.dmg = dmg
+    this.armure = armure
+    this.encaissement = encaissement
+    this.onEncaisser = onEncaisser
+    this.forceDiceResult = {total: encaissement.roll.result }
  }

  /* -------------------------------------------- */
@@ -55,14 +54,14 @@ export class DialogValidationEncaissement extends Dialog {
    this.html = html;
    this.html.find('input.encaissement-roll-result').keyup(async event => {
      this.forceDiceResult.total = event.currentTarget.value;
-      this.encaissement = await RdDUtility.jetEncaissement(this.actor, this.rollData, this.armure, { showDice: HIDE_DICE, forceDiceResult: this.forceDiceResult});
+      this.encaissement = await RdDUtility.jetEncaissement(this.actor, this.dmg, this.armure, { showDice: HIDE_DICE, forceDiceResult: this.forceDiceResult});
      this.html.find('label.encaissement-total').text(this.encaissement.total);
      this.html.find('label.encaissement-blessure').text(this.encaissement.blessures)
    });
  }

  async onValider() {
-    this.encaissement = await RdDUtility.jetEncaissement(this.actor, this.rollData, this.armure, { showDice: SHOW_DICE, forceDiceResult: this.forceDiceResult});
+    this.encaissement = await RdDUtility.jetEncaissement(this.actor, this.dmg, this.armure, { showDice: SHOW_DICE, forceDiceResult: this.forceDiceResult});
    this.onEncaisser(this.encaissement)
  }
 }
--- a/module/enchantement/dialog-enchanter.js
+++ b/module/enchantement/dialog-enchanter.js
@@ -1,11 +1,10 @@
-import { ITEM_TYPES } from "../constants.js"
+import { ITEM_TYPES, renderTemplate } from "../constants.js"
 import { RdDItemSort } from "../item-sort.js"
 import { Misc } from "../misc.js"

 export const ACTION_ITEM_ENCHANTER =  {
  code: 'item-enchanter', label: 'Enchanter', icon: it => 'fa-solid fa-sparkles',
-  filter: it => game.user.isGM || DialogEnchanter.isEnchantable(it),
-  optionsFilter: options => options.editable,
+  filter: it => game.user.isGM || DialogEnchanter.isEnchantable(it) && it.parent?.type != ACTOR_TYPES.commerce,
  action: (item, actor) => DialogEnchanter.enchanter(item)
 }

--- a/module/grammar.js
+++ b/module/grammar.js
@@ -22,7 +22,7 @@ export class Grammar {
  static equalsInsensitive(a, b) {
    return Grammar.toLowerCaseNoAccent(a) == Grammar.toLowerCaseNoAccent(b)
  }
-  
+
  static includesLowerCaseNoAccent(value, content) {
    return Grammar.toLowerCaseNoAccent(value)?.includes(Grammar.toLowerCaseNoAccent(content));
  }
--- a/module/initiative.mjs
+++ b/module/initiative.mjs
@@ -0,0 +1,66 @@
+export const MAP_PHASE = {
+  possession: { label: "possession", rang: 10 },
+  draconic: { label: "draconic", rang: 9 },
+  tir: { label: "tir", rang: 8 },
+  lancer: { label: "lancer", rang: 7 },
+  arme: { label: "mêlée", rang: 5 },
+  pugilat: { label: "pugilat", rang: 4 },
+  naturelle: { label: "créature", rang: 4 },
+  empoignade: { label: "empoignade", rang: 3 },
+  autre: { label: "autre action", rang: 2 },
+  demi: { label: "demi-surprise", rang: 0 },
+  totale: { label: "surprise totale", rang: -1 },
+}
+export const PHASE = Object.values(MAP_PHASE)
+
+export class RdDInitiative {
+
+  static getRollInitiative(caracValue, niveau, bonus = 0) {
+    const base = RdDInitiative.ajustementInitiative(caracValue, niveau, bonus)
+    return "1d6" + (base >= 0 ? "+" : "") + base
+  }
+
+  static ajustementInitiative(caracValue, niveau, bonus) {
+    return niveau + Math.floor(caracValue / 2) + bonus
+  }
+
+  static formule(phase, carac, niveau, bonusMalus) {
+    const ajustement = RdDInitiative.ajustementInitiative(carac, niveau, bonusMalus)
+    return { phase, ajustement }
+  }
+
+  static phaseArme(categorie, arme) {
+    switch (categorie) {
+      case "tir":
+      case "lancer":
+        return MAP_PHASE[categorie]
+      default:
+        switch (arme.system.cac) {
+          case "empoignade":
+          case "pugilat":
+          case "naturelle":
+            return MAP_PHASE[arme.system.cac]
+          default:
+            return MAP_PHASE['arme']
+        }
+    }
+  }
+
+  static phase(keyOrRang) {
+    return MAP_PHASE[keyOrRang] ?? PHASE.find(it => it.rang == keyOrRang) ?? MAP_PHASE.autre
+  }
+
+  static async roll(formule) {
+    const sign = formule.ajustement >= 0 ? "+" : ""
+    const roll = new Roll(`1d6 + ${sign} + ${formule.ajustement}`)
+    await roll.evaluate()
+    const value = Math.max(roll.total, 0)
+    return {
+      roll: roll,
+      value: value,
+      rang: formule.phase.rang,
+      init: formule.phase.rang + value / 100,
+      label: formule.phase.label
+    }
+  }
+} 
--- a/module/item-competence.js
+++ b/module/item-competence.js
@@ -1,6 +1,7 @@
+
 import { Grammar } from "./grammar.js";
 import { RdDItem } from "./item.js";
-import { SANS_COMPETENCE } from "./item/base-items.js";
+import { CATEGORIES_COMPETENCES, SANS_COMPETENCE } from "./item/base-items.js";
 import { Misc } from "./misc.js";

 const competenceTroncs = [["Esquive", "Dague", "Corps à corps"],
@@ -25,16 +26,6 @@ const limitesArchetypes = [
 ];

 /* -------------------------------------------- */
-export const CATEGORIES_COMPETENCES = {
-  "generale": { base: -4, label: "Générales" },
-  "particuliere": { base: -8, label: "Particulières" },
-  "specialisee": { base: -11, label: "Spécialisées" },
-  "connaissance": { base: -11, label: "Connaissances" },
-  "draconic": { base: -11, label: "Draconic" },
-  "melee": { base: -6, label: "Mêlée" },
-  "tir": { base: -8, label: "Tir" },
-  "lancer": { base: -8, label: "Lancer" }
-}

 function _buildCumulXP() {
  let cumulXP = { "-11": 0 };
@@ -49,7 +40,12 @@ function _buildCumulXP() {

 const competence_xp_cumul = _buildCumulXP();

-export class RdDItemCompetence extends Item {
+export class RdDItemCompetence extends RdDItem {
+
+  static get ITEM_TYPE() { return ITEM_TYPES.competence }
+
+  static get defaultIcon() { return "systems/foundryvtt-reve-de-dragon/icons/competence_defaut.webp" }
+
  /* -------------------------------------------- */
  static getLabelCategorie(category) {
    return CATEGORIES_COMPETENCES[category].label;
@@ -103,8 +99,8 @@ export class RdDItemCompetence extends Item {
  }

  /* -------------------------------------------- */
-  static isMalusEncombrementTotal(competence) {
-    return competence?.name.toLowerCase().match(/(natation|acrobatie)/) || 0;
+  static isMalusEncombrementTotal(competenceName) {
+    return competenceName?.toLowerCase().match(/(natation|acrobatie)/) || 0;
  }

  /* -------------------------------------------- */
--- a/module/item-competencecreature.js
+++ b/module/item-competencecreature.js
@@ -1,90 +1,76 @@
-
 import { ITEM_TYPES } from "./constants.js";
-import { Grammar } from "./grammar.js";
-import { RdDCombatManager } from "./rdd-combat.js";
-
-export const CATEGORIES_COMPETENCES_CREATURES = {
-  "generale": { base: 0, label: "Générale" },
-  "naturelle": { base: 0, label: "Arme naturelle" },
-  "melee": { base: 0, label: "Mêlée" },
-  "parade": { base: 0, label: "Parade" },
-  "tir": { base: 0, label: "Tir" },
-  "lancer": { base: 0, label: "Lancer" },
-  "possession": { base: 0, label: "Possession" },
-}
+import { RdDItem } from "./item.js";
+import { RdDInitiative } from "./initiative.mjs";
+import { RdDItemArme } from "./item/arme.js";

 /* -------------------------------------------- */
-export class RdDItemCompetenceCreature extends Item {
+export class RdDItemCompetenceCreature extends RdDItem {

-  /* -------------------------------------------- */
-  static setRollDataCreature(rollData) {
-    const code = Grammar.toLowerCaseNoAccentNoSpace(rollData.competence.name);
-    const selectedCarac = { code: code, label: rollData.competence.name, value: rollData.competence.system.carac_value };
-    rollData.carac = { [code]: selectedCarac }
-    rollData.competence.system.defaut_carac = code
-    rollData.selectedCarac = selectedCarac
-    rollData.arme = RdDItemCompetenceCreature.armeCreature(rollData.competence);
-  }
+  static get ITEM_TYPE() { return ITEM_TYPES.competencecreature }

-  /* -------------------------------------------- */
-  static armeCreature(item) {
-    const categorieAttaque = RdDItemCompetenceCreature.getCategorieAttaque(item)
+  static get defaultIcon() { return "systems/foundryvtt-reve-de-dragon/icons/competence_defaut.webp" }
+
+  isAttaque() { return this.getCategorieAttaque() != undefined }
+  isParade() { return this.system.iscombat && (this.system.categorie_parade ?? '') != '' }
+  isBouclier() { return this.system.categorie_parade.includes('bouclier') }
+  attaqueCreature() {
+    const categorieAttaque = this.getCategorieAttaque()
    if (categorieAttaque != undefined) {
-      // cloner pour ne pas modifier la compétence
-      return foundry.utils.mergeObject(item, {
-        action: item.isCompetencePossession() ? 'possession' : 'attaque',
-        system: {
-          competence: item.name,
-          cac: categorieAttaque == "naturelle" ? "naturelle" : "",
-          niveau: item.system.niveau,
-          initiative: RdDCombatManager.calculInitiative(item.system.niveau, item.system.carac_value),
-          equipe: true,
-          resistance: 100,
-          dommagesReels: item.system.dommages,
-          penetration: 0,
-          force: 0,
-          rapide: true,
-        }
-      }, { inplace: false, });
+      const initative = RdDInitiative.getRollInitiative(this.system.carac_value, this.system.niveau);
+      const attaque = {
+        label: this.name,
+        action: this.isCompetencePossession() ? 'possession' : 'attaque',
+        initOnly: false,
+        arme: new RdDItemArme({
+          name: this.name,
+          type: ITEM_TYPES.arme,
+          img: this.img,
+          system: {
+            competence: this.name,
+            cac: categorieAttaque == "naturelle" ? "naturelle" : "",
+            niveau: this.system.niveau,
+            initiative: initative,
+            mortalite: this.system.mortalite,
+            dommages: this.system.dommages,
+            forceRequise: 0,
+            equipe: true,
+            resistance: 100,
+            penetration: 0,
+            force: 0,
+            rapide: true,
+          }
+        }),
+        comp: this,
+        carac: { key: this.name, value: this.system.carac_value },
+        equipe: true,
+        mortalite: this.system.mortalite,
+        dommages: this.system.dommages,
+        //dmg: this.system.dommages,
+        initiative: initative
+      };
+      return attaque
    }
    return undefined;
  }

-  /* -------------------------------------------- */
-  static isAttaque(item) {
-    return RdDItemCompetenceCreature.getCategorieAttaque(item) != undefined
-  }
-
-  static getCategorieAttaque(item) {
-    if (item.type == ITEM_TYPES.competencecreature) {
-      switch (item.system.categorie) {
-        case "melee":
-        case "tir":
-        case "lancer":
-        case "naturelle":
-        case "possession":
-          return item.system.categorie
-      }
+  getCategorieAttaque() {
+    switch (this.system.categorie) {
+      case "melee":
+      case "tir":
+      case "lancer":
+      case "naturelle":
+      case "possession":
+        return this.system.categorie
    }
-    return undefined
  }

-  static isDommages(item) {
-    if (item.type == ITEM_TYPES.competencecreature) {
-      switch (item.system.categorie) {
-        case "melee":
-        case "tir":
-        case "lancer":
-        case "naturelle":
-          return true
-      }
-    }
-    return false
-  }
-
-  static isParade(item) {
-    if (item.type == ITEM_TYPES.competencecreature) {
-      return item.system.categorie_parade || item.system.isparade
+  isDommages() {
+    switch (this.system.categorie) {
+      case "melee":
+      case "tir":
+      case "lancer":
+      case "naturelle":
+        return true
    }
    return false
  }
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -1,7 +1,9 @@
 import { ACTOR_TYPES, ITEM_TYPES } from "./constants.js";
+
+import { RdDItem } from "./item.js";
+import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemSort } from "./item-sort.js";
 import { RdDUtility } from "./rdd-utility.js";
-import { RdDItemCompetence } from "./item-competence.js";
 import { HtmlUtility } from "./html-utility.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { SYSTEM_RDD } from "./constants.js";
@@ -9,8 +11,6 @@ import { RdDSheetUtility } from "./rdd-sheet-utility.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
 import { Misc } from "./misc.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
-import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
-import { RdDItem } from "./item.js";
 import { FLEUVE_COORD, TMRUtility } from "./tmr-utility.js";
 import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";
 import { ItemAction } from "./item/item-actions.js";
@@ -106,8 +106,8 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
    }

    if (this.item.type == ITEM_TYPES.competencecreature) {
-      formData.isparade = RdDItemCompetenceCreature.isParade(this.item)
-      formData.isdommages = RdDItemCompetenceCreature.isDommages(this.item)
+      formData.isparade = this.item.isParade()
+      formData.isdommages = this.item.isDommages()
    }
    if (this.item.type == ITEM_TYPES.tache ||
      this.item.type == ITEM_TYPES.livre ||
@@ -260,7 +260,7 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {

  /* -------------------------------------------- */
  /** @override */
-  _updateObject(event, formData) {
+  async _updateObject(event, formData) {
    switch (this.item.type) {
      case ITEM_TYPES.sort:
        formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheetV1._listCaseTmr(
@@ -273,8 +273,7 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
        formData['system.niveau'] = formData['system.niveau'] ?? formData['system.base']
        break
    }
-
-    return this.item.update(formData)
+    return await super._updateObject(event, formData)
  }

  /* -------------------------------------------- */
--- a/module/item-sort.js
+++ b/module/item-sort.js
@@ -16,13 +16,10 @@ export const VOIES_DRACONIC = [
 /* -------------------------------------------- */
 export class RdDItemSort extends Item {
  static preloadHandlebars() {
-    Handlebars.registerHelper('itemSort-spaceIfText', val => RdDItemSort.addSpaceToNonNumeric(val))
    Handlebars.registerHelper('itemSort-codeDraconic', voie => RdDItemSort.getCode(voie))
    Handlebars.registerHelper('itemSort-shortDraconic', voie => RdDItemSort.getShortVoie(voie))
-  }
-
-  static addSpaceToNonNumeric(value) {
-    return Number.isNumeric(value) || ['-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].includes(String(value).charAt[0]) ? value : ' ' + RdDItemSort.toVar(value)
+    Handlebars.registerHelper('itemSort-diffReve', sort => RdDItemSort.diffReve(sort))
+    Handlebars.registerHelper('itemSort-coutReve', sort => RdDItemSort.coutReve(sort))
  }

  static lancements(sort) { return sort?.system.lancements.length ?? 0 }
@@ -43,21 +40,44 @@ export class RdDItemSort extends Item {
    return value ? value.replace('variable', 'var') : ''
  }

+  static isSortOnCoord(sort, coord) {
+    let tmr = TMRUtility.getTMR(coord)
+    const caseTMR = sort.system.caseTMR.toLowerCase();
+    const caseTMRspeciale = sort.system.caseTMRspeciale.toLowerCase();
+
+    return caseTMR.includes('variable')
+      || caseTMRspeciale.includes('variable')
+      || (caseTMR == tmr.type)
+      || (caseTMR.includes('special') && caseTMRspeciale.includes(coord.toLowerCase()))
+  }
+
+  static getCaseTMR(sort) {
+    const caseTMR = sort.system.caseTMR.toLowerCase();
+    const caseTMRspeciale = sort.system.caseTMRspeciale.toLowerCase();
+    if (caseTMR.includes('variable') || caseTMRspeciale.includes('variable') || caseTMR.includes('special')) {
+      return sort.system.caseTMRspeciale
+    }
+    return sort.system.caseTMR
+  }
+
+
+  static diffReve(sort) { return RdDItemSort.toVar((sort.system.difficulte.match(/\-?(\d)+/) ? 'R' : 'R ') + sort.system.difficulte) }
+  static coutReve(sort) { return RdDItemSort.toVar((sort.system.ptreve.match(/(\d)+\+?/) ? 'r' : 'r ') + sort.system.ptreve) }
  static getDraconicsSort(competencesDraconic, sort) {
    // se baser sur la voie du sort?
    switch (Grammar.toLowerCaseNoAccent(sort.name)) {
      case "lecture d'aura":
      case "detection d'aura":
-        return competencesDraconic;
+        return competencesDraconic
      case "annulation de magie":
-        return competencesDraconic.filter(it => !RdDItemCompetence.isThanatos(it));
+        return competencesDraconic.filter(it => !RdDItemCompetence.isThanatos(it))
    }
    const voies = sort.system.draconic.split('/')
    return voies.map(voie => RdDItemCompetence.getVoieDraconic(competencesDraconic, voie))
  }

  static getBestDraconicSort(competencesDraconic, sort) {
-    return  RdDItemSort.getDraconicsSort(competencesDraconic, sort).sort(Misc.descending(it => it.system.niveau)).find(it=>true)
+    return RdDItemSort.getDraconicsSort(competencesDraconic, sort).sort(Misc.descending(it => it.system.niveau)).find(it => true)
  }

  static getOrdreCode(code) {
@@ -128,10 +148,17 @@ export class RdDItemSort extends Item {

  /* -------------------------------------------- */
  static incrementBonusCase(actor, sort, coord) {
+    let bonuscase = RdDItemSort.calculBonuscase(sort, coord)
+
+    actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': bonuscase }]);
+  }
+
+
+  static calculBonuscase(sort, coord) {
    if (TMRUtility.isFleuve(coord)) {
-      coord = FLEUVE_COORD;
+      coord = FLEUVE_COORD
    }
-    let list = RdDItemSort.stringToBonuscases(sort.system.bonuscase);
+    let list = RdDItemSort.stringToBonuscases(sort.system.bonuscase)
    const existing = list.find(it => it.case == coord)
    const bonus = Number(existing?.bonus ?? 0) + 1
    if (existing) {
@@ -140,11 +167,9 @@ export class RdDItemSort extends Item {
    else {
      list.push({ case: coord, bonus: 1 })
    }
-
-    actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': RdDItemSort.bonuscasesToString(list) }]);
+    return RdDItemSort.bonuscasesToString(list)
  }

-
  /* -------------------------------------------- */
  static getCaseBonus(sort, coord) {
    const search = TMRUtility.isFleuve(coord)
@@ -169,4 +194,22 @@ export class RdDItemSort extends Item {
      .map(it => it.split(':'))
      .map(it => { return { case: it[0], bonus: it[1] } });
  }
+
+  static prepareSortEnReserve(sort, draconic, ptreve, coord) {
+    return {
+      type: ITEM_TYPES.sortreserve,
+      name: sort.name,
+      img: sort.img,
+      system: { sortid: sort._id, draconic: (draconic?.name ?? sort.system.draconic), ptreve: ptreve, coord: coord, heurecible: 'Vaisseau' }
+    };
+  }
+
+  static prepareSortAddLancement(sort, reveSort) {
+    const precedents = sort.system.lancements ?? []
+    const lancements = [...precedents, {
+      timestamp: game.system.rdd.calendrier.getTimestamp(),
+      reve: reveSort
+    }]
+    return lancements
+  }
 }
--- a/module/item.js
+++ b/module/item.js
@@ -1,15 +1,14 @@
-import { ITEM_TYPES } from "./constants.js";
-import { DialogItemVente } from "./achat-vente/dialog-item-vente.js";
+import { ITEM_TYPES, RDD_CONFIG, renderTemplate } from "./constants.js";
+import { BASE_CORPS_A_CORPS, BASE_ESQUIVE, CATEGORIES_COMPETENCES, CATEGORIES_COMPETENCES_CREATURES } from "./item/base-items.js";
+import { ITEM_ACTIONS, DEFAULT_ACTIONS, COMMON_ACTIONS } from "./item/item-actions.js";
+
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
+import { DialogItemVente } from "./achat-vente/dialog-item-vente.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
 import { RdDRaretes } from "./item/raretes.js";
-import { CATEGORIES_COMPETENCES } from "./item-competence.js";
-import { CATEGORIES_COMPETENCES_CREATURES } from "./item-competencecreature.js";
-import { BASE_CORPS_A_CORPS, BASE_ESQUIVE } from "./item/base-items.js";
-import { ITEM_ACTIONS, DEFAULT_ACTIONS, COMMON_ACTIONS } from "./item/item-actions.js";

 const typesInventaireMateriel = [
  ITEM_TYPES.arme,
@@ -84,6 +83,7 @@ export const defaultItemImg = {

 /* -------------------------------------------- */
 export class RdDItem extends Item {
+  
  static get defaultIcon() {
    return undefined;
  }
@@ -95,12 +95,12 @@ export class RdDItem extends Item {
  static isFieldInventaireModifiable(type, field) {
    switch (field) {
      case 'quantite':
-        if ([ITEM_TYPES.conteneur].includes(type)) {
+        if (ITEM_TYPES.conteneur == type) {
          return false;
        }
        break;
      case 'cout':
-        if ([ITEM_TYPES.monnaie].includes(type)) {
+        if (ITEM_TYPES.monnaie == type) {
          return game.user.isGM;
        }
        break;
@@ -184,7 +184,10 @@ export class RdDItem extends Item {
  isMonnaie() { return this.type == ITEM_TYPES.monnaie; }
  isNourritureBoisson() { return this.type == ITEM_TYPES.nourritureboisson; }
  isService() { return this.type == ITEM_TYPES.service; }
-
+  isAttaque() { return false }
+  isParade() { return false }
+  isBouclier() { return false }
+  getCategorieAttaque() { return undefined }
  isCompetence() { return typesObjetsCompetence.includes(this.type) }
  isEsquive() {
    return (this.isCompetence()
@@ -626,7 +629,7 @@ export class RdDItem extends Item {
  _armeChatData() {
    return [
      `<b>Compétence</b>: ${this.system.competence}`,
-      `<b>Dommages</b>: ${this.system.dommages} ${this.system.mortalite == 'non-mortel' ? '(Non mortel)' : ''}`,
+      `<b>Dommages</b>: ${this.system.dommages} ${this.system.mortalite == RDD_CONFIG.encaissement.nonmortel ? '(Non mortel)' : ''}`,
      `<b>Force minimum</b>: ${this.system.force}`,
      `<b>Resistance</b>: ${this.system.resistance}`,
      ...this._inventaireTemplateChatData()
--- a/module/item/arme.js
+++ b/module/item/arme.js
@@ -1,8 +1,10 @@
-import { Grammar } from "./grammar.js";
-import { RdDItemCompetenceCreature } from "./item-competencecreature.js"
-import { ITEM_TYPES } from "./constants.js";
-import { BASE_CORPS_A_CORPS } from "./item/base-items.js";
-import { RdDCombatManager } from "./rdd-combat.js";
+import { ITEM_TYPES, RDD_CONFIG } from "../constants.js";
+import { RdDItem } from "../item.js";
+import { BASE_CORPS_A_CORPS } from "./base-items.js";
+import { Grammar } from "../grammar.js";
+import { RdDInitiative } from "../initiative.mjs";
+import { MappingCreatureArme } from "./mapping-creature-arme.mjs";
+import { Misc } from "../misc.js";

 const nomCategorieParade = {
  "sans-armes": "Sans arme",
@@ -17,22 +19,57 @@ const nomCategorieParade = {
  "haches": "Haches",
  "lances": "Lances",
 }
+export const ATTAQUE_TYPE = {
+  UNE_MAIN: '(1 main)',
+  DEUX_MAINS: '(2 mains)',
+  CORPS_A_CORPS: '(corps à corps)',
+  COMPETENCE: 'competence',
+  TIR: '(tir)',
+  LANCER: '(lancer)'
+}
+export const ATTAQUE_TYPE_MELEE = [ATTAQUE_TYPE.UNE_MAIN, ATTAQUE_TYPE.DEUX_MAINS, ATTAQUE_TYPE.CORPS_A_CORPS]
+
+export const CORPS_A_CORPS = 'Corps à corps'
+export const PUGILAT = 'pugilat'
+export const EMPOIGNADE = RDD_CONFIG.encaissement.empoignade

 /* -------------------------------------------- */
-export class RdDItemArme extends Item {
+export class RdDItemArme extends RdDItem {

-  static isArme(item) {
-    return item.type == ITEM_TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item);
-  }
+  static get ITEM_TYPE() { return ITEM_TYPES.arme }
+
+  static get defaultIcon() { return "systems/foundryvtt-reve-de-dragon/icons/armes_armures/epee_gnome.webp" }
+
+  penetration() { return parseInt(this.system.penetration ?? 0) }
+
+  isParade() { return this.system.resistance > 0 && this.system.categorie_parade }
+  isBouclier() { return RdDItemArme.getCategorieParade(this).includes('bouclier') }

  /* -------------------------------------------- */
+  static valeurMain(valeurs, main) {
+    valeurs = valeurs?.toString() ?? ""
+    const table = valeurs.includes("/") ? valeurs.split("/") : [valeurs, valeurs]
+    return parseInt(main == ATTAQUE_TYPE.DEUX_MAINS ? table[1] : table[0])
+  }
+
+  static getMainAttaque(competence) {
+    switch (competence.system.categorie) {
+      case 'tir': return ATTAQUE_TYPE.TIR
+      case 'lancer': return ATTAQUE_TYPE.LANCER
+    }
+    if (competence.name.includes('2 main')) {
+      return ATTAQUE_TYPE.DEUX_MAINS
+    }
+    return ATTAQUE_TYPE.UNE_MAIN
+  }
+
  static getArme(arme) {
    switch (arme ? arme.type : '') {
      case ITEM_TYPES.arme: return arme;
      case ITEM_TYPES.competencecreature:
-        return RdDItemCompetenceCreature.armeCreature(arme);
+        return MappingCreatureArme.armeCreature(arme);
    }
-    return RdDItemArme.corpsACorps();
+    return RdDItemArme.pugilat();
  }

  static getCompetenceArme(arme, maniement) {
@@ -41,11 +78,12 @@ export class RdDItemArme extends Item {
        return arme.name
      case ITEM_TYPES.arme:
        switch (maniement) {
-          case 'competence': return arme.system.competence;
-          case 'unemain': return RdDItemArme.competence1Mains(arme);
-          case 'deuxmains': return RdDItemArme.competence2Mains(arme);
-          case 'tir': return arme.system.tir;
-          case 'lancer': return arme.system.lancer;
+          case ATTAQUE_TYPE.COMPETENCE: return arme.system.competence;
+          case ATTAQUE_TYPE.UNE_MAIN: return arme.competence1Mains()
+          case ATTAQUE_TYPE.DEUX_MAINS: return arme.competence2Mains()
+          case ATTAQUE_TYPE.TIR: case 'tir': return arme.system.tir
+          case ATTAQUE_TYPE.LANCER: case 'lancer': return arme.system.lancer;
+          case ATTAQUE_TYPE.CORPS_A_CORPS: return CORPS_A_CORPS
        }
    }
    return undefined
@@ -82,16 +120,13 @@ export class RdDItemArme extends Item {

  /* -------------------------------------------- */
  static getCategorieParade(armeData) {
+    if (![ITEM_TYPES.arme, ITEM_TYPES.competencecreature].includes(armeData.type)) {
+      return ''
+    }
    if (armeData.system.categorie_parade) {
      return armeData.system.categorie_parade
    }
    // pour compatibilité avec des personnages existants
-    if (armeData.type == ITEM_TYPES.competencecreature || armeData.system.categorie == 'creature') {
-      return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : '')
-    }
-    if (!armeData.type.match(/arme|competencecreature/)) {
-      return ''
-    }
    if (armeData.system.competence == undefined) {
      return ITEM_TYPES.competencecreature;
    }
@@ -186,7 +221,7 @@ export class RdDItemArme extends Item {
        return Number(arme.system.dommages)
      }
      const tableauDegats = arme.system.dommages.split("/");
-      return Number(tableauDegats[maniement == 'unemain' ? 0 : 1])
+      return Number(tableauDegats[maniement == ATTAQUE_TYPE.UNE_MAIN ? 0 : 1])
    }
    return Number(arme.system.dommages);
  }
@@ -195,17 +230,17 @@ export class RdDItemArme extends Item {
  static armeUneOuDeuxMains(arme, aUneMain) {
    if (arme && !arme.system.cac) {
      arme = foundry.utils.duplicate(arme);
-      arme.system.dommagesReels = RdDItemArme.dommagesReels(arme, aUneMain ? 'unemain' : 'deuxmains')
+      arme.system.dommagesReels = RdDItemArme.dommagesReels(arme, aUneMain ? ATTAQUE_TYPE.UNE_MAIN : ATTAQUE_TYPE.DEUX_MAINS)
    }
    return arme;
  }

-  static competence1Mains(arme) {
-    return arme.system.competence.replace(" 2 mains", " 1 main");
+  competence1Mains() {
+    return this.system.competence.replace(" 2 mains", " 1 main");
  }

-  static competence2Mains(arme) {
-    return arme.system.competence.replace(" 1 main", " 2 mains");
+  competence2Mains() {
+    return this.system.competence.replace(" 1 main", " 2 mains");
  }

  static isUtilisable(arme) {
@@ -216,64 +251,50 @@ export class RdDItemArme extends Item {
    return false
  }

-  static isAttaque(arme) {
-    switch (arme.type) {
-      case ITEM_TYPES.arme:
-        return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
-      case ITEM_TYPES.competencecreature:
-        return arme.system.iscombat && RdDItemCompetenceCreature.isAttaque(item)
-    }
-    return false
+  isAttaque() {
+    return this.system.resistance > 0 || (this.system.tir != '' && this.system.portee_courte > 0)
  }

-  static isParade(arme) {
-    switch (arme.type) {
-      case ITEM_TYPES.arme:
-        return arme.system.equipe && arme.system.resistance > 0 && true/* TODO: regarder la categorie d'arme?*/
-      case ITEM_TYPES.competencecreature:
-        return arme.system.iscombat && RdDItemCompetenceCreature.isParade(arme)
-    }
-    return false
+  isEmpoignade() {
+    return this.system.mortalite == RDD_CONFIG.encaissement.empoignade
  }

-  static corpsACorps(actor) {
-    let competence = actor?.getCompetenceCorpsACorps() ?? BASE_CORPS_A_CORPS
-    let melee = actor ? actor.system.carac['melee'].value : 0
-    return {
-      _id: competence.id,
-      name: 'Corps à corps',
+  isUtilisableEmpoigne() {
+    return this.system.baseInit == 3 || this.system.baseInit == 4 || this.system.competence == "Dague"
+  }
+
+  static pugilat(actor) {
+    return RdDItemArme.$corpsACorps(actor, 'Pugilat', PUGILAT)
+  }
+
+  static empoignade(actor) {
+    return RdDItemArme.$corpsACorps(actor, 'Empoignade', RDD_CONFIG.encaissement.empoignade)
+  }
+
+  static $corpsACorps(actor, name, cac) {
+    const competence = actor?.getCompetenceCorpsACorps() ?? BASE_CORPS_A_CORPS
+    const melee = actor ? actor.system.carac['melee'].value : 0
+    return new RdDItemArme({
+      _id: Misc.fakeId(cac),
+      name: name,
      type: ITEM_TYPES.arme,
      img: competence.img,
      system: {
-        initiative: RdDCombatManager.calculInitiative(competence.system.niveau, melee),
+        initiative: RdDInitiative.getRollInitiative(melee, competence.system.niveau),
        equipe: true,
        rapide: true,
        force: 0,
        dommages: "0",
        dommagesReels: 0,
-        mortalite: 'non-mortel',
-        competence: 'Corps à corps',
+        mortalite: cac == RDD_CONFIG.encaissement.empoignade ? RDD_CONFIG.encaissement.empoignade : RDD_CONFIG.encaissement.nonmortel,
+        competence: CORPS_A_CORPS,
        resistance: 1,
-        baseInit: 4,
-        cac: 'pugilat',
+        baseInit: cac == RDD_CONFIG.encaissement.empoignade ? 3 : 4,
+        cac: cac,
        deuxmains: true,
        categorie_parade: 'sans-armes'
      }
-    }
+    })
  }

-  static mainsNues(actor) {
-    const mainsNues = RdDItemArme.corpsACorps(actor)
-    mainsNues.name = 'Mains nues'
-    return mainsNues;
-  }
-
-  static empoignade(actor) {
-    const empoignade = RdDItemArme.corpsACorps(actor)
-    empoignade.name = 'Empoignade'
-    empoignade.system.cac = 'empoignade'
-    empoignade.system.baseInit = 3
-    empoignade.system.mortalite = 'empoignade'
-    return empoignade
-  }
 }
--- a/module/item/base-items.js
+++ b/module/item/base-items.js
@@ -18,3 +18,23 @@ export const SANS_COMPETENCE = {
  img: "systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp"
 }  

+export const CATEGORIES_COMPETENCES = {
+  "generale": { base: -4, label: "Générales" },
+  "particuliere": { base: -8, label: "Particulières" },
+  "specialisee": { base: -11, label: "Spécialisées" },
+  "connaissance": { base: -11, label: "Connaissances" },
+  "draconic": { base: -11, label: "Draconic" },
+  "melee": { base: -6, label: "Mêlée" },
+  "tir": { base: -8, label: "Tir" },
+  "lancer": { base: -8, label: "Lancer" }
+}
+
+export const CATEGORIES_COMPETENCES_CREATURES = {
+  "generale": { base: 0, label: "Générale" },
+  "naturelle": { base: 0, label: "Arme naturelle" },
+  "melee": { base: 0, label: "Mêlée" },
+  "parade": { base: 0, label: "Parade" },
+  "tir": { base: 0, label: "Tir" },
+  "lancer": { base: 0, label: "Lancer" },
+  "possession": { base: 0, label: "Possession" },
+}
--- a/module/item/blessure.js
+++ b/module/item/blessure.js
@@ -71,21 +71,25 @@ export class RdDItemBlessure extends RdDItem {
    return 0
  }

-  static async createBlessure(actor, gravite, localisation = '', attackerToken) {
-    const definition = RdDItemBlessure.getDefinition(gravite)
-    const blessure = {
+  static async createBlessure(actor, gravite, localisation = '', attackerToken = undefined) {
+    const blessure = RdDItemBlessure.prepareBlessure(gravite, localisation, attackerToken);
+    const blessures = await actor.createEmbeddedDocuments('Item', [blessure])
+    return blessures[0]
+  }
+
+  static prepareBlessure(gravite, localisation, attackerToken) {
+    const definition = RdDItemBlessure.getDefinition(gravite);
+    return {
      name: definition.label,
      type: 'blessure',
      img: definition.icon,
      system: {
        gravite: gravite,
-        difficulte: - gravite,
+        difficulte: -gravite,
        localisation: localisation,
        origine: attackerToken?.name ?? ""
      }
    }
-    const blessures = await actor.createEmbeddedDocuments('Item', [blessure])
-    return blessures[0]
  }

  static async createTacheSoinBlessure(actor, gravite) {
@@ -209,6 +213,9 @@ export class RdDItemBlessure extends RdDItem {
  isCritique() {
    return this.system.gravite > 4 && this.system.gravite <= 6
  }
+  isBleeding() {
+    return this.system.gravite > 2 && !this.system.premierssoins.done
+  }
  isMort() {
    return this.system.gravite > 6
  }
--- a/module/item/item-actions.js
+++ b/module/item/item-actions.js
@@ -3,8 +3,6 @@ import { Misc } from "../misc.js"
 import { RdDSheetUtility } from "../rdd-sheet-utility.js"
 import { RdDUtility } from "../rdd-utility.js"

-
-
 /**
 * TODO:
 * options.editable ?
@@ -15,21 +13,21 @@ const _SPACEHOLDER = { placeholder: true }
 const _VENDRE = {
  code: 'item-vendre', label: 'Vendre ou donner', icon: it => 'fa-solid fa-comments-dollar',
  filter: it => Misc.toInt(it.system.quantite) > 0,
-  optionsFilter: options => options.editable,
  action: (item, actor) => item.proposerVente()
 }
-const _ACHAT_SERVICE = {
-  code: 'item-service-acheter', label: 'Acheter', icon: it => 'fa-regular fa-coins',
+const _ACHETER = {
+  code: 'item-acheter', label: 'Acheter', icon: it => 'fa-regular fa-coins',
  filter: it => Misc.toInt(it.system.quantite) > 0 && it.parent?.type == ACTOR_TYPES.commerce,
  action: (item, actor) => actor.vente(item)
 }
 const _MONTRER = {
  code: 'item-montrer', label: 'Montrer', icon: it => 'fa-solid fa-comment',
+  allowLimited: true,
  action: (item, actor) => item.postItemToChat()
 }
 const _SPLIT = {
  code: 'item-split', label: 'Séparer le goupe', icon: it => 'fa-solid fa-unlink',
-  filter: it => Misc.toInt(it.system.quantite) > 1,
+  filter: it => Misc.toInt(it.system.quantite) > 1 && it.parent?.type != ACTOR_TYPES.commerce,
  action: (item, actor) => RdDSheetUtility.splitItem(item, actor)
 }

@@ -39,7 +37,7 @@ const _EDIT = {
 }
 const _DELETE = {
  code: 'item-delete', label: 'Supprimer', icon: it => 'fa-solid fa-trash',
-  optionsFilter: options => options.editable && options.isOwner,
+  optionsFilter: options => options.isOwner,
  action: (item, actor) => RdDUtility.confirmActorItemDelete(item, actor)
 }
 const _EQUIPER = {
@@ -51,30 +49,25 @@ const _EQUIPER = {
 const _CUISINER = {
  code: 'item-cuisiner', label: 'Cuisiner', icon: it => 'fa-solid fa-utensils',
  filter: it => it.getUtilisation() == 'cuisine' && it.system.sust > 0,
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.preparerNourriture(item)
 }
 const _MANGER_CRU = {
  code: 'item-manger-cru', label: 'Manger cru', icon: it => 'fa-solid fa-drumstick-bite',
  filter: it => it.getUtilisation() == 'cuisine' && it.system.sust > 0,
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.mangerNourriture(item)
 }
 const _MANGER = {
  code: 'item-manger', label: 'Manger', icon: it => 'fa-solid fa-utensils',
  filter: it => !(it.system.boisson),
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.mangerNourriture(item)
 }
 const _BOIRE = {
  code: 'item-boire', label: 'Boire', icon: it => 'fa-solid fa-glass-water',
  filter: it => it.system.boisson,
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.mangerNourriture(item)
 }
 const _DECOCTION = {
  code: 'item-decoction', label: 'Décoction', icon: it => 'fa-solid fa-flask-vial',
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.fabriquerDecoctionHerbe(item)
 }
 const _OUVRIR = {
@@ -84,14 +77,12 @@ const _OUVRIR = {

 const _LIRE = {
  code: 'item-lire', label: 'Lire', icon: it => 'fa-solid fa-book-open',
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.actionLire(item)
 }

 const _REFOULER = {
  code: 'item-refouler', label: 'Refouler', icon: it => 'fa-solid fa-burst',
  filter: it => it.system.refoulement > 0,
-  optionsFilter: options => options.editable,
  action: (item, actor) => actor.actionRefoulement(item)
 }

@@ -102,7 +93,7 @@ const _SORT_RESERVE = {
 }

 export const COMMON_ACTIONS = [_EQUIPER]
-export const DEFAULT_ACTIONS = [_SPACEHOLDER, _SPLIT, _VENDRE, _MONTRER, _EDIT, _DELETE]
+export const DEFAULT_ACTIONS = [_ACHETER, _SPACEHOLDER, _SPLIT, _VENDRE, _MONTRER, _EDIT, _DELETE]

 export const ITEM_ACTIONS = {
  faune: [_CUISINER, _MANGER_CRU],
@@ -114,17 +105,16 @@ export const ITEM_ACTIONS = {
  ombre: [_REFOULER],
  plante: [_CUISINER, _MANGER_CRU],
  queue: [_REFOULER],
-  sort: [_SORT_RESERVE],
-  service: [_ACHAT_SERVICE]
+  sort: [_SORT_RESERVE]
 }

-
 export class ItemAction {

  static applies(action, item, options) {
    return action && item
      && item.isActionAllowed(action.code)
      && (!action.filter || action.filter(item))
+      && (action.allowLimited || options.editable)
      && (!action.optionsFilter || action.optionsFilter(options))
  }

@@ -136,10 +126,10 @@ export class ItemAction {
  }

  static async onActionItem(event, actor, options) {
-    const item = RdDSheetUtility.getItem(event, actor)
    const code = $(event.currentTarget).data('code')
+    const item = RdDSheetUtility.getItem(event, actor)
    const action = item?.itemActions().find(it => it.code == code)
-    if (action && (!action.optionsFilter || action.optionsFilter(options))) {
+    if (action && ItemAction.applies(action, item, options)) {
      await action.action(item, actor)
    }
  }
--- a/module/item/mapping-creature-arme.mjs
+++ b/module/item/mapping-creature-arme.mjs
@@ -0,0 +1,41 @@
+import { Grammar } from "../grammar.js";
+import { RdDInitiative } from "../initiative.mjs";
+
+export class MappingCreatureArme {
+
+  /* -------------------------------------------- */
+  static setRollDataCreature(rollData) {
+    const code = Grammar.toLowerCaseNoAccentNoSpace(rollData.competence.name);
+    const selectedCarac = { code: code, label: rollData.competence.name, value: rollData.competence.system.carac_value };
+    rollData.carac = { [code]: selectedCarac }
+    rollData.competence.system.defaut_carac = code
+    rollData.selectedCarac = selectedCarac
+    rollData.arme = MappingCreatureArme.armeCreature(rollData.competence);
+  }
+
+
+  /* -------------------------------------------- */
+  static armeCreature(item) {
+    const categorieAttaque = item.getCategorieAttaque()
+    if (categorieAttaque != undefined) {
+      // cloner pour ne pas modifier la compétence
+      return foundry.utils.mergeObject(item, {
+        action: item.isCompetencePossession() ? 'possession' : 'attaque',
+        system: {
+          competence: item.name,
+          cac: categorieAttaque == "naturelle" ? "naturelle" : "",
+          niveau: item.system.niveau,
+          initiative: RdDInitiative.getRollInitiative(item.system.carac_value, item.system.niveau),
+          equipe: true,
+          resistance: 100,
+          dommagesReels: item.system.dommages,
+          penetration: 0,
+          force: 0,
+          rapide: true,
+        }
+      }, { inplace: false, });
+    }
+    return undefined;
+  }
+
+}
--- a/module/item/rencontre.js
+++ b/module/item/rencontre.js
@@ -6,8 +6,8 @@ const tableEffets = [
  { code: "passeur", resultat: "succes", description: "Déplacer le demi-rêve à (force) cases", method: EffetsRencontre.passeur},
  { code: "reve+f", resultat: "succes", description: "Gain de (force) points de rêve" , method: EffetsRencontre.reve_plus_force},
  { code: "teleport", resultat: "succes", description: "Déplacer le demi-rêve (même type)", method: EffetsRencontre.teleportation_typecase },
-  { code: "part+tete", resultat: "succes", description: "Tête de dragon sur réussite particulière", method: EffetsRencontre.rdd_part_tete },
-  { code: "part+xp", resultat: "succes", description: "Expérience sur réussite particulière", method: EffetsRencontre.experience_particuliere },
+  { code: "part+tete", resultat: "succes", description: "Tête de dragon sur particulière", method: EffetsRencontre.rdd_part_tete },
+  { code: "part+xp", resultat: "succes", description: "Expérience sur particulière", method: EffetsRencontre.experience_particuliere },
  { code: "seuil", resultat: "succes", description: "Récupération de seuil de rêve", method: EffetsRencontre.regain_seuil },

  { code: "reve-1", resultat: "echec", description: "Perte de 1 point de rêve", method: EffetsRencontre.reve_moins_1 },
@@ -19,7 +19,7 @@ const tableEffets = [
  { code: "aleatoire", resultat: "echec", description: "Déplacement aléatoire", method: EffetsRencontre.deplacement_aleatoire },
  { code: "sort-aleatoire", resultat: "echec", description: "Déclenche un sort en réserve aléatoire", method: EffetsRencontre.sort_aleatoire },
  { code: "rompu", resultat: "echec", description: "Demi-rêve interrompu", method: EffetsRencontre.demireve_rompu },
-  { code: "echec-queue", resultat: "echec", description: "Queue(s) de dragon sur échec", method: EffetsRencontre.rdd_echec_queue },
+  { code: "echec-queue", resultat: "echec", description: "Queue(s) de dragon", method: EffetsRencontre.rdd_echec_queue },

  { code: "reve+1", resultat: "succes", description: "Gain de 1 point de rêve", method: EffetsRencontre.reve_plus_1 },
  { code: "vie-f", resultat: "echec", description: "Perte de (force) points de vie", method: EffetsRencontre.vie_moins_force },
--- a/module/item/sheet-base-inventaire.js
+++ b/module/item/sheet-base-inventaire.js
@@ -5,7 +5,7 @@ import { RdDRaretes } from "./raretes.js";

 const TYPE_ITEMS_NATURELS = ["faune", "herbe", "plante", "ingredient"];

-export class RdDItemInventaireSheet extends RdDItemSheetV1 {
+export class RdDInventaireItemSheet extends RdDItemSheetV1 {

  static get defaultOptions() {
    return foundry.utils.mergeObject(RdDItemSheetV1.defaultOptions, {
--- a/module/item/sheet-conteneur.js
+++ b/module/item/sheet-conteneur.js
@@ -2,9 +2,9 @@ import { RdDBaseActorSheet } from "../actor/base-actor-sheet.js";
 import { ITEM_TYPES } from "../constants.js";
 import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { RdDUtility } from "../rdd-utility.js";
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";

-export class RdDConteneurItemSheet extends RdDItemInventaireSheet {
+export class RdDConteneurItemSheet extends RdDInventaireItemSheet {

  static get ITEM_TYPE() { return ITEM_TYPES.conteneur };

--- a/module/item/sheet-faune.js
+++ b/module/item/sheet-faune.js
@@ -1,6 +1,6 @@
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";

-export class RdDFauneItemSheet extends RdDItemInventaireSheet {
+export class RdDFauneItemSheet extends RdDInventaireItemSheet {

  static get ITEM_TYPE() { return "faune" };

--- a/module/item/sheet-gemme.js
+++ b/module/item/sheet-gemme.js
@@ -2,9 +2,9 @@ import { ITEM_TYPES } from "../constants.js";
 import { DialogEnchanter } from "../enchantement/dialog-enchanter.js";
 import { RdDTimestamp } from "../time/rdd-timestamp.js";
 import { RdDItemGemme } from "./gemme.js";
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";

-export class RdDGemmeItemSheet extends RdDItemInventaireSheet {
+export class RdDGemmeItemSheet extends RdDInventaireItemSheet {

  static get ITEM_TYPE() { return ITEM_TYPES.gemme };

--- a/module/item/sheet-herbe.js
+++ b/module/item/sheet-herbe.js
@@ -1,6 +1,6 @@
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";

-export class RdDHerbeItemSheet extends RdDItemInventaireSheet {
+export class RdDHerbeItemSheet extends RdDInventaireItemSheet {

  static get ITEM_TYPE() { return "herbe" };
 }
--- a/module/item/sheet-ingredient.js
+++ b/module/item/sheet-ingredient.js
@@ -1,5 +1,5 @@
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";

-export class RdDIngredientItemSheet extends RdDItemInventaireSheet {
+export class RdDIngredientItemSheet extends RdDInventaireItemSheet {
  static get ITEM_TYPE() { return "ingredient" };
 }
--- a/module/item/sheet-plante.js
+++ b/module/item/sheet-plante.js
@@ -1,6 +1,6 @@
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";

-export class RdDPlanteItemSheet extends RdDItemInventaireSheet {
+export class RdDPlanteItemSheet extends RdDInventaireItemSheet {

  static get ITEM_TYPE() { return "plante" };

--- a/module/item/sheet-potion.js
+++ b/module/item/sheet-potion.js
@@ -2,10 +2,10 @@ import { ITEM_TYPES } from "../constants.js";
 import { DialogEnchanter } from "../enchantement/dialog-enchanter.js";
 import { RdDTimestamp } from "../time/rdd-timestamp.js";
 import { RdDItemPotion } from "./potion.js";
-import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+import { RdDInventaireItemSheet } from "./sheet-base-inventaire.js";


-export class RdDPotionItemSheet extends RdDItemInventaireSheet {
+export class RdDPotionItemSheet extends RdDInventaireItemSheet {

  static get ITEM_TYPE() { return ITEM_TYPES.potion };

--- a/module/migrations.js
+++ b/module/migrations.js
@@ -8,7 +8,6 @@ import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDRaretes } from "./item/raretes.js";
 import { VOIES_DRACONIC } from "./item-sort.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
-import { Misc } from "./misc.js";

 class Migration {
  get code() { return "sample"; }
@@ -248,7 +247,7 @@ class _10_2_10_DesirLancinant_IdeeFixe extends Migration {
    await this.applyItemsUpdates(items => items
      .filter(it => ['queue', 'ombre'].includes(it.type))
      .map(it => this.migrateQueue(it))
-    );
+    )
  }
 }

@@ -632,7 +631,7 @@ class _12_0_38_TachesEcriture extends Migration {

  async migrate() {
    await this.applyItemsUpdates(items => items
-      .filter(it => [ITEM_TYPES.tache, ITEM_TYPES.livre, ITEM_TYPES.oeuvre, ITEM_TYPES.meditation].includes(it.type) )
+      .filter(it => [ITEM_TYPES.tache, ITEM_TYPES.livre, ITEM_TYPES.oeuvre, ITEM_TYPES.meditation].includes(it.type))
      .filter(it => Grammar.equalsInsensitive(it.system.competence, 'ecriture'))
      .map(it => { return { _id: it.id, 'system.competence': 'Écriture' } })
    )
@@ -640,11 +639,26 @@ class _12_0_38_TachesEcriture extends Migration {
 }

 class _13_0_4_FixReveActuel extends Migration {
-  get code() { return "fix-revvve-actuel" }
+  get code() { return "fix-reve-actuel" }
  get version() { return "13.0.4" }

  async migrate() {
-    game.actors.forEach(it => it.update({'system.carac.-=reve-actuel': null}))
+    game.actors.forEach(it => it.update({ 'system.carac.-=reve-actuel': null }))
+  }
+}
+
+class _13_0_7_FixNiveauOeuvres extends Migration {
+  get code() { return "fix-niveau-oeuvres" }
+  get version() { return "13.0.7" }
+
+  async migrate() {
+    await this.applyItemsUpdates(items => items
+      .filter(it => [ITEM_TYPES.musique, ITEM_TYPES.chant, ITEM_TYPES.danse, ITEM_TYPES.recettecuisine].includes(it.type))
+      .map(it => {
+        const niveau = isNaN(it.system.niveau) ? 0 : parseInt(it.system.niveau)
+        return { _id: it.id, 'system.niveau': niveau }
+      })
+    )
  }
 }

@@ -671,7 +685,8 @@ export class Migrations {
      new _12_0_32_MigrationRaces(),
      new _12_0_37_MigrationAlchimieEtat(),
      new _12_0_38_TachesEcriture(),
-      new _13_0_4_FixReveActuel()
+      new _13_0_4_FixReveActuel(),
+      new _13_0_7_FixNiveauOeuvres(),
    ];
  }

--- a/module/misc.js
+++ b/module/misc.js
@@ -34,10 +34,23 @@ export class Misc {
    return ((n % m) + m) % m;
  }

+  static inRange(value, min, max) {
+    if (min > max) {
+      return Misc.inRange(value, max, min)
+    }
+    return Math.max(min, Math.min(value, max))
+  }
+
  static sum() {
    return (a, b) => Number(a) + Number(b);
  }

+  static and(predicates) {
+    return value => predicates.map(predicate => predicate(value))
+      .reduce((v1, v2) => v1 && v2, true);
+  }
+
+
  static ascending(orderFunction = x => x) {
    return (a, b) => Misc.sortingBy(orderFunction(a), orderFunction(b));
  }
@@ -52,6 +65,10 @@ export class Misc {
    return 0;
  }

+  static fakeId(base) {
+    return (base + foundry.utils.randomID(16)).substring(0, 16)
+  }
+
  static typeName(type, subType) {
    return subType ? game.i18n.localize(`TYPES.${type}.${subType}`)
      : '';
@@ -60,6 +77,11 @@ export class Misc {
  static arrayOrEmpty(items) {
    return items?.length ? items : [];
  }
+
+  static findOrFirst(list, predicate) {
+    return list.find(predicate) ?? list[0]
+  }
+
  /**
   * Converts the value to an integer, or to 0 if undefined/null/not representing integer
   * @param {*} value value to convert to an integer using parseInt
@@ -75,13 +97,17 @@ export class Misc {
    return Math.round(num * power10n) / power10n;
  }

-  static getFractionHtml(diviseur) {
-    if (!diviseur || diviseur <= 1) return undefined;
-    switch (diviseur || 1) {
-      case 2: return '&frac12;';
-      case 4: return '&frac14;';
-      default: return '1/' + diviseur;
+
+  static getFractionOneN(divider) {
+    if (!divider || divider == 1) {
+      return 1
    }
+    switch (divider) {
+      case 2: return '&frac12;'
+      case 4: return '&frac14;'
+      case 8: return '&frac18;'
+    }
+    return `1/${divider}`
  }

  static indexLowercase(list) {
@@ -93,6 +119,10 @@ export class Misc {
    list.forEach(it => addToObj(obj, it))
    return obj;
  }
+  static indexed(list, index = 'index') {
+    let i = 0;
+    return list.map(it => { it[index] = i++; return it })
+  }

  static concat(lists) {
    return lists.reduce((a, b) => a.concat(b), []);
@@ -216,7 +246,7 @@ export class Misc {
  static isFirstConnectedGM() {
    return game.user == Misc.firstConnectedGM();
  }
-  
+
  static hasConnectedGM() {
    return Misc.firstConnectedGM();
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
uberwald	0b90badb5e	Merge pull request 'v13.0.14 - Le familier d'Illysis' (#779 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 2m39s Details Reviewed-on: #779	2025-10-25 23:21:59 +02:00
Vincent Vandemeulebrouck	290b5029d1	Correction couleurs sommaires	2025-10-24 22:20:29 +02:00
Vincent Vandemeulebrouck	a7e4aea52d	Fix: meditation V2	2025-10-24 01:22:20 +02:00
Vincent Vandemeulebrouck	755d15509e	Ajout du StatusEffect surencombré	2025-10-23 20:21:56 +02:00
Vincent Vandemeulebrouck	02cea84ebb	Empoignade V2	2025-10-23 12:01:52 +02:00
Vincent Vandemeulebrouck	c47fc4f5b6	Fix scenes image locations	2025-10-22 22:40:07 +02:00
Vincent Vandemeulebrouck	147e49f2cb	Gestion des significatives	2025-10-21 01:40:14 +02:00
Vincent Vandemeulebrouck	7f4f942d50	Amélioration des entités - l'attaquant ne sait plus que c'est une entité de cauchemar (surprise!) - l'encaissement indique une blessure dans le tchat... même si ce n'est que de l'endurance - les blurettes suivent les règles des entités de cauchemar (p322)	2025-10-21 01:39:23 +02:00
Vincent Vandemeulebrouck	8f4df1af56	Fix: ajustements surprises Affichage de l'image de la surprise	2025-10-21 01:39:23 +02:00
Vincent Vandemeulebrouck	77f2de2c5f	Jet V2 pour les créatures	2025-10-21 01:39:16 +02:00
Vincent Vandemeulebrouck	e5e271e424	Corrections majuscules/couleurs	2025-10-19 23:53:43 +02:00
uberwald	43ecca8be1	Merge pull request 'v13.0.13 - L'épanouissement d'Illysis' (#777 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 2m5s Details Reviewed-on: #777	2025-10-18 18:04:36 +02:00
Vincent Vandemeulebrouck	e21f7e398a	Création de tâches dans la fenêtre de jets	2025-10-18 00:52:14 +02:00
Vincent Vandemeulebrouck	e16f89743a	Affichage des ajustements V2	2025-10-18 00:52:14 +02:00
Vincent Vandemeulebrouck	a6c593c100	Corrections premiers retours	2025-10-18 00:52:14 +02:00
uberwald	cd8e190082	Merge pull request 'v13.0.12 - La méditation d'Illysis' (#776 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 1m49s Details Reviewed-on: #776	2025-10-16 20:14:03 +02:00
Vincent Vandemeulebrouck	f2106763c1	v13.0.12	2025-10-16 00:55:58 +02:00
Vincent Vandemeulebrouck	5da5cb0314	Gestion des maladresses	2025-10-16 00:35:43 +02:00
Vincent Vandemeulebrouck	6d7f66569a	Lancer de sorts V2	2025-10-15 22:42:14 +02:00
Vincent Vandemeulebrouck	3e8963b20b	Impacts uniquement sur l'acteur	2025-10-15 22:42:14 +02:00
Vincent Vandemeulebrouck	2cf5b06da8	Correction: rename bringToTop	2025-10-15 22:42:13 +02:00
Vincent Vandemeulebrouck	68c01fc930	Montée TMR sur méditation ajout d'un bouton pour aller dans les TMR lors d'une méditation réussie	2025-10-15 22:42:13 +02:00
Vincent Vandemeulebrouck	3bc1c4871b	Biugfix: compétences de jeu Les compétences de jeu spécifiques (doublon) ne remplacent plus la compétence active si le jet n'est pas un jet de jeu	2025-10-15 00:26:01 +02:00
Vincent Vandemeulebrouck	3d732e9a8a	Suppression des signes draconiques en cas de descente des TMR, suppression des signes draconiques éphémères durant seulement 1 round	2025-10-15 00:24:35 +02:00
Vincent Vandemeulebrouck	35f226af5c	Correction du générateur aléatoire - couleurs de cheveux/yeux - les tailles entre 1m00 et 1m09 sont correctement affichées - possibilité de positionner le sexe masculin/féminin en un clic	2025-10-14 17:44:39 +02:00
uberwald	126a0701d8	Merge pull request 'v13.0.11 - Le gambit d'Illysis' (#775 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 2m2s Details Reviewed-on: #775	2025-10-09 14:14:44 +02:00
Vincent Vandemeulebrouck	edf920b340	Roll V2: cuisine	2025-10-08 16:36:14 +02:00
Vincent Vandemeulebrouck	293af5ab83	Roll V2: les jeux	2025-10-08 16:35:58 +02:00
Vincent Vandemeulebrouck	1bf9e330f4	Petites améliorations	2025-10-05 22:39:08 +02:00
uberwald	33dc58138c	Merge pull request '13.0.10 - Les papilles d'Illysis' (#774 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 1m45s Details Reviewed-on: #774	2025-10-05 21:39:20 +02:00
Vincent Vandemeulebrouck	fa6769fcd7	Fenêtres Roll V2 Maintenant disponibles pour: - méditation - tâches - soins	2025-10-05 03:09:52 +02:00
Vincent Vandemeulebrouck	47c4478303	Roll V2 sur compétences&combat Corrections associées Maintenant, active en mode rollV2	2025-10-03 22:34:07 +02:00
Vincent Vandemeulebrouck	52065fd6f6	changelog 13.0.10	2025-10-03 02:21:22 +02:00
Vincent Vandemeulebrouck	6886f19921	Jet de compétence V2	2025-10-03 02:21:22 +02:00
Vincent Vandemeulebrouck	10a89cc268	Fix regression table rdd	2025-10-03 02:21:22 +02:00
Vincent Vandemeulebrouck	6a987086f8	Correction message init & pugilat	2025-10-03 02:21:22 +02:00
Vincent Vandemeulebrouck	54f470d531	Roll recette de cuisine	2025-10-03 02:21:22 +02:00
Vincent Vandemeulebrouck	37af0dd4f1	Rename ajustements => v1	2025-10-03 02:21:22 +02:00
Vincent Vandemeulebrouck	d46b039a63	Ajout des saignements	2025-10-03 02:21:21 +02:00
Vincent Vandemeulebrouck	7370b633db	Gestion attaques v2 et initiative	2025-10-03 02:21:21 +02:00
Vincent Vandemeulebrouck	d0ba1ebf99	utilisation de renderTemplate "interne" Import de foundry.applications.handlebars.renderTemplate au travers d'une constante pour éliminer les warnings	2025-09-30 02:04:53 +02:00
Vincent Vandemeulebrouck	053bc23d12	Move HUD button attaque	2025-09-29 01:47:35 +02:00
LeRatierBretonnien	1360992daa	Minot fixes All checks were successful Release Creation / build (release) Successful in 1m59s Details	2025-09-28 22:12:23 +02:00
uberwald	878645491d	Merge pull request 'v13.0.9 - corrections' (#773 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 Reviewed-on: #773	2025-09-28 22:10:05 +02:00
Vincent Vandemeulebrouck	edfaf203f7	Colonne dmg dans onglet combat	2025-09-28 22:00:05 +02:00
Vincent Vandemeulebrouck	3480b64d75	Fix competencecreatures/competences	2025-09-28 22:00:05 +02:00
uberwald	17e10d3be9	Merge pull request 'v13.0.9 - Le combat d'Illysis' (#772 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 Reviewed-on: #772	2025-09-28 17:39:55 +02:00
Vincent Vandemeulebrouck	bbcd6ad363	Fin de gestion encaissement/recul V2	2025-09-28 17:21:59 +02:00
Vincent Vandemeulebrouck	faca73b0a1	RollV2, tchat et appel chance gestion des appels à la chance pour tout jet V2 correction de soucis forçage du jet continuation des messages de défense	2025-09-28 17:19:34 +02:00
Vincent Vandemeulebrouck	a7e14736e4	Amélioration espace boutons actions	2025-09-28 17:19:34 +02:00
Vincent Vandemeulebrouck	2741fc3fbf	Avancement messages défense & oeuvres	2025-09-27 01:43:49 +02:00
uberwald	160f10a639	Merge pull request 'v13' (#771 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 Reviewed-on: #771	2025-09-26 10:54:39 +02:00
Vincent Vandemeulebrouck	d26ab59c51	Nouvelle fenêtre: attaque/defense quelques améliorations préparation pour gérer les messages de résultats en fonction du type de jet (attaque/compétence/...) quelques corrections (suppression du filtre de compétences quand on change de type de jet, astrologie, ..)	2025-09-24 22:39:25 +02:00
Vincent Vandemeulebrouck	1f330c734e	Clarification des maladresses	2025-09-24 22:39:25 +02:00
Vincent Vandemeulebrouck	74515d28f4	Amélioration de la gestion de la surprise	2025-09-24 22:39:25 +02:00
uberwald	c84af21c7e	Merge pull request 'v13' (#770 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 Reviewed-on: #770	2025-09-22 11:24:07 +02:00
Vincent Vandemeulebrouck	0730bdf240	Nouveau roll-dialog: mode attaque / defense	2025-09-22 02:25:47 +02:00
Vincent Vandemeulebrouck	607eedc6d2	Fix montée TMR	2025-09-21 00:15:36 +02:00
uberwald	de2c636064	Merge pull request '13.0.8 - Le renouveau d'Illysis' (#769 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 1m37s Details Reviewed-on: #769	2025-09-19 23:35:53 +02:00
Vincent Vandemeulebrouck	1ff32697f4	Nouvelle fenêtre de jets de dés	2025-09-19 22:43:49 +02:00
Vincent Vandemeulebrouck	652c435833	Préparation roll-dialog attaques Les attaques ne sont plus des armes modifiées	2025-09-18 02:08:10 +02:00
Vincent Vandemeulebrouck	74c1f33427	RdDItemArme pour les armes résolution de souci de dépendance circulaire causée par RdDCombat	2025-09-18 02:08:10 +02:00
Vincent Vandemeulebrouck	0c6caffde3	small items cleanup Préparation pour retravailler les armes afin de gérer les attaques dans la nouvelle fenêtre de jets	2025-09-18 02:08:10 +02:00
Vincent Vandemeulebrouck	dc63041682	Fix style sidebar Perdu depuis la v13 (ou avant)	2025-09-18 02:08:10 +02:00
Vincent Vandemeulebrouck	f572b1c4e1	Fix liste des états dans header Fix v13	2025-09-18 02:08:10 +02:00
uberwald	1d63cd54fe	Merge pull request '13.0.7 - Sous le signe d'Illysis' (#768 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 2m23s Details Reviewed-on: #768	2025-09-12 20:56:24 +02:00
Vincent Vandemeulebrouck	15e6127e02	Fix effets TMR A0	2025-09-12 18:57:34 +02:00
Vincent Vandemeulebrouck	afd8c2ac80	Migration niveau oeuvres Passage du niveau à une valeur numérique	2025-09-12 18:56:17 +02:00
Vincent Vandemeulebrouck	18de904849	Affichage des signes d'heure Présentation en ligne pour fenêtre d'astrologie. Pourra être utilisée là où on affiche des heures (méditations)	2025-09-12 18:54:47 +02:00
Vincent Vandemeulebrouck	cb48c960c2	appel moral sur double significative Lors d'un appel au moral avcec un facteur de significative recquis, vérifier la réussite effective (en utitisant la bnonne fraction du score) pour déterminer la perte de moral	2025-09-12 18:53:40 +02:00
Vincent Vandemeulebrouck	bd082248d9	Correction de tooltips (v13) Sur les ajustements, les tooltips sont visibles	2025-09-12 18:52:11 +02:00
Vincent Vandemeulebrouck	df9df90ccb	Init premier round	2025-09-12 18:47:41 +02:00
uberwald	0456221cf7	Merge pull request 'Fix commerces' (#767 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 All checks were successful Release Creation / build (release) Successful in 5m16s Details Reviewed-on: #767	2025-09-02 00:19:24 +02:00
Vincent Vandemeulebrouck	583b4ff003	Fix commerces	2025-08-24 14:57:01 +02:00
uberwald	b4ac906802	Merge pull request 'v13.0.6' (#766 ) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13 Reviewed-on: #766	2025-08-03 23:35:05 +02:00
Vincent Vandemeulebrouck	395c7a4cc3	Fix boutons feuille simplifiée	2025-08-03 22:48:01 +02:00
Vincent Vandemeulebrouck	27bc07f64a	Soins depuis les tokens	2025-08-03 22:48:01 +02:00
LeRatierBretonnien	2f3ec7bab0	Upadte changelog et normalisation markdown	2025-07-17 07:44:58 +02:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="m329.5 29.12-8.1 11.4L359 67.16l8.1-11.44zm-88 5.04 24.2 45.36 1.8 1.29 14.8-40.36zm57.6 12.63-16.4 44.8 40.7 28.81 35.3-31.54c-.9-.58-1.9-1.19-2.8-1.84zM59.83 48.56l10.84 45.83 29.63 2.6 2.7-29.63zM470.9 75.41c-5.6 4.71-12.2 8.59-19.5 11.74 5 46.45-14.7 83.45-45.2 109.75-26.5 22.9-60.9 38.4-95 47.9-2.5 4.8-5 9.2-7.4 13.1 41.5 5.4 93.2-21.2 129.2-60 19.8-21.3 34.8-45.9 41.1-69.2 5.2-19.4 4.7-37.42-3.2-53.29zm-351.3 8.71-3 32.48-32.35-2.9 226.55 271 20-16.7 15.3-12.8zM434 93.09c-4.2 1-8.5 2-12.8 2.7-14.9 2.5-30.1 3.1-43.5.3l-41 36.61c4 7 5 15.7 4.5 24.5-.6 12.6-4.3 26.7-9.3 40.9-3 8.3-6.3 16.6-9.9 24.6 26.9-9.2 52.6-22.3 72.5-39.4 26.2-22.8 42.5-51.6 39.5-90.21zM274 107.4l-51.2 72.2 30.6 36.5 58.2-82.1zM173.8 248.8 34.53 445.2l37.53 26.6L204.3 285.3zm233 79.2L273.3 439.5l19.2 23.1L426 351zm-18.3 77.9-35.3 29.4 39.7 47.6 35.3-29.4z" fill="#fff" fill-opacity="1"></path></g></svg>