Merge pull request '## 12.0.4 - La plaie d'Astrobazzarh' (#705) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: public/foundryvtt-reve-de-dragon#705

changelog.md

@@ -1,4 +1,221 @@
+# 12.0
+## 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
+  - les dés draconiques peuvent de nouveau faire plus que 0
+  - adaptation de la fenêtre de recherche
+  - correction des comparaisons de version pour les migrations automatiques
+  - correction des roll.eveluate: l'option async est maintenant standard
+  - correction des templates liés aux selections
+  - correction de l'ajustement de luminosité de la scène selon l'heure
+  - correction des images d'effets sur les tokens
+  - correction de la vente par le tchat: seul le premier acheteur pouvait acheter
+  - 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
+- Si aucune expérience n'est gagnée, les autres effets à appliquer (comme la récupération de seuil après avoir vaincu un rêve de Dragon) s'appliquent normalement
+- Les tooltips de Foundry sont lisibles
+- On n'accorde plus les entités de cauchemar deux fois quand le gardien valide les encaissements
+- 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
+- Les personnages non-liés ne sont plus dans les liste de personnages joueurs pour le repos, le stress, la fatigue
+- L'utilisation de Thanatos est visible dans l'onglet Haut-Rêve pour indiquer que la prochaine queue est une ombre
+- 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)
+- Ajout d'une icône et transformation en bouton du lien pour accéder à l'astrologie et aux chiffres astraux
+- Suppression de message de log inutile sur chaque point de coeur
+- On peut désactiver l'ajustement astrologique sur les jets de chance (pour des jts de chances non liés à une heure)- Fix: suppression de quelques cas d'erreur lors de l'ouverture des TMR
+- Fix: suppression du warning de depréciation effects flags.core.statusId
+- Les sorts en réserve en fleuve sont indiqués sur toutes les cases fleuve
+- 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
+  - les jets de volonté peuvent être ajustés selon les points de Cœur
+- Fixes
+  - La résistance est de 1 par défaut pour les équipements
+  - Les armes de créatures sont de nouveau utilisables depuis les tokens
+  - Pas de notifications de signe draconique quand on regarde les TMR sans monter
+  - Correction d'un problème de contextes WebGL causé par des ouvertures/fermetures de TMRs
+  - On peut maintenant prendre un objet d'un acteur-token pour l'ajouter à un autre acteur
+  - On ne peut plus donner d'objets d'un acteur à un acteur-token
+  - L'état général est correctement calculé, affiché, et utilisé pour les animaux
+  - On peut ajouter des blessures manuellement aux animaux
+  - Le texte de la carte de Tarot "Le Gibet" est corrigé
+  - Sur Firefox, le calendrier est correctement initialisé, les ajustements astrologiques
+    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:
+  - noir: case innaccessible
+  - rouge: empêche l'usage du haut-rêve
+  - vert: bonus de tête de dragon permanent
+  - bleu: la case doit être vaincue
+  - blanc: effet temporaire (sort en réserve, présent des cités)
+- Fix: les déplacements aléatoires prennent bien compte des colonnes paires/impaires
+- Fix: Le Tricollet prend deux "L"
+- Fix: Les jets d'encaissement forcés par le gardien à un résultat inférieur à 11 ne peuvent plus donner un deuxième d10 négatif
+
+# v11.1
+## v11.1.6 - Les dissections de Werther de Zloth
+- Fix: on peut de nouveau donner des compétences aux créatures
+- Fix: le délai de guérison d'une blessure rétrogradée est correctement appliqué
+- 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)
+  - le souffle trou noir ajoute bien une case de trou noir
+  - la queue urgence draconique ne se transforme plus en idée fixe s'il y a des sorts en réserve
+  - l'ajout d'une nouvelle queue ne supprime plus l'insomnie
+- Amélioration des jets de vie
+  - un 1 sur le jet de vie est une réussite même si le personnage est dans le coma
+  - le temps avant le prochain jet est calculé et affiché
+  - un 20 sur le jet de vie signifie la mort immédiate
+  - si on dépasse le S.Const, le personnage est bien indiqué comme mort
+  - 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
+- Fix: Le MJ peut correctement masquer les points de tâche requis
+- Fix: le jet d'appréciation n'utilise pas la compétence
+- Fix: la qualité négative n'est pas exotique, elle est juste mauvaise: on n'utilise pas la cuisine pour se retenir de jeter l'assiette
+- 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
+  - La récupération d'éthylisme
+  - La récupération de rêve (y compris fleurs de rêve et Rêves de Dragon: la rencontre a lieu, mais ne donne pas de rêve)
+  - Le jet de moral de Château Dormant
+- Séparation des véhicules dans leur propre acteur
+- Séparation des entités dans leur propre acteur
+- Séparation des créatures dans leur propre acteur
+- La fenêtre de signes draconiques ne sélectionne plus tout les haut-rêvants par défaut
+- Un nouveau personnage a automatiquement son token relié
+- corrections de bugs
+  - si on n'utilise pas les règles de fatigues, un reflet de rêve pouvait garder le Haut-rêvant dans les TMRs pour toujours
+  - certaines macros ne marchaient pas pour les créatures/entités/véhicules/commerces
+  - en cas de charge, les particulières sont toujours en force (p125)
+
 # v11.0
+## v11.0.28 - les fractures de Khrachtchoum
+- La gravité de la blessure est affichée dans le résumé de l'encaissement
+- Lors du changement d'acteur pendant le round
+  - le message annonçant le joueur dont c'est le tour ne contient plus d'informations de santé
+  - un message avec les informations de santé est envoyé au Gardienn et au propriétaire du token.acteur
+  - le jet de vie est bien fait par le token si besoin
+  - seul les propriétaires peuvent faire les jets de vie 
+- Amélioration de la fenêtre de jets
+  - le type de dégâts pour les attaques est toujours affiché
+  - 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

icons/heures/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,5,29,20,57,41.954
+Version=4
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

icons/tmr/attache.svg

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

icons/tmr/conquete.svg

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

icons/tmr/debordement.svg

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

icons/tmr/demi-reve.svg

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

icons/tmr/desorientation.svg

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

icons/tmr/fermeture.svg

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

icons/tmr/maitrisee.svg

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

icons/tmr/pelerinage.svg

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

icons/tmr/periple.svg

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

icons/tmr/present.svg

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

icons/tmr/rencontre.svg

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

icons/tmr/reserve.svg

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

icons/tmr/sort-reserve-humide.svg

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 512 512"
+   style="height: 256px; width: 256px;"
+   version="1.1"
+   id="svg24"
+   sodipodi:docname="sort-reserve-humide3.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata30">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs28" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2794"
+     inkscape:window-height="1756"
+     id="namedview26"
+     showgrid="false"
+     inkscape:zoom="2.8786993"
+     inkscape:cx="323.66586"
+     inkscape:cy="227.70764"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg24" />
+  <g
+     id="g881"
+     transform="translate(2.1482304,2.80716)">
+    <path
+       d="m 243.94189,104.37921 -82.23331,178.13543 82.23331,27.44784 z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path2"
+       style="stroke-width:1.10232" />
+    <path
+       d="m 263.7837,104.37921 v 205.58327 l 82.23331,-27.44784 z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path4"
+       style="stroke-width:1.10232" />
+    <path
+       d="M 168.21228,221.005 18.274279,239.7445 141.75653,278.32581 Z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path6"
+       style="stroke-width:1.10232" />
+    <path
+       d="M 339.51331,221.005 365.96906,278.32581 489.5395,239.7445 Z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path8"
+       style="stroke-width:1.10232" />
+    <path
+       d="M -0.24475089,254.73609 114.97007,398.80973 230.27308,326.7178 Z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path10"
+       style="stroke-width:1.10232" />
+    <path
+       d="M 507.94829,254.73609 277.45251,326.7178 392.75552,398.80973 Z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path12"
+       style="stroke-width:1.10232" />
+    <path
+       d="M 253.8628,335.42615 147.37837,402.00647 H 360.34722 Z"
+       class=""
+       fill="#f4e3d7"
+       fill-opacity="1"
+       id="path14"
+       style="stroke-width:1.10232" />
+  </g>
+</svg>

icons/tmr/sort-reserve.svg

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

icons/tmr/trounoir.svg

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

icons/tmr/urgence.svg

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

lang/fr.json

@@ -1,55 +1,56 @@
 {
   "TYPES": {
     "Actor": { 
-      "Personnage": "Personnage",
+      "personnage": "Personnage",
-      "Creature": "Créature",
+      "creature": "Créature",
-      "Entite": "Entité de cauchemar",
+      "entite": "Entité de cauchemar",
-      "Commerce": "Commerce",
+      "commerce": "Commerce",
-      "Vehicule": "Véhicule"
+      "vehicule": "Véhicule"
     },
     "Item": {
-      "Arme": "Arme",
+      "arme": "Arme",
-      "Armure": "Armure",
+      "armure": "Armure",
-      "Blessure": "Blessure",
+      "blessure": "Blessure",
-      "Casetmr": "TMR spéciale",
+      "casetmr": "Case TMR spéciale",
-      "Chant": "Chant",
+      "chant": "Chant",
-      "Competence": "Compétence",
+      "competence": "Compétence",
-      "Competencecreature": "Compétence de créature",
+      "competencecreature": "Compétence de créature",
-      "Conteneur": "Conteneur",
+      "conteneur": "Conteneur",
-      "Danse": "Danse",
+      "danse": "Danse",
-      "Extraitpoetique": "Extrait poetique",
+      "empoignade": "Empoignade",
-      "Faune": "Faune",
+      "extraitpoetique": "Extrait poetique",
-      "Gemme": "Gemme",
+      "faune": "Faune",
-      "Herbe": "Herbe",
+      "gemme": "Gemme",
-      "Ingredient": "Ingrédient",
+      "herbe": "Herbe",
-      "Jeu": "Jeu",
+      "ingredient": "Ingrédient",
-      "Livre": "Livre",
+      "jeu": "Jeu",
-      "Maladie": "Maladie",
+      "livre": "Livre",
-      "Meditation": "Méditation",
+      "maladie": "Maladie",
-      "Monnaie": "Monnaie",
+      "meditation": "Méditation",
-      "Munition": "Munition",
+      "monnaie": "Monnaie",
-      "Musique": "Musique",
+      "munition": "Munition",
-      "Nombreastral": "Nombre astral",
+      "musique": "Musique",
-      "Nourritureboisson": "Nourriture & boisson",
+      "nombreastral": "Nombre astral",
-      "Objet": "Objet",
+      "nourritureboisson": "Nourriture & boisson",
-      "Oeuvre": "Oeuvre",
+      "objet": "Objet",
-      "Ombre": "Ombre de Thanatos",
+      "oeuvre": "Oeuvre",
-      "Plante": "Plante",
+      "ombre": "Ombre de Thanatos",
-      "Poison": "Poison",
+      "plante": "Plante",
-      "Possession": "Possession",
+      "poison": "Poison",
-      "Potion": "Potion",
+      "possession": "Possession",
-      "Queue": "Queue de Dragon",
+      "potion": "Potion",
-      "Recettealchimique": "Recette alchimique",
+      "queue": "Queue de Dragon",
-      "Recettecuisine": "Recette de cuisine",
+      "recettealchimique": "Recette alchimique",
-      "Rencontre": "Rencontre TMR",
+      "recettecuisine": "Recette de cuisine",
-      "Service": "Service",
+      "rencontre": "Rencontre TMR",
-      "Signedraconique": "Signe draconique",
+      "service": "Service",
-      "Sort": "Sort",
+      "signedraconique": "Signe draconique",
-      "Sortreserve": "Sort en réserve",
+      "sort": "Sort",
-      "Souffle": "Souffle de Dragon",
+      "sortreserve": "Sort en réserve",
-      "Tache": "Tâche",
+      "souffle": "Souffle de Dragon",
-      "Tarot": "Carte de tarot",
+      "tache": "Tâche",
-      "Tete": "Tête de Dragon"
+      "tarot": "Carte de tarot",
+      "tete": "Tête de Dragon"
     }
   },
   "EFFECT": {

module/achat-vente/chat-vente.js

@@ -0,0 +1,65 @@
+import { SYSTEM_RDD } from "../constants.js";
+import { RdDUtility } from "../rdd-utility.js";
+
+const DETAIL_VENTE = 'detailVente';
+const NB_LOTS = 'nbLotss';
+
+export class ChatVente {
+
+  static getDetailVente(chatMessageId) {
+    const chatMessage = game.messages.get(chatMessageId)
+    if (!chatMessage) {
+      return undefined;
+    }
+    const nbLots = chatMessage.getFlag(SYSTEM_RDD, NB_LOTS)
+    const detail = foundry.utils.duplicate(chatMessage.getFlag(SYSTEM_RDD, DETAIL_VENTE))
+    if (!detail.item) {
+      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
+      return undefined;
+    }
+
+    const vendeur = detail.vendeurId ? game.actors.get(detail.vendeurId) : undefined;
+    return foundry.utils.mergeObject(detail,
+      {
+        alias: vendeur?.name ?? game.user.name,
+        vendeur,
+        nbLots: nbLots,
+        chatMessageIdVente: chatMessageId
+      })
+  }
+
+  static getDetailAchatVente(chatMessageId) {
+    const acheteur = RdDUtility.getSelectedActor()
+    const detail = ChatVente.getDetailVente(chatMessageId)
+    if (!acheteur && !detail.vendeur) {
+      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
+      return undefined;
+    }
+    return foundry.utils.mergeObject(detail, { acheteur })
+  }
+
+  static async diminuerQuantiteAchatVente(chatMessageId, quantite) {
+    const chatMessage = game.messages.get(chatMessageId)
+    const vente = ChatVente.getDetailVente(chatMessageId)
+    vente.nbLots = Math.max(0, vente.nbLots - quantite)
+    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
+
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
+    chatMessage.update({ content: html });
+    chatMessage.render(true);
+  }
+
+  static async displayAchatVente(vente) {
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
+    const chatMessage = await ChatMessage.create(RdDUtility.chatDataSetup(html))
+    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
+    await chatMessage.setFlag(SYSTEM_RDD, DETAIL_VENTE, {
+      item: vente.item,
+      properties: vente.item.getProprietes(),
+      vendeurId: vente.vendeurId,
+      tailleLot: vente.tailleLot,
+      quantiteIllimite: vente.quantiteIllimite,
+      prixLot: vente.prixLot
+    })
+  }
+}

module/achat-vente/dialog-item-achat.js

@@ -1,35 +1,13 @@
-import { Misc } from "./misc.js";
+import { Misc } from "../misc.js";
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { ChatVente } from "./chat-vente.js";
 
 export class DialogItemAchat extends Dialog {
 
   static preparerAchat(chatButton) {
-    const vendeurId = chatButton.attributes['data-vendeurId']?.value;
+    return ChatVente.getDetailAchatVente(RdDUtility.findChatMessageId(chatButton))
-    const vendeur = vendeurId ? game.actors.get(vendeurId) : undefined;
-    const acheteur = RdDUtility.getSelectedActor();
-    const json = chatButton.attributes['data-jsondata']?.value;
-    if (!acheteur && !vendeur) {
-      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
-      return undefined;
-    }
-    if (!json) {
-      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
-      return undefined;
-    }
-
-    return {
-      item: JSON.parse(json),
-      vendeur,
-      acheteur,
-      nbLots: parseInt(chatButton.attributes['data-quantiteNbLots']?.value),
-      tailleLot: parseInt(chatButton.attributes['data-tailleLot']?.value ?? 1),
-      prixLot: Number(chatButton.attributes['data-prixLot']?.value ?? 0),
-      quantiteIllimite: chatButton.attributes['data-quantiteIllimite']?.value == 'true',
-      chatMessageIdVente: RdDUtility.findChatMessageId(chatButton),
-    };
   }
 
-
   static async onAcheter({ item, vendeur, acheteur, tailleLot, prixLot, nbLots, quantiteIllimite, chatMessageIdVente }) {
     const venteData = {
       item,
@@ -38,17 +16,21 @@ export class DialogItemAchat extends Dialog {
       acheteur,
       tailleLot,
       quantiteIllimite,
-      quantiteNbLots: nbLots,
+      nbLots,
       choix: { seForcer: false, supprimerSiZero: true },
       prixLot,
       isVente: prixLot > 0,
       isConsommable: item.type == 'nourritureboisson' && acheteur?.isPersonnage(),
       chatMessageIdVente
-    };
+    }
+    if (venteData.vendeur?.id == venteData.acheteur?.id) {
+      ui.notifications.info("Inutile de se vendre à soi-même")
+      return
+    }
 
-    DialogItemAchat.changeNombreLots(venteData, 1);
+    DialogItemAchat.changeNombreLots(venteData, 1)
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData)
-    new DialogItemAchat(html, venteData).render(true);
+    new DialogItemAchat(html, venteData).render(true)
   }
 
   static changeNombreLots(venteData, nombreLots) {
@@ -116,18 +98,18 @@ export class DialogItemAchat extends Dialog {
     this.venteData.choix.seForcer = event.currentTarget.checked;
   }
 
-  setNombreLots(nombreLots) {
+  setNombreLots(nbLots) {
 
     if (!this.venteData.quantiteIllimite) {
-      if (!this.venteData.quantiteIllimite && nombreLots > this.venteData.quantiteNbLots) {
+      if (!this.venteData.quantiteIllimite && nbLots > this.venteData.nbLots) {
-        ui.notifications.warn(`Seulement ${this.venteData.quantiteNbLots} lots disponibles, vous ne pouvez pas en prendre ${nombreLots}`)
+        ui.notifications.warn(`Seulement ${this.venteData.nbLots} lots disponibles, vous ne pouvez pas en prendre ${nbLots}`)
       }
-      nombreLots = Math.min(nombreLots, this.venteData.quantiteNbLots);
+      nbLots = Math.min(nbLots, this.venteData.nbLots);
     }
 
-    DialogItemAchat.changeNombreLots(this.venteData, nombreLots);
+    DialogItemAchat.changeNombreLots(this.venteData, nbLots);
 
-    this.html.find(".nombreLots").val(nombreLots);
+    this.html.find(".nombreLots").val(nbLots);
     this.html.find(".prixTotal").text(this.venteData.prixTotal);
     this.html.find("span.total-sust").text(this.venteData.totalSust);
     this.html.find("span.total-desaltere").text(this.venteData.totalDesaltere);

module/achat-vente/dialog-item-vente.js

@@ -1,29 +1,30 @@
-import { HtmlUtility } from "./html-utility.js";
+import { HtmlUtility } from "../html-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { ChatVente } from "./chat-vente.js";
 
 export class DialogItemVente extends Dialog {
 
-  static async display({ item, callback, quantiteMax = undefined }) {
+  static async display({ item, quantiteMax = undefined }) {
     const quantite = quantiteMax ?? item.getQuantite() ?? 1;
-    const isOwned = item.parent;
     const venteData = {
       item: item,
       alias: item.actor?.name ?? game.user.name,
-      vendeurId: item.actor?.id,
+      vendeurId: item.actor.id,
       prixOrigine: item.calculerPrixCommercant(),
       prixUnitaire: item.calculerPrixCommercant(),
       prixLot: item.calculerPrixCommercant(),
       tailleLot: 1,
-      quantiteNbLots: quantite,
+      nbLots: quantite,
-      quantiteMaxLots: quantite,
+      maxLots: quantite,
       quantiteMax: quantite,
-      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !isOwned,
+      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !item.parent,
-      isOwned: isOwned,
+      isOwned:  item.parent,
-    };
+    }
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
-    return new DialogItemVente(venteData, html, callback).render(true);
+    return new DialogItemVente(venteData, html).render(true);
   }
 
-  constructor(venteData, html, callback) {
+  constructor(venteData, html) {
     let options = { classes: ["dialogvente"], width: 400, height: 'fit-content', 'z-index': 99999 };
 
     let conf = {
@@ -34,7 +35,6 @@ export class DialogItemVente extends Dialog {
     };
 
     super(conf, options);
-    this.callback = callback;
     this.venteData = venteData;
   }
 
@@ -43,7 +43,7 @@ export class DialogItemVente extends Dialog {
 
     this.html = html;
     this.html.find(".tailleLot").change(event => this.setTailleLot(Number(event.currentTarget.value)));
-    this.html.find(".quantiteNbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
+    this.html.find(".nbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
     this.html.find(".quantiteIllimite").change(event => this.setQuantiteIllimite(event.currentTarget.checked));
     this.html.find(".prixLot").change(event => this.setPrixLot(Number(event.currentTarget.value)));
 
@@ -52,16 +52,24 @@ export class DialogItemVente extends Dialog {
 
   async onProposer(it) {
     this.updateVente(this.getChoixVente());
-    this.callback(this.venteData);
+
+    this.venteData["properties"] = this.venteData.item.getProprietes();
+    if (this.venteData.isOwned) {
+      if (this.venteData.nbLots * this.venteData.tailleLot > this.venteData.quantiteMax) {
+        ui.notifications.warn(`Vous avez ${this.venteData.quantiteMax} ${this.venteData.item.name}, ce n'est pas suffisant pour vendre ${this.venteData.nbLots} de ${this.venteData.tailleLot}`)
+        return;
+      }
+    }
+    await ChatVente.displayAchatVente(this.venteData)
   }
 
   updateVente(update) {
-    mergeObject(this.venteData, update);
+    foundry.utils.mergeObject(this.venteData, update);
   }
 
   getChoixVente() {
     return {
-      quantiteNbLots: Number(this.html.find(".quantiteNbLots").val()),
+      nbLots: Number(this.html.find(".nbLots").val()),
       tailleLot: Number(this.html.find(".tailleLot").val()),
       quantiteIllimite: this.html.find(".quantiteIllimite").is(':checked'),
       prixLot: Number(this.html.find(".prixLot").val())
@@ -77,26 +85,26 @@ export class DialogItemVente extends Dialog {
     const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
     this.updateVente({
       tailleLot,
-      quantiteNbLots: Math.min(maxLots, this.venteData.quantiteNbLots),
+      nbLots: Math.min(maxLots, this.venteData.nbLots),
-      quantiteMaxLots: maxLots,
+      maxLots: maxLots,
       prixLot: (tailleLot * this.venteData.prixOrigine).toFixed(2)
     });
 
     this.html.find(".prixLot").val(this.venteData.prixLot);
-    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+    this.html.find(".nbLots").val(this.venteData.nbLots);
-    this.html.find(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
+    this.html.find(".nbLots").attr("max", this.venteData.maxLots)
   }
 
   setNbLots(nbLots) {
     this.updateVente({
-      quantiteNbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots)) : nbLots
+      nbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.maxLots)) : nbLots
     })
-    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+    this.html.find(".nbLots").val(this.venteData.nbLots);
   }
 
   setQuantiteIllimite(checked) {
     this.updateVente({ quantiteIllimite: checked })
     this.html.find(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
-    HtmlUtility.showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
+    HtmlUtility.showControlWhen(this.html.find(".nbLots"), !this.venteData.quantiteIllimite)
   }
 }

module/actor-sheet.js

@@ -11,52 +11,47 @@ 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 { RdDBaseActorSheet } from "./actor/base-actor-sheet.js";
+import { RdDBaseActorReveSheet } from "./actor/base-actor-reve-sheet.js";
 import { RdDItem } from "./item.js";
 import { RdDItemBlessure } from "./item/blessure.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
+import { RdDBaseActorSangSheet } from "./actor/base-actor-sang-sheet.js";
+import { RdDCoeur } from "./coeur/rdd-coeur.js";
 
 /* -------------------------------------------- */
 /**
  * Extend the basic ActorSheet with some very simple modifications
  * @extends {ActorSheet}
  */
-export class RdDActorSheet extends RdDBaseActorSheet {
+export class RdDActorSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    RdDUtility.initAfficheContenu();
+    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-    return mergeObject(super.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
       width: 550,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
       showCompNiveauBase: false,
-      vueDetaillee: false,
       vueArchetype: false,
-    });
+    }, { inplace: false });
   }
 
   /* -------------------------------------------- */
   async getData() {
     let formData = await super.getData();
-    mergeObject(formData,
+    foundry.utils.mergeObject(formData, {
-      {
+      editable: this.isEditable,
-        editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
-        cssClass: this.isEditable ? "editable" : "locked",
+      limited: this.actor.limited,
-        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
+      owner: this.actor.isOwner,
-        limited: this.actor.limited,
+      biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
-        owner: this.actor.isOwner,
+      notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
-        biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
+    });
-        notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
+    foundry.utils.mergeObject(formData.calc, {
-      });
-    mergeObject(formData.calc, {
       surenc: this.actor.computeMalusSurEncombrement(),
       surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
       caracTotal: RdDCarac.computeTotal(this.actor.system.carac, this.actor.system.beaute),
-      surEncombrementMessage: this.actor.getMessageSurEncombrement(),
+      surEncombrementMessage: this.actor.isSurenc() ? "Sur-Encombrement!" : "",
       malusArmure: this.actor.getMalusArmure()
     })
 
@@ -82,11 +77,11 @@ export class RdDActorSheet extends RdDBaseActorSheet {
 
       // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
       const actor = this.actor;
-      formData.combat = duplicate(formData.armes);
+      formData.combat = foundry.utils.duplicate(formData.armes);
       RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
       formData.combat.push(RdDItemArme.mainsNues(actor));
       formData.combat.push(RdDItemArme.empoignade(actor));
-  
+
       formData.esquives = this.actor.getCompetences("Esquive");
       formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
       formData.empoignades = this.actor.getEmpoignades();
@@ -115,42 +110,47 @@ export class RdDActorSheet extends RdDBaseActorSheet {
     return formData;
   }
 
-  /* -------------------------------------------- */  /** @override */
+  /* -------------------------------------------- */
+  /** @override */
   activateListeners(html) {
     super.activateListeners(html);
 
     HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
 
+    this.html.find('.subacteur-open').click(async event => {
+      const subActorId = RdDSheetUtility.getEventItemData(event, 'subactor-id');
+      this.openSubActeur(subActorId);
+    })
+
+    this.html.find('.show-hide-competences').click(async event => {
+      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
+      this.render(true);
+    });
+
+    this.html.find('.visu-tmr').click(async event => this.actor.displayTMR("visu"))
+
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
-    this.html.find('.item-action').click(async event => {
+    this.html.find('.sheet-possession-attack').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
+      const poss = RdDSheetUtility.getItem(event, this.actor)
-      item?.actionPrincipale(this.actor, async () => this.render())
+      this.actor.conjurerPossession(poss)
-    });
+    })
 
+    this.html.find('.subacteur-coeur-toggle a').click(async event => {
+      const subActorIdactorId = RdDSheetUtility.getEventItemData(event, 'subactor-id')
+      const coeurNombre = $(event.currentTarget).data('numero-coeur')
+      RdDCoeur.toggleSubActeurCoeur(this.actor.id, subActorIdactorId, coeurNombre)
+    })
+    this.html.find('.subacteur-tendre-moment').click(async event => {
+      const subActorId = RdDSheetUtility.getEventItemData(event, 'subactor-id')
+      RdDCoeur.startSubActeurTendreMoment(this.actor.id, subActorId)
+    })
     this.html.find('.subacteur-delete').click(async event => {
       const li = RdDSheetUtility.getEventElement(event);
-      const actorId = li.data("actor-id");
+      const subActorId = li.data("subactor-id");
-      if (actorId) {
+      this.deleteSubActeur(subActorId, li);
-        const subActor = game.actors.get(actorId);
+    })
-        RdDUtility.confirmerSuppressionSubacteur(this, subActor, li, () => {
-          console.log('Delete : ', subActor.id);
-          this.actor.removeSubacteur(subActor.id);
-          RdDUtility.slideOnDelete(this, li);
-        });
-      }
-    });
-    this.html.find('.experiencelog-delete').click(async event => {
-      const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
-      const key = Number(li.data("key") ?? -1);
-      await this.actor.deleteExperienceLog(key, 1);
-    });
-    this.html.find('.experiencelog-delete-previous').click(async event => {
-      const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
-      const key = Number(li.data("key") ?? -1);
-      await this.actor.deleteExperienceLog(0, key + 1);
-    });
     this.html.find("input.derivee-value[name='system.compteurs.stress.value']").change(async event => {
       this.actor.updateCompteurValue("stress", parseInt(event.target.value));
     });
@@ -158,30 +158,11 @@ export class RdDActorSheet extends RdDBaseActorSheet {
       this.actor.updateCompteurValue("experience", parseInt(event.target.value));
     });
 
-    this.html.find('.encaisser-direct').click(async event => {
+    this.html.find('.creer-tache').click(async event => this.createEmptyTache());
-      this.actor.encaisser();
+    this.html.find('.creer-une-oeuvre').click(async event => this.selectTypeOeuvreToCreate());
-    })
-    this.html.find('.sheet-possession-attack').click(async event => {
-      const poss = RdDSheetUtility.getItem(event, this.actor)
-      this.actor.conjurerPossession(poss)
-    })
-    this.html.find('.remise-a-neuf').click(async event => {
-      if (game.user.isGM) {
-        this.actor.remiseANeuf();
-      }
-    });
-    this.html.find('.creer-tache').click(async event => {
-      this.createEmptyTache();
-    });
     this.html.find('.creer-tache-blessure-legere').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 2));
     this.html.find('.creer-tache-blessure-grave').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 4));
     this.html.find('.creer-tache-blessure-critique').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 6));
-    this.html.find('.creer-blessure-legere').click(async event => RdDItemBlessure.createBlessure(this.actor, 2));
-    this.html.find('.creer-blessure-grave').click(async event => RdDItemBlessure.createBlessure(this.actor, 4));
-    this.html.find('.creer-blessure-critique').click(async event => RdDItemBlessure.createBlessure(this.actor, 6));
-    this.html.find('.creer-une-oeuvre').click(async event => {
-      this.selectTypeOeuvreToCreate();
-    });
 
     this.html.find('.blessure-premierssoins-done').change(async event => {
       const blessure = this.getBlessure(event);
@@ -201,87 +182,44 @@ export class RdDActorSheet extends RdDBaseActorSheet {
     });
 
     // Equip Inventory Item
-    this.html.find('.item-equip').click(async event => {
+    this.html.find('.item-equip').click(async event => this.actor.equiperObjet(RdDSheetUtility.getItemId(event)))
-      this.actor.equiperObjet(RdDSheetUtility.getItemId(event));
+    this.html.find('.chance-actuelle').click(async event => this.actor.rollCarac('chance-actuelle'))
-    });
 
-    // Roll Carac
+    this.html.find('.chance-appel').click(async event => this.actor.rollAppelChance())
-    this.html.find('.carac-label a').click(async event => {
-      let caracName = event.currentTarget.attributes.name.value;
-      this.actor.rollCarac(caracName.toLowerCase());
-    });
 
-    this.html.find('.chance-actuelle').click(async event => {
+    this.html.find('[name="jet-astrologie"]').click(async event => this.actor.astrologieNombresAstraux())
-      this.actor.rollCarac('chance-actuelle');
+    this.html.find('.tache-label a').click(async event => this.actor.rollTache(RdDSheetUtility.getItemId(event)))
-    });
+    this.html.find('.meditation-label a').click(async event => this.actor.rollMeditation(RdDSheetUtility.getItemId(event)))
 
-    this.html.find('.chance-appel').click(async event => {
+    this.html.find('.chant-label a').click(async event => this.actor.rollChant(RdDSheetUtility.getItemId(event)))
-      this.actor.rollAppelChance();
+    this.html.find('.danse-label a').click(async event => this.actor.rollDanse(RdDSheetUtility.getItemId(event)))
-    });
+    this.html.find('.musique-label a').click(async event => this.actor.rollMusique(RdDSheetUtility.getItemId(event)))
+    this.html.find('.oeuvre-label a').click(async event => this.actor.rollOeuvre(RdDSheetUtility.getItemId(event)))
+    this.html.find('.jeu-label a').click(async event => this.actor.rollJeu(RdDSheetUtility.getItemId(event)))
+    this.html.find('.recettecuisine-label a').click(async event => this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event)))
 
-    this.html.find('[name="jet-astrologie"]').click(async event => {
+    if (game.user.isGM) {
-      this.actor.astrologieNombresAstraux();
+      // experience log
-    });
+      this.html.find('.experiencelog-delete').click(async event => {
-
+        const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
-    // Roll Skill
+        const key = Number(li.data("key") ?? -1);
-    this.html.find('a.competence-label').click(async event => {
+        await this.actor.deleteExperienceLog(key, 1);
-      this.actor.rollCompetence(RdDSheetUtility.getItemId(event));
+      });
-    });
+      this.html.find('.experiencelog-delete-previous').click(async event => {
-    this.html.find('.tache-label a').click(async event => {
+        const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
-      this.actor.rollTache(RdDSheetUtility.getItemId(event));
+        const key = Number(li.data("key") ?? -1);
-    });
+        await this.actor.deleteExperienceLog(0, key + 1);
-    this.html.find('.meditation-label a').click(async event => {
+      });
-      this.actor.rollMeditation(RdDSheetUtility.getItemId(event));
+      // Boutons spéciaux MJs
-    });
+      this.html.find('.forcer-tmr-aleatoire').click(async event => this.actor.reinsertionAleatoire("Action MJ"))
-    this.html.find('.chant-label a').click(async event => {
+      this.html.find('.afficher-tmr').click(async event => this.actor.changeTMRVisible())
-      this.actor.rollChant(RdDSheetUtility.getItemId(event));
+    }
-    });
-    this.html.find('.danse-label a').click(async event => {
-      this.actor.rollDanse(RdDSheetUtility.getItemId(event));
-    });
-    this.html.find('.musique-label a').click(async event => {
-      this.actor.rollMusique(RdDSheetUtility.getItemId(event));
-    });
-    this.html.find('.oeuvre-label a').click(async event => {
-      this.actor.rollOeuvre(RdDSheetUtility.getItemId(event));
-    });
-    this.html.find('.jeu-label a').click(async event => {
-      this.actor.rollJeu(RdDSheetUtility.getItemId(event));
-    });
-    this.html.find('.recettecuisine-label a').click(async event => {
-      this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event));
-    });
-    this.html.find('.subacteur-label a').click(async event => {
-      let actorId = RdDSheetUtility.getEventItemData(event, 'actor-id');
-      let actor = game.actors.get(actorId);
-      if (actor) {
-        actor.sheet.render(true);
-      }
-    });
-
-    // Boutons spéciaux MJs
-    this.html.find('.forcer-tmr-aleatoire').click(async event => {
-      this.actor.reinsertionAleatoire("Action MJ");
-    });
-    this.html.find('.afficher-tmr').click(async event => {
-      this.actor.changeTMRVisible();
-    });
 
     // Points de reve actuel
-    this.html.find('.ptreve-actuel a').click(async event => {
+    this.html.find('.ptreve-actuel a').click(async event => this.actor.rollCarac('reve-actuel', true))
-      this.actor.rollCarac('reve-actuel', true);
+    this.html.find('.empoignade-label a').click(async event => RdDEmpoignade.onAttaqueEmpoignadeFromItem(RdDSheetUtility.getItem(event, this.actor)))
-    });
+    this.html.find('.arme-label a').click(async event => this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event))))
 
-    // Suite empoignade
-    this.html.find('.empoignade-label a').click(async event => {
-      let emp = RdDSheetUtility.getItem(event, this.actor)
-      RdDEmpoignade.onAttaqueEmpoignadeFromItem(emp)
-    });
-    // Roll Weapon1
-    this.html.find('.arme-label a').click(async event => {
-      let arme = this._getEventArmeCombat(event);
-      this.actor.rollArme(duplicate(arme));
-    });
     // Initiative pour l'arme
     this.html.find('.arme-initiative a').click(async event => {
       let combatant = game.combat.combatants.find(c => c.actor.id == this.actor.id);
@@ -292,72 +230,33 @@ export class RdDActorSheet extends RdDBaseActorSheet {
         ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
       }
     });
-    // Display TMR, visualisation
+    // Display TMR
-    this.html.find('.visu-tmr').click(async event => {
-      this.actor.displayTMR("visu");
-    });
 
-    // Display TMR, normal
+    this.html.find('.monte-tmr').click(async event => this.actor.displayTMR("normal"))
-    this.html.find('.monte-tmr').click(async event => {
+    this.html.find('.monte-tmr-rapide').click(async event => this.actor.displayTMR("rapide"))
-      this.actor.displayTMR("normal");
-    });
 
-    // Display TMR, fast 
+    this.html.find('.repos').click(async event => await this.actor.repos())
-    this.html.find('.monte-tmr-rapide').click(async event => {
-      this.actor.displayTMR("rapide");
-    });
 
-    this.html.find('.repos').click(async event => {
+    this.html.find('.carac-xp-augmenter').click(async event => this.actor.updateCaracXPAuto(event.currentTarget.name.replace("augmenter.", "")))
-      await this.actor.repos();
+    this.html.find('.competence-xp-augmenter').click(async event => this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event)))
-    });
+    this.html.find('.competence-stress-augmenter').click(async event => this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event)))
-    this.html.find('.delete-active-effect').click(async event => {
-      if (game.user.isGM) {
-        let effect = this.html.find(event.currentTarget).parents(".active-effect").data('effect');
-        this.actor.removeEffect(effect);
-      }
-    });
-    this.html.find('.enlever-tous-effets').click(async event => {
-      if (game.user.isGM) {
-        await this.actor.removeEffects();
-      }
-    });
-    this.html.find('.carac-xp-augmenter').click(async event => {
-      let caracName = event.currentTarget.name.replace("augmenter.", "");
-      this.actor.updateCaracXPAuto(caracName);
-    });
-    this.html.find('.competence-xp-augmenter').click(async event => {
-      this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event));
-    });
-    this.html.find('.competence-stress-augmenter').click(async event => {
-      this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event));
-    });
 
     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.", "");
-        this.actor.updateCarac(caracName, parseInt(event.target.value));
-      });
       this.html.find('input.carac-xp').change(async event => {
         let caracName = event.currentTarget.name.replace(".xp", "").replace("system.carac.", "");
         this.actor.updateCaracXP(caracName, parseInt(event.target.value));
       });
-      // On competence change
-      this.html.find('.competence-value').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value;
-        //console.log("Competence changed :", compName);
-        this.actor.updateCompetence(compName, parseInt(event.target.value));
-      });
       // On competence xp change
       this.html.find('input.competence-xp').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXP(compName, parseInt(event.target.value));
       });
-      // On competence xp change
       this.html.find('input.competence-xp-sort').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value));
       });
+
       this.html.find('.toggle-archetype').click(async event => {
         this.options.vueArchetype = !this.options.vueArchetype;
         this.render(true);
@@ -367,92 +266,28 @@ export class RdDActorSheet extends RdDBaseActorSheet {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
       });
+      this.html.find('.nouvelle-incarnation').click(async event => this.actor.nouvelleIncarnation())
     }
-    this.html.find('.nouvelle-incarnation').click(async event => {
-      this.actor.nouvelleIncarnation();
-    });
-
-    this.html.find('.show-hide-competences').click(async event => {
-      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
-      this.render(true);
-    });
-
-    this.html.find('.vue-detaillee').click(async event => {
-      this.options.vueDetaillee = !this.options.vueDetaillee;
-      this.render(true);
-    });
 
     // On pts de reve change
-    this.html.find('.pointsreve-value').change(async event => {
+    this.html.find('.pointsreve-value').change(async event => this.actor.update({ "system.reve.reve.value": event.currentTarget.value }))
-      let reveValue = event.currentTarget.value;
+    this.html.find('.seuil-reve-value').change(async event => this.actor.setPointsDeSeuil(event.currentTarget.value))
-      this.actor.update({ "system.reve.reve.value": reveValue });
-    });
 
-    // On seuil de reve change
+    this.html.find('.stress-test').click(async event => this.actor.transformerStress())
-    this.html.find('.seuil-reve-value').change(async event => {
+    this.html.find('.moral-malheureux').click(async event => this.actor.jetDeMoral('malheureuse'))
-      console.log("seuil-reve-value", event.currentTarget)
+    this.html.find('.moral-neutre').click(async event => this.actor.jetDeMoral('neutre'))
-      this.actor.setPointsDeSeuil(event.currentTarget.value);
+    this.html.find('.moral-heureux').click(async event => this.actor.jetDeMoral('heureuse'))
-    });
+    this.html.find('.ethylisme-test').click(async event => this.actor.jetEthylisme())
 
-    // On stress change
+    this.html.find('.ptreve-actuel-plus').click(async event => this.actor.reveActuelIncDec(1))
-    this.html.find('.compteur-edit').change(async event => {
+    this.html.find('.ptreve-actuel-moins').click(async event => this.actor.reveActuelIncDec(-1))
-      let fieldName = event.currentTarget.attributes.name.value;
+    this.html.find('.fatigue-plus').click(async event => this.actor.santeIncDec("fatigue", 1))
-      this.actor.updateCompteurValue(fieldName, parseInt(event.target.value));
+    this.html.find('.fatigue-moins').click(async event => this.actor.santeIncDec("fatigue", -1))
-    });
-
-    this.html.find('.stress-test').click(async event => {
-      this.actor.transformerStress();
-    });
-    this.html.find('.moral-malheureux').click(async event => {
-      this.actor.jetDeMoral('malheureuse');
-    });
-    this.html.find('.moral-neutre').click(async event => {
-      this.actor.jetDeMoral('neutre');
-    });
-    this.html.find('.moral-heureux').click(async event => {
-      this.actor.jetDeMoral('heureuse');
-    });
-    this.html.find('.ethylisme-test').click(async event => {
-      this.actor.jetEthylisme();
-    });
-
-    this.html.find('.jet-vie').click(async event => {
-      this.actor.jetVie();
-    });
-    this.html.find('.jet-endurance').click(async event => {
-      this.actor.jetEndurance();
-    });
-
-    this.html.find('.vie-plus').click(async event => {
-      this.actor.santeIncDec("vie", 1);
-    });
-    this.html.find('.vie-moins').click(async event => {
-      this.actor.santeIncDec("vie", -1);
-    });
-    this.html.find('.endurance-plus').click(async event => {
-      this.actor.santeIncDec("endurance", 1);
-    });
-    this.html.find('.endurance-moins').click(async event => {
-      this.actor.santeIncDec("endurance", -1);
-    });
-    this.html.find('.ptreve-actuel-plus').click(async event => {
-      this.actor.reveActuelIncDec(1);
-    });
-    this.html.find('.ptreve-actuel-moins').click(async event => {
-      this.actor.reveActuelIncDec(-1);
-    });
-    this.html.find('.fatigue-plus').click(async event => {
-      this.actor.santeIncDec("fatigue", 1);
-    });
-    this.html.find('.fatigue-moins').click(async event => {
-      this.actor.santeIncDec("fatigue", -1);
-    });
   }
 
   getBlessure(event) {
-    const itemId = this.html.find(event.currentTarget).parents(".item-blessure").data('item-id');
+    const blessureId = this.html.find(event.currentTarget).parents(".item-blessure").data('item-id');
-    const blessure = this.actor.getItem(itemId, 'blessure');
+    return this.actor.getItem(blessureId, 'blessure');
-    return blessure;
   }
 
   isCompetenceAffichable(competence) {
@@ -466,6 +301,21 @@ export class RdDActorSheet extends RdDBaseActorSheet {
     super._onDropActor(event, dragData);
   }
 
+  openSubActeur(actorId) {
+    game.actors.get(actorId)?.sheet.render(true)
+  }
+
+  deleteSubActeur(actorId, li) {
+    if (actorId) {
+      const subActor = game.actors.get(actorId);
+      RdDUtility.confirmSubActeurDelete(this, subActor, li, () => {
+        console.log('Delete : ', subActor.id);
+        this.actor.deleteSubActeur(subActor.id);
+        RdDUtility.slideOnDelete(this, li);
+      });
+    }
+  }
+
   /* -------------------------------------------- */
   async selectTypeOeuvreToCreate() {
     let types = RdDItem.getTypesOeuvres();
@@ -535,7 +385,7 @@ export class RdDActorSheet extends RdDBaseActorSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = duplicate(item);
+      const splitItem = foundry.utils.duplicate(item);
       splitItem.system.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }

module/actor/base-actor-reve-sheet.js

@@ -0,0 +1,41 @@
+import { Grammar } from "../grammar.js";
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
+import { RdDBaseActorSheet } from "./base-actor-sheet.js";
+
+/* -------------------------------------------- */
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
+      width: 550
+    });
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    this.html.find('.encaisser-direct').click(async event => this.actor.encaisser())
+    this.html.find('.carac-label a').click(async event => this.actor.rollCarac(Grammar.toLowerCaseNoAccent(event.currentTarget.attributes.name.value)));
+    this.html.find('a.competence-label').click(async event => this.actor.rollCompetence(RdDSheetUtility.getItemId(event)));
+    this.html.find('.endurance-plus').click(async event => this.actor.santeIncDec("endurance", 1));
+    this.html.find('.endurance-moins').click(async event => this.actor.santeIncDec("endurance", -1));
+
+    if (game.user.isGM) {
+      this.html.find('.remise-a-neuf').click(async event => this.actor.remiseANeuf())
+      this.html.find('.delete-active-effect').click(async event => this.actor.removeEffect(this.html.find(event.currentTarget).parents(".active-effect").data('effect')));
+      this.html.find('.enlever-tous-effets').click(async event => await this.actor.removeEffects());
+    }
+
+  }
+
+}

module/actor/base-actor-reve.js

@@ -0,0 +1,515 @@
+import { ChatUtility } from "../chat-utility.js";
+import { DialogValidationEncaissement } from "../dialog-validation-encaissement.js";
+import { Grammar } from "../grammar.js";
+import { RdDItemCompetence } from "../item-competence.js";
+import { Misc } from "../misc.js";
+import { RdDEmpoignade } from "../rdd-empoignade.js";
+import { RdDResolutionTable } from "../rdd-resolution-table.js";
+import { RdDEncaisser } from "../rdd-roll-encaisser.js";
+import { RdDRoll } from "../rdd-roll.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
+import { RdDBaseActor } from "./base-actor.js";
+import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
+import { StatusEffects } from "../settings/status-effects.js";
+import { TYPES } from "../item.js";
+import { Targets } from "../targets.js";
+import { RdDPossession } from "../rdd-possession.js";
+import { RdDCombat } from "../rdd-combat.js";
+import { RdDConfirm } from "../rdd-confirm.js";
+import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
+import { RdDItemArme } from "../item-arme.js";
+
+const POSSESSION_SANS_DRACONIC = {
+  img: 'systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp',
+  name: 'Sans draconic',
+  system: {
+    niveau: 0,
+    defaut_carac: "reve-actuel",
+  }
+};
+
+/**
+ * Classe de base pour les acteurs disposant de rêve (donc, pas des objets)
+ * - Entités de rêve
+ * - Créatures de "sang": créatures et humanoides
+ */
+export class RdDBaseActorReve extends RdDBaseActor {
+
+  getCaracChanceActuelle() {
+    return {
+      label: 'Chance actuelle',
+      value: this.getChanceActuel(),
+      type: "number"
+    };
+  }
+
+  getCaracReveActuel() {
+    return {
+      label: 'Rêve actuel',
+      value: this.getReveActuel(),
+      type: "number"
+    };
+  }
+
+  getReveActuel() { return this.getReve() }
+  getChanceActuel() { return this.getChance() }
+
+  getReve() { return Number(this.system.carac.reve?.value ?? 0) }
+  getForce() { return this.getReve() }
+  getTaille() { return Number(this.system.carac.taille?.value ?? 0) }
+  getAgilite() { return this.getForce() }
+  getChance() { return this.getReve() }
+  getMoralTotal() { return 0 }
+  getBonusDegat() { return Number(this.system.attributs?.plusdom?.value ?? 0) }
+  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
+  getSConst() { return 0 }
+
+  /* -------------------------------------------- */
+  getEncombrementMax() { return 0 }
+  isSurenc() { return false }
+  computeMalusSurEncombrement() { return 0 }
+
+  ajustementAstrologique() { return 0 }
+  getMalusArmure() { return 0 }
+
+  getEnduranceActuelle() {
+    return Number(this.system.sante?.endurance?.value ?? 0);
+  }
+  async jetEndurance(resteEndurance = undefined) { return { jetEndurance: 0, sonne: false } }
+  isDead() { return false }
+  blessuresASoigner() { return [] }
+  getEtatGeneral(options = { ethylisme: false }) { return 0 }
+
+  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
+  async remiseANeuf() { }
+  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
+
+  async santeIncDec(name, inc, isCritique = false) { }
+
+  async finDeRound(options = { terminer: false }) {
+    await this.$finDeRoundSuppressionEffetsTermines(options);
+    await this.finDeRoundBlessures();
+    await this.$finDeRoundSupprimerObsoletes();
+    await this.$finDeRoundEmpoignade();
+  }
+
+  async $finDeRoundSuppressionEffetsTermines(options) {
+    for (let effect of this.getEffects()) {
+      if (effect.duration.type !== 'none' && (effect.duration.remaining <= 0 || options.terminer)) {
+        await effect.delete();
+        ChatMessage.create({ content: `${this.name} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
+      }
+    }
+  }
+
+  async finDeRoundBlessures() {
+  }
+
+  async $finDeRoundSupprimerObsoletes() {
+    const obsoletes = []
+      .concat(this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp <= 0))
+      .concat(this.itemTypes[TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2))
+      .map(it => it.id);
+    await this.deleteEmbeddedDocuments('Item', obsoletes);
+  }
+
+  async $finDeRoundEmpoignade() {
+    const immobilisations = this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id);
+    immobilisations.forEach(emp => RdDEmpoignade.onImmobilisation(this,
+      game.actors.get(emp.system.empoigneid),
+      emp
+    ))
+  }
+
+  async setSonne(sonne = true) { }
+
+  /* -------------------------------------------- */
+  getCompetence(idOrName, options = {}) {
+    if (idOrName instanceof Item) {
+      return idOrName.isCompetence() ? idOrName : undefined
+    }
+    return RdDItemCompetence.findCompetence(this.items, idOrName, options)
+  }
+  getCompetences(name) {
+    return RdDItemCompetence.findCompetences(this.items, name)
+  }
+  getCompetenceCorpsACorps(options = {}) {
+    return this.getCompetence("Corps à corps", options)
+  }
+  getCompetencesEsquive() {
+    return this.getCompetences("esquive")
+  }
+
+  getArmeParade(armeParadeId) {
+    const item = armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined;
+    return RdDItemArme.getArme(item);
+  }
+
+  getDraconicOuPossession() {
+    return POSSESSION_SANS_DRACONIC
+  }
+
+  getPossession(possessionId) {
+    return this.itemTypes[TYPES.possession].find(it => it.system.possessionid == possessionId);
+  }
+  getPossessions() {
+    return this.itemTypes[TYPES.possession];
+  }
+  getEmpoignades() {
+    return this.itemTypes[TYPES.empoignade];
+  }
+
+  /* -------------------------------------------- */
+  async updateCreatureCompetence(idOrName, fieldName, value) {
+    let competence = this.getCompetence(idOrName);
+    if (competence) {
+      function getFieldPath(fieldName) {
+        switch (fieldName) {
+          case "niveau": return 'system.niveau';
+          case "dommages": return 'system.dommages';
+          case "carac_value": return 'system.carac_value';
+        }
+        return undefined
+      }
+      const path = getFieldPath(fieldName);
+      if (path) {
+        await competence.update({ [path]: value });
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  isEffectAllowed(effectId) { return false }
+
+  getEffects(filter = e => true) {
+    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
+  }
+
+  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 '';
+  }
+
+  /* -------------------------------------------- */
+  async computeEtatGeneral() {
+    // Par défaut, on ne calcule pas d'état général, seuls les personnages/créatures sont affectés
+    this.system.compteurs.etat.value = 0;
+  }
+
+  /* -------------------------------------------- */
+  async openRollDialog({ name, label, template, rollData, callbackAction }) {
+    const dialog = await RdDRoll.create(this, rollData,
+      { html: template, close: async html => await this._onCloseRollDialog(html) },
+      {
+        name: name,
+        label: label,
+        callbacks: [
+          this.createCallbackExperience(),
+          this.createCallbackAppelAuMoral(),
+          { action: callbackAction }
+        ]
+      });
+    dialog.render(true);
+    return dialog
+  }
+
+  createEmptyCallback() {
+    return {
+      condition: r => false,
+      action: r => { }
+    };
+  }
+  createCallbackExperience() { return this.createEmptyCallback(); }
+  createCallbackAppelAuMoral() { return this.createEmptyCallback(); }
+  async _onCloseRollDialog(html) { }
+
+  /* -------------------------------------------- */
+  async roll() {
+    RdDEmpoignade.checkEmpoignadeEnCours(this)
+
+    const carac = this.getCarac()
+    const selectedCaracName = ['apparence', 'perception', 'force', 'reve'].find(it => carac[it] != undefined)
+
+    await this.openRollDialog({
+      name: `jet-${this.id}`,
+      label: `Jet de ${this.name}`,
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll.html',
+      rollData: {
+        carac: carac,
+        selectedCarac: carac[selectedCaracName],
+        selectedCaracName: selectedCaracName,
+        competences: this.itemTypes['competence']
+      },
+      callbackAction: r => this.$onRollCaracResult(r)
+    });
+  }
+
+  getCarac() {
+    // TODO: le niveau d'une entité de cauchemar devrait être exclu...
+    return foundry.utils.mergeObject(this.system.carac,
+      {
+        'reve-actuel': this.getCaracReveActuel(),
+        'chance-actuelle': this.getCaracChanceActuelle()
+      },
+      { inplace: false })
+  }
+
+  /* -------------------------------------------- */
+  async rollCarac(caracName, jetResistance = undefined) {
+    RdDEmpoignade.checkEmpoignadeEnCours(this)
+    let selectedCarac = this.getCaracByName(caracName)
+    await this.openRollDialog({
+      name: 'jet-' + caracName,
+      label: 'Jet ' + Grammar.apostrophe('de', selectedCarac.label),
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html',
+      rollData: {
+        selectedCarac: selectedCarac,
+        competences: this.itemTypes['competence'],
+        jetResistance: jetResistance ? caracName : undefined
+      },
+      callbackAction: r => this.$onRollCaracResult(r)
+    });
+  }
+
+  /* -------------------------------------------- */
+  async $onRollCaracResult(rollData) {
+    // Final chat message
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-general.html');
+  }
+
+  /* -------------------------------------------- */
+  async rollCompetence(idOrName, options = { tryTarget: true }) {
+    RdDEmpoignade.checkEmpoignadeEnCours(this)
+    const competence = this.getCompetence(idOrName);
+    let rollData = { carac: this.system.carac, competence: competence }
+    if (competence.type == TYPES.competencecreature) {
+      const arme = RdDItemCompetenceCreature.armeCreature(competence)
+      if (arme && options.tryTarget && Targets.hasTargets()) {
+        Targets.selectOneToken(target => {
+          if (arme.action == "possession") {
+            RdDPossession.onAttaquePossession(target, this, competence)
+          }
+          else {
+            RdDCombat.rddCombatTarget(target, this).attaque(competence, arme)
+          }
+        });
+        return;
+      }
+      // Transformer la competence de créature
+      RdDItemCompetenceCreature.setRollDataCreature(rollData)
+    }
+
+    await this.openRollDialog({
+      name: 'jet-competence',
+      label: 'Jet ' + Grammar.apostrophe('de', competence.name),
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
+      rollData: rollData,
+      callbackAction: r => this.$onRollCompetence(r, options)
+    });
+  }
+
+  async $onRollCompetence(rollData, options) {
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
+    if (options?.onRollAutomate) {
+      options.onRollAutomate(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 
+   */
+  rollArme(arme, categorieArme = "competence") {
+    let compToUse = this.$getCompetenceArme(arme, categorieArme)
+    if (!RdDItemArme.isArmeUtilisable(arme)) {
+      ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
+      return
+    }
+    if (!Targets.hasTargets()) {
+      RdDConfirm.confirmer({
+        settingConfirmer: "confirmer-combat-sans-cible",
+        content: `<p>Voulez vous faire un jet de ${compToUse} 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 () => {
+          this.rollCompetence(compToUse, { tryTarget: false })
+        }
+      });
+      return
+    }
+
+    Targets.selectOneToken(target => {
+      if (Targets.isTargetEntite(target)) {
+        ui.notifications.warn(`Vous ne pouvez pas attaquer une entité non incarnée avec votre ${arme.name}!!!!`);
+        return
+      }
+
+      const competence = this.getCompetence(compToUse)
+      if (competence.isCompetencePossession()) {
+        return RdDPossession.onAttaquePossession(target, this, competence);
+      }
+      RdDCombat.rddCombatTarget(target, this).attaque(competence, arme);
+    })
+  }
+
+  $getCompetenceArme(arme, competenceName) {
+    switch (arme.type) {
+      case TYPES.competencecreature:
+        return arme.name
+      case TYPES.arme:
+        switch (competenceName) {
+          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;
+        }
+    }
+    return undefined
+  }
+
+  verifierForceMin(item) {
+  }
+  /* -------------------------------------------- */
+  async resetItemUse() { }
+  async incDecItemUse(itemId, inc = 1) { }
+  getItemUse(itemId) { return 0; }
+
+  /* -------------------------------------------- */
+  async encaisser() { await RdDEncaisser.encaisser(this) }
+
+  async encaisserDommages(rollData, attacker = undefined, show = undefined) {
+    if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
+      return;
+    }
+    const armure = await this.computeArmure(rollData);
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')){
+      await this.encaisserDommagesValidationGR(rollData, armure, attacker?.id, show);
+    } 
+    else {
+      const jet = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
+      await this.$onEncaissement(jet, show, attacker);
+    }
+  }
+
+  async encaisserDommagesValidationGR(rollData, armure, attackerId, show) {
+    if (!game.user.isGM) {
+      RdDBaseActor.remoteActorCall({
+        tokenId: this.token?.id,
+        actorId: this.id,
+        method: 'encaisserDommagesValidationGR',
+        args: [rollData, armure, attackerId, show]
+      });
+    } else {
+      const attacker = game.actors.get(attackerId);
+      DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
+        jet => this.$onEncaissement(jet, show, attacker));
+    }
+  }
+
+  async $onEncaissement(jet, show, attacker) {
+    await this.onAppliquerJetEncaissement(jet, attacker);
+    await this.$afficherEncaissement(jet, show);
+  }
+
+  async onAppliquerJetEncaissement(encaissement, attacker) { }
+
+  async $afficherEncaissement(encaissement, show) {
+    foundry.utils.mergeObject(encaissement, {
+      alias: this.name,
+      hasPlayerOwner: this.hasPlayerOwner,
+      show: show ?? {}
+    });
+
+    await ChatUtility.createChatWithRollMode(this.name, {
+      roll: encaissement.roll,
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
+    });
+
+    if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
+      encaissement = foundry.utils.duplicate(encaissement);
+      encaissement.isGM = true;
+      ChatMessage.create({
+        whisper: ChatMessage.getWhisperRecipients("GM"),
+        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
+      });
+    }
+  }
+
+  /* -------------------------------------------- */
+  async accorder(entite, when = 'avant-encaissement') {
+    if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
+      || entite == undefined
+      || !entite.isEntite([ENTITE_INCARNE])
+      || entite.isEntiteAccordee(this)) {
+      return true;
+    }
+    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.system.carac.niveau.value));
+    const rollData = {
+      alias: this.name,
+      rolled: rolled,
+      entite: entite.name,
+      selectedCarac: this.system.carac.reve
+    };
+
+    if (rolled.isSuccess) {
+      await entite.setEntiteReveAccordee(this);
+    }
+
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-accorder-cauchemar.html');
+    if (rolled.isPart) {
+      await this.appliquerAjoutExperience(rollData, true);
+    }
+    return rolled.isSuccess;
+  }
+
+  isEntiteAccordee(attacker) { return true }
+
+  async setEntiteReveAccordee(attacker) {
+    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entite de cauchemer/rêve");
+  }
+
+}

module/actor/base-actor-sang-sheet.js

@@ -0,0 +1,46 @@
+import { ChatUtility } from "../chat-utility.js";
+import { RdDItemBlessure } from "../item/blessure.js";
+import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
+
+/* -------------------------------------------- */
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+export class RdDBaseActorSangSheet extends RdDBaseActorReveSheet {
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    this.html.find('.creer-blessure-legere').click(async event => RdDItemBlessure.createBlessure(this.actor, 2));
+    this.html.find('.creer-blessure-grave').click(async event => RdDItemBlessure.createBlessure(this.actor, 4));
+    this.html.find('.creer-blessure-critique').click(async event => RdDItemBlessure.createBlessure(this.actor, 6));
+
+    this.html.find('.subir-blessure-contusion').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 2));
+    this.html.find('.subir-blessure-legere').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 2));
+    this.html.find('.subir-blessure-grave').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 4));
+    this.html.find('.subir-blessure-critique').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 6));
+
+    this.html.find('.jet-vie').click(async event => this.actor.jetDeVie())
+    this.html.find('.jet-endurance').click(async event => await this.jetEndurance())
+
+    this.html.find('.vie-plus').click(async event => this.actor.santeIncDec("vie", 1))
+    this.html.find('.vie-moins').click(async event => this.actor.santeIncDec("vie", -1))
+  }
+
+  async jetEndurance() {
+    const endurance = this.actor.getEnduranceActuelle()
+    const result = await this.actor.jetEndurance(endurance);
+    ChatMessage.create({
+      content: `Jet d'Endurance : ${result.jetEndurance} / ${endurance}
+        <br>${this.actor.name} a ${result.sonne ? 'échoué' : 'réussi'} son Jet d'Endurance ${result.sonne ? 'et devient Sonné' : ''}`,
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.actor.name)
+    });
+  }
+
+}

module/actor/base-actor-sang.js

@@ -0,0 +1,282 @@
+import { MAX_ENDURANCE_FATIGUE, RdDUtility } from "../rdd-utility.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
+import { STATUSES } from "../settings/status-effects.js";
+import { TYPES } from "../item.js";
+import { RdDBaseActorReve } from "./base-actor-reve.js";
+import { RdDDice } from "../rdd-dice.js";
+import { RdDItemBlessure } from "../item/blessure.js";
+
+/**
+ * Classe de base pour les acteurs qui peuvent subir des blessures
+ * - créatures
+ * - humanoides
+ */
+export class RdDBaseActorSang extends RdDBaseActorReve {
+
+
+  getForce() { return Number(this.system.carac.force?.value ?? 0) }
+
+  getBonusDegat() { return Number(this.system.attributs?.plusdom?.value ?? 0) }
+  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
+  getSConst() { return 0 }
+
+  getEnduranceMax() { return Math.max(1, Math.min(this.system.sante.endurance.max, MAX_ENDURANCE_FATIGUE)) }
+
+  getFatigueActuelle() {
+    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
+      return Math.max(0, Math.min(this.getFatigueMax(), this.system.sante.fatigue?.value ?? 0));
+    }
+    return 0;
+  }
+
+  getFatigueRestante() { return this.getFatigueMax() - this.getFatigueActuelle() }
+  getFatigueMin() { return this.system.sante.endurance.max - this.system.sante.endurance.value }
+  getFatigueMax() { return this.getEnduranceMax() * 2 }
+
+  malusFatigue() {
+    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
+      return RdDUtility.calculMalusFatigue(this.getFatigueActuelle(), this.getEnduranceMax())
+    }
+    return 0;
+  }
+
+  /* -------------------------------------------- */
+  getEncombrementMax() { return Number(this.system.attributs?.encombrement?.value ?? 0) }
+  isSurenc() { return this.computeMalusSurEncombrement() < 0 }
+
+  computeMalusSurEncombrement() {
+    return Math.min(0, Math.floor(this.getEncombrementMax() - this.encTotal));
+  }
+
+  isDead() { return this.system.sante.vie.value < -this.getSConst() }
+
+  nbBlessuresLegeres() { return this.itemTypes[TYPES.blessure].filter(it => it.isLegere()).length }
+  nbBlessuresGraves() { return this.itemTypes[TYPES.blessure].filter(it => it.isGrave()).length }
+  nbBlessuresCritiques() { return this.itemTypes[TYPES.blessure].filter(it => it.isCritique()).length }
+
+  /* -------------------------------------------- */
+  computeResumeBlessure() {
+    const nbLegeres = this.nbBlessuresLegeres()
+    const nbGraves = this.nbBlessuresGraves()
+    const nbCritiques = this.nbBlessuresCritiques()
+
+    if (nbLegeres + nbGraves + nbCritiques == 0) {
+      return "Aucune blessure";
+    }
+    let resume = "Blessures:";
+    if (nbLegeres > 0) {
+      resume += " " + nbLegeres + " légère" + (nbLegeres > 1 ? "s" : "");
+    }
+    if (nbGraves > 0) {
+      if (nbLegeres > 0)
+        resume += ",";
+      resume += " " + nbGraves + " grave" + (nbGraves > 1 ? "s" : "");
+    }
+    if (nbCritiques > 0) {
+      if (nbGraves > 0 || nbLegeres > 0)
+        resume += ",";
+      resume += " une CRITIQUE !";
+    }
+    return resume;
+  }
+
+  blessuresASoigner() { return [] }
+
+  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
+  async remiseANeuf() { }
+  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
+
+  /* -------------------------------------------- */
+
+  async onAppliquerJetEncaissement(encaissement, attacker) {
+    const santeOrig = foundry.utils.duplicate(this.system.sante);
+    const blessure = await this.ajouterBlessure(encaissement, attacker); // Will update the result table
+    const perteVie = await this.santeIncDec("vie", -encaissement.vie);
+    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, blessure?.isCritique());
+
+    foundry.utils.mergeObject(encaissement, {
+      resteEndurance: perteEndurance.newValue,
+      sonne: perteEndurance.sonne,
+      jetEndurance: perteEndurance.jetEndurance,
+      endurance: perteEndurance.perte,
+      vie: santeOrig.vie.value - perteVie.newValue,
+      blessure: blessure
+    });
+  }
+  /* -------------------------------------------- */
+  async santeIncDec(name, inc, isCritique = false) {
+    if (name == 'fatigue' && !ReglesOptionnelles.isUsing("appliquer-fatigue")) {
+      return;
+    }
+    const sante = foundry.utils.duplicate(this.system.sante)
+    let compteur = sante[name];
+    if (!compteur) {
+      return;
+    }
+    let result = {
+      sonne: false,
+    };
+
+    let minValue = name == "vie" ? -this.getSConst() - 1 : 0;
+
+    result.newValue = Math.max(minValue, Math.min(compteur.value + inc, compteur.max));
+    //console.log("New value ", inc, minValue, result.newValue);
+    let fatigue = 0;
+    if (name == "endurance") {
+      if (result.newValue == 0 && inc < 0 && !isCritique) { // perte endurance et endurance devient 0 (sauf critique) -> -1 vie
+        sante.vie.value--;
+        result.perteVie = true;
+      }
+      result.newValue = Math.max(0, result.newValue);
+      if (inc > 0) { // le max d'endurance s'applique seulement à la récupération
+        result.newValue = Math.min(result.newValue, this._computeEnduranceMax())
+      }
+      const perte = compteur.value - result.newValue;
+      result.perte = perte;
+      if (perte > 1) {
+        // Peut-être sonné si 2 points d'endurance perdus d'un coup
+        foundry.utils.mergeObject(result, await this.jetEndurance(result.newValue));
+      } else if (inc > 0) {
+        await this.setSonne(false);
+      }
+      if (sante.fatigue && inc < 0) { // Each endurance lost -> fatigue lost
+        fatigue = perte;
+      }
+    }
+    compteur.value = result.newValue;
+    // If endurance lost, then the same amount of fatigue cannot be recovered
+    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 })
+    if (this.isDead()) {
+      await this.setEffect(STATUSES.StatusComma, true);
+    }
+    return result
+  }
+
+  /* -------------------------------------------- */
+  _computeEnduranceMax() {
+    const diffVie = this.system.sante.vie.max - this.system.sante.vie.value;
+    const maxEndVie = this.system.sante.endurance.max - (diffVie * 2);
+    const nbGraves = this.countBlessures(it => it.isGrave()) > 0
+    const nbCritiques = this.countBlessures(it => it.isCritique()) > 0
+    const maxEndGraves = Math.floor(this.system.sante.endurance.max / (2 * nbGraves));
+    const maxEndCritiques = nbCritiques > 0 ? 1 : this.system.sante.endurance.max;
+    return Math.max(0, Math.min(maxEndVie, maxEndGraves, maxEndCritiques));
+  }
+
+
+  /* -------------------------------------------- */
+  async ajouterBlessure(encaissement, attacker = undefined) {
+    if (encaissement.gravite < 0) return;
+    if (encaissement.gravite > 0) {
+      while (this.countBlessures(it => it.system.gravite == encaissement.gravite) >= RdDItemBlessure.maxBlessures(encaissement.gravite) && encaissement.gravite <= 6) {
+        // Aggravation
+        encaissement.gravite += 2
+        if (encaissement.gravite > 2) {
+          encaissement.vie += 2;
+        }
+      }
+    }
+    const endActuelle = this.getEnduranceActuelle();
+    const blessure = await RdDItemBlessure.createBlessure(this, encaissement.gravite, encaissement.dmg.loc.label, attacker);
+    if (blessure.isCritique()) {
+      encaissement.endurance = endActuelle;
+    }
+
+    if (blessure.isMort()) {
+      this.setEffect(STATUSES.StatusComma, true);
+      encaissement.mort = true;
+      ChatMessage.create({
+        content: `<img class="chat-icon" src="icons/svg/skull.svg" data-tooltip="charge" />
+        <strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
+      });
+    }
+    return blessure;
+  }
+
+  async supprimerBlessures(filterToDelete) {
+    const toDelete = this.filterItems(filterToDelete, TYPES.blessure)
+      .map(it => it.id);
+    await this.deleteEmbeddedDocuments('Item', toDelete);
+  }
+
+  countBlessures(filter = it => !it.isContusion()) {
+    return this.filterItems(filter, 'blessure').length
+  }
+
+  /* -------------------------------------------- */
+  async jetDeVie() {
+    if (this.isDead()) {
+      ChatMessage.create({ content: `Jet de Vie: ${this.name} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`, whisper: ChatMessage.getWhisperRecipients(this.name) });
+      return
+    }
+    const jetDeVie = await RdDDice.roll("1d20");
+
+    const sConst = this.getSConst();
+    const vie = this.system.sante.vie.value;
+    const isCritique = this.nbBlessuresCritiques() > 0;
+    const isGrave = this.nbBlessuresGraves();
+    const isEchecTotal = jetDeVie.total == 20;
+    const isSuccess = jetDeVie.total == 1 || jetDeVie.total <= vie;
+    const perte = isSuccess ? 0 : 1 + (isEchecTotal ? vie + sConst : 0)
+    const prochainJet = (jetDeVie.total == 1 && vie > 0 ? 20 : 1) * (isCritique ? 1 : isGrave > 0 ? sConst : 0)
+
+    let msgText = `Jet de Vie: <strong>${jetDeVie.total} / ${vie}</strong>`
+    if (isSuccess) {
+      msgText += "<br>Réussi, pas de perte de point de vie."
+    } else {
+      msgText += `<br>Echoué, perte ${perte} point de vie`;
+      await this.santeIncDec("vie", -perte);
+    }
+    if (this.isDead()) {
+      msgText += `<br><strong>${this.name} est mort !!!!</strong>`;
+    }
+    else if (prochainJet > 0) {
+      msgText += `<br>Prochain jet de vie dans ${prochainJet} ${isCritique ? 'round' : 'minute'}${prochainJet > 1 ? 's' : ''} ${isCritique ? '(état critique)' : '(état grave)'}`
+    }
+    ChatMessage.create({ content: msgText, whisper: ChatMessage.getWhisperRecipients(this.name) });
+  }
+
+  /* -------------------------------------------- */
+  async jetEndurance(resteEndurance = undefined) {
+    const jetEndurance = (await RdDDice.roll("1d20")).total;
+    const sonne = jetEndurance == 20 || jetEndurance > (resteEndurance ?? this.system.sante.endurance.value)
+    if (sonne) {
+      await this.setSonne();
+    }
+    return { jetEndurance, sonne }
+  }
+
+  async finDeRoundBlessures() {
+    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
+    if (nbGraves > 0) {
+      // Gestion blessure graves : -1 pt endurance par blessure grave
+      await this.santeIncDec("endurance", -nbGraves);
+    }
+  }
+
+  async setSonne(sonne = true) {
+    if (!game.combat && sonne) {
+      ui.notifications.info(`${this.name} est hors combat, il ne reste donc pas sonné`);
+      return;
+    }
+    await this.setEffect(STATUSES.StatusStunned, sonne);
+  }
+
+  getSonne() {
+    return this.getEffect(STATUSES.StatusStunned);
+  }
+
+  isEffectAllowed(effectId) { return true }
+
+  /* -------------------------------------------- */
+  async computeEtatGeneral() { this.system.compteurs.etat.value = this.malusVie() + this.malusFatigue() + this.malusEthylisme() }
+  getEtatGeneral(options = { ethylisme: false }) { return this.system.compteurs.etat.value }
+
+  malusVie() { return Math.min(this.system.sante.vie.value - this.system.sante.vie.max, 0) }
+  malusEthylisme() { return 0 }
+
+
+}

module/actor/base-actor-sheet.js

@@ -15,23 +15,19 @@ export class RdDBaseActorSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    RdDUtility.initAfficheContenu();
+    return foundry.utils.mergeObject(ActorSheet.defaultOptions, {
-    return mergeObject(super.defaultOptions, {
       classes: ["rdd", "sheet", "actor"],
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
-      width: 550,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
-      showCompNiveauBase: false,
       vueDetaillee: false
-    });
+    }, { inplace: false })
   }
 
   /* -------------------------------------------- */
   async getData() {
     Monnaie.validerMonnaies(this.actor.itemTypes['monnaie']);
 
-    this.actor.recompute();
+    this.actor.computeEtatGeneral();
     let formData = {
       title: this.title,
       id: this.actor.id,
@@ -41,7 +37,9 @@ export class RdDBaseActorSheet extends ActorSheet {
       system: this.actor.system,
       description: await TextEditor.enrichHTML(this.actor.system.description, { async: true }),
       notesmj: await TextEditor.enrichHTML(this.actor.system.notesmj, { async: true }),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable)
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable),
+      effects: this.actor.effects,
+      config: game.system.rdd.config
     }
 
     RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
@@ -139,9 +137,10 @@ export class RdDBaseActorSheet extends ActorSheet {
       RdDUtility.toggleAfficheContenu(this.getItemId(event));
       this.render(true);
     });
+    this.html.find('.actor-montrer').click(async event => this.actor.postActorToChat());
     this.html.find('.item-edit').click(async event => this.getItem(event)?.sheet.render(true))
     this.html.find('.item-montrer').click(async event => this.getItem(event)?.postItemToChat());
-    this.html.find('.actor-montrer').click(async event => this.actor.postActorToChat());
+
     this.html.find('.recherche')
       .each((index, field) => {
         this._rechercheSelectArea(field);
@@ -149,9 +148,16 @@ export class RdDBaseActorSheet extends ActorSheet {
       .keyup(async event => this._rechercherKeyup(event))
       .change(async event => this._rechercherKeyup(event));
     this.html.find('.recherche').prop("disabled", false);
+
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
+    this.html.find('.item-action').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.actionPrincipale(this.actor, async () => this.render())
+    });
+
+
     this.html.find('.item-split').click(async event => {
       const item = this.getItem(event);
       RdDSheetUtility.splitItem(item, this.actor);
@@ -167,6 +173,26 @@ export class RdDBaseActorSheet extends ActorSheet {
     this.html.find('.nettoyer-conteneurs').click(async event => {
       this.actor.nettoyerConteneurs();
     });
+
+    this.html.find('.vue-detaillee').click(async event => {
+      this.options.vueDetaillee = !this.options.vueDetaillee;
+      this.render(true);
+    });
+
+    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.", "");
+        this.actor.updateCarac(caracName, parseInt(event.target.value));
+      });
+      // On competence change
+      this.html.find('.competence-value').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        //console.log("Competence changed :", compName);
+        this.actor.updateCompetence(compName, parseInt(event.target.value));
+      });
+    }
+
   }
 
   _rechercherKeyup(event) {
@@ -288,7 +314,7 @@ export class RdDBaseActorSheet extends ActorSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = duplicate(item);
+      const splitItem = foundry.utils.duplicate(item);
       splitItem.system.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }

module/actor/base-actor.js

@@ -1,38 +1,47 @@
+import { ChatVente } from "../achat-vente/chat-vente.js";
 import { ChatUtility } from "../chat-utility.js";
 import { SYSTEM_SOCKET_ID } from "../constants.js";
+import { Grammar } from "../grammar.js";
 import { Monnaie } from "../item-monnaie.js";
+import { TYPES } from "../item.js";
 import { Misc } from "../misc.js";
 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 { APP_ASTROLOGIE_REFRESH } from "../sommeil/app-astrologie.js";
 
 export class RdDBaseActor extends Actor {
 
+  static _findCaracNode(carac, name) {
+    return Object.entries(carac)
+      .filter(it => Grammar.equalsInsensitive(it[1].label, name))
+      .map(it => it[0])
+      .find(it => it)
+  }
+  static $findCaracByName(carac, name) {
+    const caracList = Object.entries(carac);
+    let entry = Misc.findFirstLike(name, caracList, { mapper: it => it[0], description: 'caractéristique' });
+    if (!entry || entry.length == 0) {
+      entry = Misc.findFirstLike(name, caracList, { mapper: it => it[1].label, description: 'caractéristique' });
+    }
+    return entry && entry.length > 0 ? carac[entry[0]] : undefined;
+  }
+
   static getDefaultImg(itemType) {
     return game.system.rdd.actorClasses[itemType]?.defaultIcon ?? defaultItemImg[itemType];
   }
 
-  /* -------------------------------------------- */
   static init() {
-    Hooks.on("preUpdateItem", (item, change, options, id) => RdDBaseActor.getParentActor(item)?.onPreUpdateItem(item, change, options, id));
+    Hooks.on("preUpdateItem", (item, change, options, id) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
-    Hooks.on("createItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onCreateItem(item, options, id));
+    Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
-    Hooks.on("deleteItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onDeleteItem(item, options, id));
+    Hooks.on("deleteItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onDeleteItem(item, options, id))
-    Hooks.on("updateActor", (actor, change, options, actorId) => actor.onUpdateActor(change, options, actorId));
+    Hooks.on("updateActor", (actor, change, options, actorId) => Misc.documentIfResponsible(actor)?.onUpdateActor(change, options, actorId))
   }
 
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
       case "msg_remote_actor_call":
         return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
-      case "msg_reset_nombre_astral":
-        game.user.character.resetNombresAstraux();
-        game.system.rdd.calendrier.notifyChangeNombresAstraux();
-        return;
-      case "msg_refresh_nombre_astral":
-        Hooks.callAll(APP_ASTROLOGIE_REFRESH);
-        return;
     }
   }
 
@@ -50,13 +59,7 @@ export class RdDBaseActor extends Actor {
 
   static onRemoteActorCall(callData, userId) {
     if (userId == game.user.id) {
-      let actor = game.actors.get(callData?.actorId);
+      const actor = RdDBaseActor.getRealActor(callData?.actorId, callData?.tokenId);
-      if ( callData.tokenId) {
-        let token = canvas.tokens.placeables.find(t => t.id == callData.tokenId)
-        if (token) {
-          actor = token.actor
-        }
-      }
       if (Misc.isOwnerPlayerOrUniqueConnectedGM(actor)) { // Seul le joueur choisi effectue l'appel: le joueur courant si propriétaire de l'actor, ou le MJ sinon
         const args = callData.args;
         console.info(`RdDBaseActor.onRemoteActorCall: pour l'Actor ${callData.actorId}, appel de RdDBaseActor.${callData.method}(`, ...args, ')');
@@ -65,17 +68,27 @@ export class RdDBaseActor extends Actor {
     }
   }
 
-  static getParentActor(document) {
+  static getRealActor(actorId, tokenId) {
-    return document?.parent instanceof Actor ? document.parent : undefined
+    if (tokenId) {
+      let token = canvas.tokens.get(tokenId)
+      if (token) {
+        return token.actor
+      }
+    }
+    return game.actors.get(actorId)
   }
 
+  isPersonnageJoueur() { return false }
+
+  static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
+
   /**
-   * Cet methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
+   * Cette methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
    * compétences et monnaies.
-  *
+   *
-  * @param {Object} actorData template d'acteur auquel ajouter des informations.
+   * @param {Object} actorData template d'acteur auquel ajouter des informations.
-  * @param {Object} options   optionspour customiser la création
+   * @param {Object} options   optionspour customiser la création
-  */
+   */
   static async create(actorData, options) {
     // import depuis un compendium
     if (actorData instanceof Array) {
@@ -99,7 +112,7 @@ export class RdDBaseActor extends Actor {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      mergeObject(context, { rdd: { ready: true } });
+      foundry.utils.mergeObject(context, { rdd: { ready: true } });
       const ActorConstructor = game.system.rdd.actorClasses[docData.type];
       if (ActorConstructor) {
         if (!docData.img) {
@@ -108,14 +121,68 @@ export class RdDBaseActor extends Actor {
         return new ActorConstructor(docData, context);
       }
     }
+    context.rdd = undefined
     super(docData, context);
   }
 
-  isCreatureEntite() { return this.type == 'creature' || this.type == 'entite'; }
+  findCaracByName(name) {
-  isCreature() { return this.type == 'creature'; }
+    name = Grammar.toLowerCaseNoAccent(name)
-  isEntite() { return this.type == 'entite'; }
+    switch (name) {
-  isPersonnage() { return this.type == 'personnage'; }
+      case 'reve-actuel': case 'reve actuel':
-  isVehicule() { return this.type == 'vehicule'; }
+        return this.system.carac.reve
+      case 'chance-actuelle': case 'chance actuelle':
+        return this.system.carac.chance
+      case 'vie':
+        return this.system.sante.vie
+    }
+
+    const carac = this.system.carac;
+    return RdDBaseActor.$findCaracByName(carac, name);
+  }
+
+  getCaracByName(name) {
+    switch (Grammar.toLowerCaseNoAccent(name)) {
+      case 'reve-actuel': case 'reve actuel':
+        return this.getCaracReveActuel();
+      case 'chance-actuelle': case 'chance-actuelle':
+        return this.getCaracChanceActuelle();
+    }
+    return this.findCaracByName(name);
+  }
+
+  /* -------------------------------------------- */
+  async _preCreate(data, options, user) {
+    await super._preCreate(data, options, user);
+
+    // Configure prototype token settings
+    const prototypeToken = {};
+    if (this.type === "personnage") Object.assign(prototypeToken, {
+      sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+    });
+    this.updateSource({ prototypeToken });
+  }
+
+  /* -------------------------------------------- */
+  prepareData() {
+    super.prepareData()
+    this.prepareActorData()
+    this.cleanupConteneurs()
+    this.computeEtatGeneral()
+    this.computeEncTotal()
+  }
+
+  async prepareActorData() { }
+  async computeEtatGeneral() { }
+  /* -------------------------------------------- */
+  findPlayer() {
+    return game.users.players.find(player => player.active && player.character?.id == this.id);
+  }
+
+  isCreatureEntite() { return this.isCreature() || this.isEntite() }
+  isCreature() { return false }
+  isEntite(typeentite = []) { return false }
+  isVehicule() { return false }
+  isPersonnage() { return false }
   getItem(id, type = undefined) {
     const item = this.items.get(id);
     if (type == undefined || (item?.type == type)) {
@@ -124,6 +191,8 @@ export class RdDBaseActor extends Actor {
     return undefined;
   }
 
+  listeSuivants(filter = suivant => true) { return [] }
+  listeSuivants(filter = suivant => true) { return [] }
   listItems(type = undefined) { return (type ? this.itemTypes[type] : this.items); }
   filterItems(filter, type = undefined) { return (type ? this.itemTypes[type] : this.items)?.filter(filter) ?? []; }
   findItemLike(idOrName, type) {
@@ -132,9 +201,7 @@ export class RdDBaseActor extends Actor {
   }
 
   getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
-
+  getEncombrementMax() { return 0 }
-  recompute() { }
-
 
   /* -------------------------------------------- */
   async onPreUpdateItem(item, change, options, id) { }
@@ -163,6 +230,16 @@ export class RdDBaseActor extends Actor {
     await this.createEmbeddedDocuments('Item', [object])
   }
 
+  /* -------------------------------------------- */
+  async cleanupConteneurs() {
+    let updates = this.itemTypes['conteneur']
+      .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
+      .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
+    if (updates.length > 0) {
+      await this.updateEmbeddedDocuments("Item", updates)
+    }
+  }
+
   /* -------------------------------------------- */
   getFortune() {
     return Monnaie.getFortune(this.itemTypes['monnaie']);
@@ -173,7 +250,7 @@ export class RdDBaseActor extends Actor {
     let item = this.getItem(id);
     if (item && item.isInventaire()) {
       const quantite = Math.max(0, item.system.quantite + value);
-      await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'system.quantite': quantite }]);
+      await item.update({ 'system.quantite': quantite });
     }
   }
 
@@ -281,16 +358,13 @@ export class RdDBaseActor extends Actor {
       ChatUtility.notifyUser(achat.userId, 'warn', `Vous n'avez pas assez d'argent pour payer ${Math.ceil(cout / 100)} sols !`);
       return;
     }
-    await this.decrementerVente(vendeur, itemVendu, quantite, cout);
+    await vendeur?.vendre(itemVendu, quantite, cout);
-    if (acheteur) {
+    await acheteur?.acheter(itemVendu, quantite, cout, achat)
-      await acheteur.depenserSols(cout);
+
-      const createdItemId = await acheteur.creerQuantiteItem(itemVendu, quantite);
-      await acheteur.consommerNourritureAchetee(achat, achat.vente, createdItemId);
-    }
     if (cout > 0) {
       RdDAudio.PlayContextAudio("argent");
     }
-    const chatAchatItem = duplicate(achat.vente);
+    const chatAchatItem = foundry.utils.duplicate(achat.vente);
     chatAchatItem.quantiteTotal = quantite;
     ChatMessage.create({
       user: achat.userId,
@@ -300,24 +374,26 @@ export class RdDBaseActor extends Actor {
     });
 
     if (!achat.vente.quantiteIllimite) {
-      if (achat.vente.quantiteNbLots <= achat.choix.nombreLots) {
+      if (achat.vente.nbLots <= achat.choix.nombreLots) {
         ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
       }
       else if (achat.chatMessageIdVente) {
-        achat.vente.properties = itemVendu.getProprietes();
+        await ChatVente.diminuerQuantiteAchatVente(achat.chatMessageIdVente, achat.choix.nombreLots)
-        achat.vente.quantiteNbLots -= achat.choix.nombreLots;
-        achat.vente.jsondata = JSON.stringify(achat.vente.item);
-        const messageVente = game.messages.get(achat.chatMessageIdVente);
-        messageVente.update({ content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', achat.vente) });
-        messageVente.render(true);
       }
     }
   }
 
-  async decrementerVente(vendeur, itemVendu, quantite, cout) {
+  async vendre(item, quantite, cout) {
-    if (vendeur) {
+    await this.ajouterSols(cout);
-      await vendeur.ajouterSols(cout);
+    await this.decrementerQuantiteItem(item, quantite);
-      await vendeur.decrementerQuantiteItem(itemVendu, quantite);
+  }
+
+  async acheter(item, quantite, cout, achat) {
+    await this.depenserSols(cout)
+    const createdItemId = await this.creerQuantiteItem(item, quantite)
+    if (achat.choix.consommer && item.type == 'nourritureboisson' && createdItemId != undefined) {
+      achat.choix.doses = achat.choix.nombreLots;
+      await this.consommerNourritureboisson(createdItemId, achat.choix, achat.vente.actingUserId);
     }
   }
 
@@ -330,31 +406,28 @@ export class RdDBaseActor extends Actor {
     return disponible == undefined || disponible >= quantiteDemande;
   }
 
-  async consommerNourritureAchetee(achat, vente, createdItemId) {
+  async consommerNourritureboisson(itemId, choix, userId) { }
-    if (achat.choix.consommer && vente.item.type == 'nourritureboisson' && createdItemId != undefined) {
-      achat.choix.doses = achat.choix.nombreLots;
-      await this.consommerNourritureboisson(createdItemId, achat.choix, vente.actingUserId);
-    }
-  }
-
 
   async decrementerQuantiteItem(item, quantite, options = { supprimerSiZero: true }) {
     if (item.isService()) {
       return;
     }
+    const itemId = item.id;
     let resteQuantite = (item.system.quantite ?? 1) - quantite;
     if (resteQuantite <= 0) {
       if (options.supprimerSiZero) {
         await this.deleteEmbeddedDocuments("Item", [item.id]);
       }
       else {
-        await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': 0 }]);
+        await this.updateEmbeddedDocuments("Item", [{ _id: itemId, 'system.quantite': 0 }]);
       }
       if (resteQuantite < 0) {
         ui.notifications.warn(`La quantité de ${item.name} était insuffisante, l'objet a donc été supprimé`)
       }
     }
     else if (resteQuantite > 0) {
+      const realItem = this.getItem(item.id)
+      realItem.update({ 'system.quantite': resteQuantite });
       await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': resteQuantite }]);
     }
   }
@@ -366,7 +439,7 @@ export class RdDBaseActor extends Actor {
         type: item.type,
         img: item.img,
         name: item.name,
-        system: mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
+        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined }, { inplace: false })
       };
       const newItems = isItemEmpilable ? [baseItem] : Array.from({ length: quantite }, (_, i) => baseItem);
       const items = await this.createEmbeddedDocuments("Item", newItems);
@@ -375,14 +448,6 @@ export class RdDBaseActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  computeMalusSurEncombrement() {
-    return 0;
-  }
-
-  getEncombrementMax() {
-    return 0;
-  }
-
   async computeEncTotal() {
     if (!this.pack) {
       this.encTotal = this.items.map(it => it.getEncTotal()).reduce(Misc.sum(), 0);
@@ -391,6 +456,10 @@ export class RdDBaseActor extends Actor {
     return 0;
   }
 
+  getEncTotal() {
+    return Math.floor(this.encTotal ?? 0);
+  }
+
   async createItem(type, name = undefined) {
     if (!name) {
       name = 'Nouveau ' + Misc.typeName('Item', type);
@@ -403,14 +472,15 @@ export class RdDBaseActor extends Actor {
   }
 
   async processDropItem(params) {
-    const targetActorId = this.id;
+    const targetActorId = this.id
-    const sourceActorId = params.sourceActorId;
+    const sourceActorId = params.sourceActorId
-    const itemId = params.itemId;
+    const sourceTokenId = params.sourceTokenId
-    const destId = params.destId;
+    const itemId = params.itemId
-    const srcId = params.srcId;
+    const destId = params.destId
+    const srcId = params.srcId
     if (sourceActorId && sourceActorId != targetActorId) {
-      console.log("Moving objects", sourceActorId, targetActorId, itemId);
+      console.log("Moving objects", sourceActorId, sourceTokenId, targetActorId, itemId);
-      this.moveItemsBetweenActors(itemId, sourceActorId);
+      this.moveItemsBetweenActors(itemId, sourceActorId, sourceTokenId);
       return false;
     }
     let result = true;
@@ -483,8 +553,7 @@ export class RdDBaseActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  /** Ajoute un item dans un conteneur, sur la base
+  /** Ajoute un item dans un conteneur, sur la base de leurs ID */
-   * de leurs ID */
   async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
     if (!conteneur) {
       // TODO: afficher
@@ -492,10 +561,8 @@ export class RdDBaseActor extends Actor {
     }
     else if (conteneur.isConteneur()) {
       item.estContenu = true;
-      await this.updateEmbeddedDocuments('Item', [{
+      const nouveauContenu = [...conteneur.system.contenu, item.id];
-        _id: conteneur.id,
+      await conteneur.update({ 'system.contenu': nouveauContenu });
-        'system.contenu': [...conteneur.system.contenu, item.id]
-      }]);
       onAjouterDansConteneur(item.id, conteneur.id);
     }
   }
@@ -555,23 +622,20 @@ export class RdDBaseActor extends Actor {
   async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
     if (conteneur?.isConteneur()) {
       item.estContenu = false;
-      await this.updateEmbeddedDocuments('Item', [{
+      const contenu = conteneur.system.contenu.filter(id => id != item.id);
-        _id: conteneur.id,
+      await conteneur.update({ 'system.contenu': contenu });
-        'system.contenu': conteneur.system.contenu.filter(id => id != item.id)
-      }]);
       onEnleverDeConteneur();
     }
   }
 
   /* -------------------------------------------- */
-  async moveItemsBetweenActors(itemId, sourceActorId) {
+  async moveItemsBetweenActors(itemId, sourceActorId, sourceTokenId) {
-    let itemsList = []
+    let sourceActor = RdDBaseActor.getRealActor(sourceActorId, sourceTokenId)
-    let sourceActor = game.actors.get(sourceActorId);
+    let itemsList = [{ id: itemId, conteneurId: undefined }]
-    itemsList.push({ id: itemId, conteneurId: undefined }); // Init list
     sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list
 
     const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
-      .map(it => duplicate(it))
+      .map(it => foundry.utils.duplicate(it))
       .map(it => { it.system.contenu = []; return it; });
     let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);
 
@@ -580,20 +644,17 @@ export class RdDBaseActor extends Actor {
     for (let item of itemsList) { // Second boucle pour traiter la remise en conteneurs
       // gestion conteneur/contenu
       if (item.conteneurId) { // l'Objet était dans un conteneur
-        let newConteneurId = itemMap[item.conteneurId]; // Get conteneur
+        const newConteneurId = itemMap[item.conteneurId];
-        let newConteneur = this.getItem(newConteneurId);
+        const newConteneur = this.getItem(newConteneurId);
-
+        const newItemId = itemMap[item.id]; // Get newItem
-        let newItemId = itemMap[item.id]; // Get newItem
 
         console.log('New conteneur filling!', newConteneur, newItemId, item);
-        let contenu = duplicate(newConteneur.system.contenu);
+        const nouveauContenu = [...newConteneur.system.contenu, newItemId]
-        contenu.push(newItemId);
+        await newConteneur.update({ 'system.contenu': nouveauContenu })
-        await this.updateEmbeddedDocuments('Item', [{ _id: newConteneurId, 'system.contenu': contenu }]);
       }
     }
-    for (let item of itemsList) {
+    const deletedItemIds = itemsList.map(it => it.id)
-      await sourceActor.deleteEmbeddedDocuments('Item', [item.id]);
+    await sourceActor.deleteEmbeddedDocuments('Item', deletedItemIds);
-    }
   }
 
   _buildMapOldNewId(itemsList, newItems) {
@@ -619,5 +680,20 @@ export class RdDBaseActor extends Actor {
       .then(html => ChatMessage.create(RdDUtility.chatDataSetup(html, modeOverride)));
   }
 
+  actionImpossible(action) {
+    ui.notifications.info(`${this.name} ne peut pas faire cette action: ${action}`)
+
+  }
+  async roll() { this.actionImpossible("jet de caractéristiques") }
+  async jetEthylisme() { this.actionImpossible("jet d'éthylisme") }
+  async rollAppelChance() { this.actionImpossible("appel à la chance") }
+  async jetDeMoral() { this.actionImpossible("jet de moral") }
+
+  async actionPrincipale(item, onActionItem = async () => { }) {
+    switch (item.type) {
+      case TYPES.conteneur: return await item.sheet.render(true);
+    }
+    return undefined
+  }
 
 }

module/actor/commerce-sheet.js

@@ -1,9 +1,7 @@
-import { DialogItemAchat } from "../dialog-item-achat.js";
+import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
 import { RdDItem } from "../item.js";
-import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActorSheet } from "./base-actor-sheet.js";
-import { RdDCommerce } from "./commerce.js";
 
 /**
  * Extend the basic ActorSheet with some very simple modifications
@@ -13,14 +11,11 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
-      width: 600,
+      width: 600, height: 720,
-      height: 720,
+      tabs: []
-      tabs: [],
+    }, { inplace: false })
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
-    });
   }
   get title() {
     if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
@@ -32,7 +27,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   async getData() {
     const formData = await super.getData();
     if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
-      mergeObject(formData,
+      foundry.utils.mergeObject(formData,
         {
           title: this.actor.token.name,
           token: {

module/actor/commerce.js

@@ -7,18 +7,8 @@ export class RdDCommerce extends RdDBaseActor {
     return "systems/foundryvtt-reve-de-dragon/icons/services/commerce.webp";
   }
 
-  prepareData() {
-    super.prepareData();
-  }
-  prepareDerivedData() {
-    super.prepareDerivedData();
-  }
-
   canReceive(item) {
-    if (item.isInventaire('all')) {
+    return item.isInventaire('all');
-      return true;
-    }
-    return super.canReceive(item);
   }
 
   getQuantiteDisponible(item) {
@@ -35,8 +25,7 @@ export class RdDCommerce extends RdDBaseActor {
     }
     await super.depenserSols(cout)
   }
-
+  async consommerNourritureboisson(itemId, choix, userId) { 
-  async consommerNourritureAchetee(achat, vente, createdItemId) {
     // ne pas consommer pour un commerce
   }
 

module/actor/creature-sheet.js

@@ -1,21 +1,18 @@
-import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
+import { RdDBaseActorSangSheet } from "./base-actor-sang-sheet.js";
 
 /**
  * Extend the basic ActorSheet with some very simple modifications
  * @extends {ActorSheet}
  */
-export class RdDActorCreatureSheet extends RdDActorSheet {
+export class RdDCreatureSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
-      width: 640,
+      width: 640, height: 720
-      height: 720,
+    }, { inplace: false })
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
-    });
   }
 
   /* -------------------------------------------- */

module/actor/creature.js

@@ -0,0 +1,59 @@
+import { ENTITE_INCARNE } from "../constants.js";
+import { TYPES } from "../item.js";
+import { STATUSES } from "../settings/status-effects.js";
+import { RdDBaseActorSang } from "./base-actor-sang.js";
+
+export class RdDCreature extends RdDBaseActorSang {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/creatures/bramart.svg";
+  }
+
+  isCreature() { return true }
+
+  canReceive(item) {
+    return item.type == TYPES.competencecreature || item.isInventaire();
+  }
+
+  async remiseANeuf() {
+    await this.removeEffects(e => true);
+    await this.supprimerBlessures(it => true);
+    await this.update({
+      'system.sante.endurance.value': this.system.sante.endurance.max,
+      'system.sante.vie.value': this.system.sante.vie.max,
+      'system.sante.fatigue.value': 0
+    });
+  }
+
+  async finDeRoundBlessures() {
+    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
+    if (nbGraves > 0) {
+      // Gestion blessure graves : -1 pt endurance par blessure grave
+      await this.santeIncDec("endurance", -nbGraves);
+    }
+  }
+
+  isEntiteAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = this.system.sante.resonnance
+      return (resonnance.actors.find(it => it == attacker.id))
+    }
+    return true
+  }
+
+  /* -------------------------------------------- */
+  async setEntiteReveAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = foundry.utils.duplicate(this.system.sante.resonnance);
+      if (resonnance.actors.find(it => it == attacker.id)) {
+        // déjà accordé
+        return;
+      }
+      await this.update({ "system.sante.resonnance": [...resonnance, attacker.id] });
+    }
+    else {
+      super.setEntiteReveAccordee(attacker)
+    }
+  }
+
+}

module/actor/entite-sheet.js

@@ -1,20 +1,17 @@
-import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
-import { RdDSheetUtility } from "./rdd-sheet-utility.js";
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
 
-export class RdDActorEntiteSheet extends RdDActorSheet {
+export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
-      width: 640,
+      width: 640, height: 720,
-      height: 720,
+    }, { inplace: false })
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
-    });
   }
+
   async getData() {
     let formData = await super.getData();
     formData.resonances = this.actor.system.sante.resonnance.actors.map(actorId => game.actors.get(actorId))
@@ -48,18 +45,17 @@ export class RdDActorEntiteSheet extends RdDActorSheet {
       const actorId = li.data("actor-id");
       if (actorId) {
         const actorResonance = game.actors.get(actorId);
-        RdDUtility.confirmerSuppressionSubacteur(this, actorResonance, li, () => {
+        RdDUtility.confirmSubActeurDelete(this, actorResonance, li, () => {
           console.log('Delete : ', actorId);
-          this.removeSubacteur(actorId);
+          this.deleteSubActeur(actorId);
           RdDUtility.slideOnDelete(this, li);
         });
       }
     });
   }
 
-  async removeSubacteur(actorId) {
+  async deleteSubActeur(actorId) {
     let newResonances = this.actor.system.sante.resonnance.actors.filter(id => id != actorId);
     await this.actor.update({ 'system.sante.resonnance.actors': newResonances }, { renderSheet: false });
   }
-
 }

module/actor/entite.js

@@ -0,0 +1,110 @@
+import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
+import { TYPES } from "../item.js";
+import { Misc } from "../misc.js";
+import { RdDEncaisser } from "../rdd-roll-encaisser.js";
+import { STATUSES } from "../settings/status-effects.js";
+import { RdDBaseActorReve } from "./base-actor-reve.js";
+
+export class RdDEntite extends RdDBaseActorReve {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/entites/darquoine.webp";
+  }
+
+  canReceive(item) {
+    return item.type == TYPES.competencecreature
+  }
+
+  isEntite(typeentite = []) {
+    return (typeentite.length == 0 || typeentite.includes(this.system.definition.typeentite));
+  }
+  isNonIncarnee() { return this.isEntite([ENTITE_NONINCARNE]) }
+
+  getReveActuel() {
+    return Misc.toInt(this.system.carac.reve?.value)
+  }
+
+  getForce() { return this.getReve() }
+  getAgilite() { return this.getReve() }
+  getChance() { return this.getReve() }
+
+  getDraconicOuPossession() {
+    return this.itemTypes[TYPES.competencecreature]
+      .filter(it => it.system.categorie == 'possession')
+      .sort(Misc.descending(it => it.system.niveau))
+      .find(it => true);
+  }
+
+  async remiseANeuf() {
+    await this.removeEffects(e => true);
+    if (!this.isNonIncarnee()) {
+      await this.update({
+        'system.sante.endurance.value': this.system.sante.endurance.max
+      });
+    }
+  }
+
+  isDead() {
+    return this.isNonIncarnee() ? false : this.system.sante.endurance.value <= 0
+  }
+
+  async santeIncDec(name, inc, isCritique = false) {
+    if (name == 'endurance' && !this.isNonIncarnee()) {
+      const oldValue = this.system.sante.endurance.value;
+      const endurance = Math.max(0,
+        Math.min(oldValue + inc,
+          this.system.sante.endurance.max));
+      await this.update({ "system.sante.endurance.value": endurance })
+      await this.setEffect(STATUSES.StatusComma, endurance <= 0);
+      return {
+        perte: oldValue - endurance,
+        newValue: endurance
+      }
+    }
+    return {}
+  }
+  async encaisser() {
+    if (this.isNonIncarnee()) {
+      return
+    }
+    await RdDEncaisser.encaisser(this) 
+  }
+
+  isEffectAllowed(effectId) {
+    return [STATUSES.StatusComma].includes(effectId);
+  }
+
+  async onAppliquerJetEncaissement(encaissement, attacker) {
+    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
+    foundry.utils.mergeObject(encaissement, {
+      resteEndurance: perteEndurance.newValue,
+      endurance: perteEndurance.perte
+    });
+  }
+
+  isEntiteAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = this.system.sante.resonnance
+      return (resonnance.actors.find(it => it == attacker.id))
+    }
+    return true
+  }
+
+  /* -------------------------------------------- */
+  async setEntiteReveAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = foundry.utils.duplicate(this.system.sante.resonnance);
+      if (resonnance.actors.find(it => it == attacker.id)) {
+        // déjà accordé
+        return;
+      }
+      resonnance.actors.push(attacker.id);
+      await this.update({ "system.sante.resonnance": resonnance });
+    }
+    else {
+      super.setEntiteReveAccordee(attacker)
+    }
+  }
+
+
+}

module/actor/experience-log.js

@@ -12,7 +12,7 @@ export const XP_TOPIC = {
 export class ExperienceLog {
 
   static async add(actor, topic, from, to, raison, manuel = false) {
-    if (!actor.hasPlayerOwner || !actor.isPersonnage()) {
+    if (!actor.isPersonnageJoueur()) {
       return
     }
     if (from == to) {

module/actor/vehicule-sheet.js

@@ -1,21 +1,31 @@
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
-import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDBaseActorSheet } from "./base-actor-sheet.js";
 
 /* -------------------------------------------- */
-export class RdDActorVehiculeSheet extends RdDActorSheet {
+export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    RdDUtility.initAfficheContenu();
+    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
-
-    return mergeObject(super.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
-      width: 640,
+      width: 640, height: 720,
-      height: 720,
+    }, { inplace: false })
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+  }
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
+
-    });
+  /* -------------------------------------------- */
+  async getData() {
+    let formData = await super.getData();
+    foundry.utils.mergeObject(formData,
+      {
+        editable: this.isEditable,
+        cssClass: this.isEditable ? "editable" : "locked",
+        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
+        limited: this.actor.limited,
+        owner: this.actor.isOwner,
+      });
+
+    this.timerRecherche = undefined;
+    return formData;
   }
 
   activateListeners(html) {

module/actor/vehicule.js

@@ -0,0 +1,28 @@
+import { RdDBaseActor } from "./base-actor.js";
+
+export class RdDVehicule extends RdDBaseActor {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp";
+  }
+  isVehicule() { return true }
+
+  canReceive(item) {
+    return item.isInventaire();
+  }
+
+  getEncombrementMax() {
+    return this.system.capacite_encombrement;
+  }
+
+  async vehicleIncDec(name, inc) {
+    if (!['resistance', 'structure'].includes(name)) {
+      return
+    }
+    const newValue = this.system.etat[name].value + inc;
+    if (0 <= newValue && newValue <= this.system.etat[name].max) {
+      await this.update({ [`system.etat.${name}.value`]: newValue })
+    }
+  }
+
+}

module/chat-utility.js

@@ -1,5 +1,6 @@
 import { Misc } from "./misc.js";
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
 
 
 /**
@@ -14,8 +15,8 @@ export class ChatUtility {
       case "msg_user_ui_notifications": return ChatUtility.onNotifyUser(sockmsg.data);
     }
   }
-  
+
-  
+
   /* -------------------------------------------- */
   static notifyUser(userId, level = 'info', message) {
     const socketData = {
@@ -71,7 +72,7 @@ export class ChatUtility {
   }
 
   static removeChatMessageId(messageId) {
-    if (messageId){
+    if (messageId) {
       ChatUtility.removeMessages({ messageId: messageId });
     }
   }
@@ -118,9 +119,10 @@ export class ChatUtility {
   }
 
   /* -------------------------------------------- */
-  static getWhisperRecipientsAndGMs(name) {
+  static getWhisperRecipientsAndGMs(...names) {
-    let recep1 = ChatMessage.getWhisperRecipients(name) || [];
+    let recipients = [...ChatMessage.getWhisperRecipients('GM')]
-    return recep1.concat(ChatMessage.getWhisperRecipients('GM'));
+    names.forEach(name => recipients.push(...ChatMessage.getWhisperRecipients(name)))
+    return recipients
   }
 
   /* -------------------------------------------- */
@@ -130,7 +132,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = duplicate(chatOptions);
+    let chatGM = foundry.utils.duplicate(chatOptions);
     chatGM.whisper = ChatUtility.getUsers(user => user.isGM);
     chatGM.content = "Message aveugle de " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -147,14 +149,13 @@ export class ChatUtility {
   }
 
   static async setMessageData(chatMessage, key, flag) {
-    if (flag) {
+    if (flag && chatMessage.isAuthor) {
-      await chatMessage.setFlag(SYSTEM_RDD, key, JSON.stringify(flag));
+      await chatMessage.setFlag(SYSTEM_RDD, key, flag)
     }
   }
 
   static getMessageData(chatMessage, key) {
-    const json = chatMessage.getFlag(SYSTEM_RDD, key);
+    return chatMessage.getFlag(SYSTEM_RDD, key);
-    return json ? JSON.parse(json) : undefined;
   }
 
   static getChatMessage(event) {
@@ -162,4 +163,19 @@ export class ChatUtility {
     return game.messages.get(chatMessageId);
   }
 
+  static async onRenderChatMessage(chatMessage, html, data) {
+    const rddTimestamp = chatMessage.getFlag(SYSTEM_RDD, 'rdd-timestamp')
+    if (rddTimestamp) {
+      const timestamp = new RdDTimestamp(rddTimestamp);
+      const timestampData = timestamp.toCalendrier();
+      const dateHeure = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
+      html.find('header.message-header .message-sender').after(dateHeure)
+    }
+  }
+
+  static async onCreateChatMessage(chatMessage, options, id) {
+    if (chatMessage.isAuthor) {
+      await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
+    }
+  }
 }

module/coeur/rdd-coeur.js

@@ -0,0 +1,169 @@
+import { RdDBaseActor } from "../actor/base-actor.js";
+import { ChatUtility } from "../chat-utility.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
+
+const INFO_COEUR = 'info-coeur';
+
+export class RdDCoeur {
+  static registerChatCallbacks(html) {
+    html.on("click", 'a.accepter-tendre-moment', event => {
+      RdDCoeur.accepterTendreMoment(RdDCoeur.extractInfoCoeur(event))
+    })
+    html.on("click", 'a.refuser-tendre-moment', event => {
+      RdDCoeur.refuserTendreMoment(RdDCoeur.extractInfoCoeur(event))
+    })
+    html.on("click", 'a.perdre-point-coeur-douceur', event => {
+      RdDCoeur.perdreEnDouceur(
+        RdDCoeur.extractInfoCoeur(event),
+        event.currentTarget.attributes['data-actor-id'].value)
+    })
+  }
+
+  static addTagsInfoCoeur(infoCoeur, chatMessage = undefined) {
+    if (chatMessage) {
+      infoCoeur.chatMessageId = chatMessage.id
+    }
+    else {
+      chatMessage = game.messages.get(infoCoeur.chatMessageId)
+    }
+    ChatUtility.setMessageData(chatMessage, INFO_COEUR, infoCoeur);
+  }
+
+  static extractInfoCoeur(event) {
+    return ChatUtility.getMessageData(ChatUtility.getChatMessage(event), INFO_COEUR)
+  }
+
+  static getInfoCoeur(sourceActorId, targetActorId) {
+    const sourceActor = game.actors.get(sourceActorId)
+    const targetActor = game.actors.get(targetActorId)
+    if (sourceActor && targetActor) {
+      return {
+        source: {
+          actor: RdDBaseActor.extractActorMin(sourceActor),
+          coeur: sourceActor.getPointsCoeur(targetActorId),
+        },
+        target: {
+          actor: RdDBaseActor.extractActorMin(targetActor),
+          coeur: targetActor.getPointsCoeur(sourceActorId),
+        }
+      }
+    }
+    return {}
+  }
+
+  static async toggleSubActeurCoeur(actorId, subActorId, toggleCoeur) {
+    const actor = game.actors.get(actorId)
+    const amoureux = actor.getSuivant(subActorId)
+    if (toggleCoeur <= amoureux.coeur) {
+      if (toggleCoeur > amoureux.prochainCoeur) {
+        toggleCoeur = amoureux.coeur
+      }
+      else {
+        toggleCoeur = amoureux.coeur - 1
+      }
+    }
+    else if (toggleCoeur <= amoureux.prochainCoeur) {
+      toggleCoeur = Math.max(amoureux.coeur, toggleCoeur - 1)
+    }
+    actor.setPointsCoeur(subActorId, Math.max(0, Math.min(toggleCoeur, 4)))
+  }
+
+  static async applyCoeurChateauDormant(actor, message) {
+    const newSuivants = foundry.utils.duplicate(actor.system.subacteurs.suivants)
+    let count = 0
+    newSuivants.forEach(async link => {
+      const suivant = game.actors.get(link.id)
+      const prochainCoeur = link.prochainCoeur ?? 0;
+      const coeurCourant = link.coeur ?? 0;
+      const diff = prochainCoeur - coeurCourant
+      if (diff < 0) {
+        await actor.moralIncDec(-4);
+        link.coeur = Math.max(0, coeurCourant - 1)
+        link.prochainCoeur = link.coeur
+        message.content += `<br>Votre c&oelig;ur brisé pour ${suivant.name} vous fait perdre 4 points de moral, il vous reste  ${link.coeur} points de C&oelig;ur.`
+        count++
+      }
+      else if (diff > 0) {
+        link.coeur = Math.min(prochainCoeur, 4)
+        message.content += `<br>Votre c&oelig;ur bat fort, vous avez maintenant ${link.coeur} points de C&oelig;ur pour ${suivant.name}.`
+        link.prochainCoeur = link.coeur
+        count++
+      }
+    }
+    )
+    if (count > 0) {
+      await actor.update({ 'system.subacteurs.suivants': newSuivants });
+    }
+  }
+
+  static async startSubActeurTendreMoment(actorId, subActeurId) {
+    const infoCoeur = RdDCoeur.getInfoCoeur(actorId, subActeurId)
+    if (infoCoeur.target?.actor.id) {
+      // TODO: passer par une fenêtre pour saisir sa proposition (lieu, heure, ...)
+      const chatHtml = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/coeur/chat-proposer-tendre-moment.hbs`, infoCoeur)
+      const chatMessage = await ChatMessage.create({
+        whisper: ChatUtility.getWhisperRecipientsAndGMs(infoCoeur.target?.actor.name),
+        content: chatHtml
+      })
+      RdDCoeur.addTagsInfoCoeur(infoCoeur, chatMessage)
+    }
+  }
+
+  static async accepterTendreMoment(infoCoeur) {
+    const target = game.actors.get(infoCoeur.target.actor.id)
+    if (!target.isOwner) {
+      ui.notifications.warn(`vous ne pouvez pas accepter pour ${infoCoeur.target.actor.name}`)
+      return
+    }
+    ChatUtility.removeChatMessageId(infoCoeur.chatMessageId)
+
+    infoCoeur.target.jetTendre = (await (new Roll('1d6').evaluate())).total
+    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate())).total
+    const diff = Math.abs(infoCoeur.source.jetTendre - infoCoeur.target.jetTendre)
+    for (let amoureux of [infoCoeur.source, infoCoeur.target]) {
+      const actorAmoureux = game.actors.get(amoureux.actor.id);
+      amoureux.situation = diff <= amoureux.coeur ? 'heureux' : 'neutre'
+      amoureux.gainMoral = await actorAmoureux.jetDeMoral(amoureux.situation)
+    }
+    const chatHtml = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/coeur/chat-accepter-tendre-moment.hbs`, infoCoeur)
+    const chatMessage = await ChatMessage.create({
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(infoCoeur.source?.actor.name, infoCoeur.target?.actor.name),
+      content: chatHtml
+    })
+    RdDCoeur.addTagsInfoCoeur(infoCoeur, chatMessage)
+  }
+
+  static async refuserTendreMoment(infoCoeur) {
+    const target = game.actors.get(infoCoeur.target.actor.id)
+    if (!target.isOwner) {
+      ui.notifications.warn(`vous ne pouvez pas refuser pour ${infoCoeur.target.actor.name}`)
+      return
+    }
+    ChatUtility.removeChatMessageId(infoCoeur.chatMessageId)
+    const chatHtml = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/coeur/chat-refuser-tendre-moment.hbs`, infoCoeur)
+    await ChatMessage.create({
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(infoCoeur.source?.actor.name, infoCoeur.target?.actor.name),
+      content: chatHtml
+    });
+  }
+
+  static async perdreEnDouceur(infoCoeur, actorId) {
+    const [amoureux, partenaire] = (infoCoeur.source.actor.id == actorId
+      ? [infoCoeur.source, infoCoeur.target]
+      : (infoCoeur.target.actor.id == actorId
+        ? [infoCoeur.target, infoCoeur.source]
+        : [undefined, undefined]))
+
+    if (amoureux.perteCoeur) {
+      ui.notifications.warn(`Le point de c&oelig;ur a déjà été perdu`)
+    }
+    else if (amoureux.coeur > 0) {
+      const actor = game.actors.get(actorId)
+      if (actor.isOwner) {
+        await actor.setPointsCoeur(partenaire?.actor.id, amoureux.coeur - 1, { immediat: true })
+        amoureux.perteCoeur = true
+        RdDCoeur.addTagsInfoCoeur(infoCoeur)
+      }
+    }
+  }
+}

module/constants.js

@@ -8,3 +8,46 @@ export const SHOW_DICE = 'show';
 export const ENTITE_INCARNE = 'incarne';
 export const ENTITE_NONINCARNE = 'nonincarne';
 export const ENTITE_BLURETTE = 'blurette';
+
+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)"}
+  ],
+  categorieEntite: {
+    "cauchemar": "Cauchemar",
+    "reve": "Rêve"
+  },
+  typeEntite: {
+    "incarne": "Incarnée",
+    "nonincarne": "Non Incarnée",
+    "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"}    
+  ],
+  raretes: [
+    {value: "Commune", label: "Commune"},
+    {value: "Frequente", label: "Fréquente"},
+    {value: "Rare", label: "Rare"},
+    {value: "Rarissime", label: "Rarissime"}
+  ]
+}

module/dialog-choix-xp-carac.js

@@ -0,0 +1,84 @@
+
+export class DialogChoixXpCarac extends Dialog {
+
+  static async choix(actor, xpData, caracs) {
+    caracs = caracs.map(it => foundry.utils.mergeObject({ ajout: 0 }, it))
+    xpData = foundry.utils.mergeObject({ reste: xpData.xpCarac }, xpData)
+    const dialogData = {
+      title: `Choisissez la répartition d'expérience`,
+      content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-choix-xp-carac.hbs", {
+        actor,
+        caracDerivee: actor.findCaracByName(xpData.caracName),
+        xpData,
+        caracs
+      }),
+    }
+
+    const dialogOptions = {
+      classes: ["rdd-dialog-select"],
+      width: 400,
+      height: 'fit-content',
+      'z-index': 99999
+    }
+    new DialogChoixXpCarac(dialogData, dialogOptions, actor, xpData, caracs).render(true)
+  }
+
+  constructor(dialogData, dialogOptions, actor, xpData, caracs) {
+    dialogData = foundry.utils.mergeObject(dialogData, {
+      default: 'appliquer',
+      buttons: {
+        'appliquer': { icon:'<i class="fa-solid fa-check"></i>', label: "Ajouter la répartition", callback: it => this.appliquerSelection() }
+      }
+    })
+    super(dialogData, dialogOptions)
+    this.actor = actor
+    this.xpData = xpData
+    this.caracs = caracs
+  }
+
+  activateListeners(html) {
+    //TODO
+    super.activateListeners(html)
+    this.html = html
+    this.html.find("li.xpCarac-option .xpCarac-moins").click(event =>
+      this.ajouterXp(event, -1)
+    )
+    this.html.find("li.xpCarac-option .xpCarac-plus").click(event =>
+      this.ajouterXp(event, 1)
+    )
+  }
+
+  async ajouterXp(event, delta) {
+    const liCarac = this.html.find(event.currentTarget)?.parents("li.xpCarac-option")
+    const label = liCarac?.data("carac-label")
+    const carac = this.caracs.find(c => c.label == label)
+    if (carac.ajout + delta < 0) {
+      ui.notifications.warn(`Impossible de diminuer les points à répartir en ${carac.label} en dessous de 0`)
+      return
+    }
+    if (this.xpData.reste - delta < 0) {
+      ui.notifications.warn(`Il ne reste plus de points à répartir en ${carac.label}`)
+      return
+    }
+    carac.ajout += delta
+    this.xpData.reste -= delta
+    liCarac.find("input.xpCarac-view-ajout").val(carac.ajout)
+    this.html.find("input.xpCarac-reste").val(this.xpData.reste)
+  }
+
+  async appliquerSelection() {
+    if (this.xpData.reste > 0) {
+      ui.notifications.warn(`Il vous reste ${this.xpData.reste} points à répartir`)
+      return
+    }
+    this.caracs.filter(c => c.ajout > 0).forEach(c => {
+      const xpData = { caracName: c.label, xpCarac: c.ajout }
+      this.actor._xpCarac(xpData)
+    })
+    await super.close()
+  }
+
+  async close() { }
+
+  _getHeaderButtons() { return [] }
+}

module/dialog-chronologie.js

@@ -25,6 +25,7 @@ export class DialogChronologie extends Dialog {
       journalId: game.settings.get(SYSTEM_RDD, LATEST_USED_JOURNAL_ID),
       journaux: game.journal.filter(it => it.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)),
       timestamp: game.system.rdd.calendrier.timestamp,
+      config: game.system.rdd.config,
       dateReel: game.system.rdd.calendrier.dateReel()
     };
     const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-chronologie.html", dialogData);

module/dialog-create-signedraconique.js

@@ -14,7 +14,7 @@ export class DialogCreateSigneDraconique extends Dialog {
         .map(actor => ({
           id: actor.id,
           name: actor.name,
-          selected: true
+          selected: false
         }))
     };
 

module/dialog-fabriquer-potion.js

@@ -21,7 +21,7 @@ export class DialogFabriquerPotion extends Dialog {
 
   /* -------------------------------------------- */
   static prepareData(actor, item) {
-    let potionData = duplicate(item)
+    let potionData = foundry.utils.duplicate(item)
     potionData.nbBrinsSelect = RdDUtility.buildListOptions(
       DialogFabriquerPotion.nombreBrinsMinimum(item),
       DialogFabriquerPotion.nombreBrinsOptimal(item));

module/dialog-item-consommer.js

@@ -47,7 +47,7 @@ export class DialogConsommer extends Dialog {
   /* -------------------------------------------- */
   static prepareData(actor, item) {
     let consommerData = {
-      item: duplicate(item),
+      item: foundry.utils.duplicate(item),
       cuisine: actor.getCompetence('cuisine'),
       choix: {
         doses: 1,

module/dialog-select-target.js

@@ -1,37 +0,0 @@
-
-export class DialogSelectTarget extends Dialog {
-  constructor(html, onSelectTarget, targets) {
-    const options = {
-      classes: ["rdd-dialog-select-target"],
-      width: 'fit-content',
-      height: 'fit-content',
-      'max-height': 600,
-      'z-index': 99999
-    };
-    const conf = {
-      title: "Choisir une cible",
-      content: html,
-      buttons: {}
-    };
-    super(conf, options);
-    this.onSelectTarget = onSelectTarget;
-    this.targets = targets;
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-    this.html.find("li.select-target").click((event) => {
-      this.targetSelected(this.html.find(event.currentTarget)?.data("token-id"));
-    });
-  }
-
-
-  targetSelected(tokenId) {
-    const target = this.targets.find(it => it.id == tokenId);
-    this.close();
-    if (target) {
-      this.onSelectTarget(target);
-    }
-  }
-}

module/dialog-select.js

@@ -0,0 +1,45 @@
+
+export class DialogSelect extends Dialog {
+  static extractIdNameImg(it) { return { id: it.id, name: it.name, img: it.img } }
+
+  static async select(selectData, onSelectChoice) {
+    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-select.html", selectData)
+
+    const dialogData = {
+      title: selectData.title ?? selectData.label,
+      content: html,
+      buttons: {}
+    }
+
+    const dialogOptions = {
+      classes: ["rdd-dialog-select"],
+      width: 'fit-content',
+      height: 'fit-content',
+      'max-height': 600,
+      'z-index': 99999
+    }
+    new DialogSelect(dialogData, dialogOptions, selectData, onSelectChoice).render(true)
+  }
+
+  constructor(dialogData, dialogOptions, selectionData, onSelectChoice) {
+    super(dialogData, dialogOptions)
+    this.selectionData = selectionData
+    this.onSelectChoice = onSelectChoice
+  }
+
+  activateListeners(html) {
+    super.activateListeners(html)
+    this.html = html
+    this.html.find("li.select-choice").click(event =>
+      this.choiceSelected(this.html.find(event.currentTarget)?.data("id"))
+    )
+  }
+
+  choiceSelected(selectedId) {
+    const selected = this.selectionData.find(it => it.id == selectedId)
+    this.close()
+    if (selected) {
+      this.onSelectChoice(selected)
+    }
+  }
+}

module/dialog-validation-encaissement.js

@@ -7,20 +7,19 @@ import { RdDUtility } from "./rdd-utility.js";
  */
 export class DialogValidationEncaissement extends Dialog {
 
-  static async validerEncaissement(actor, rollData, armure, show, attackerId, onEncaisser) {
+  static async validerEncaissement(actor, rollData, armure, onEncaisser) {
     let encaissement = await RdDUtility.jetEncaissement(rollData, armure, { showDice: HIDE_DICE });
     const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.html', {
       actor: actor,
       rollData: rollData,
-      encaissement: encaissement,
+      encaissement: encaissement
-      show: show
     });
-    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, show, attackerId, onEncaisser);
+    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, onEncaisser);
     dialog.render(true);
   }
 
   /* -------------------------------------------- */
-  constructor(html, actor, rollData, armure, encaissement, show, attackerId, onEncaisser) {
+  constructor(html, actor, rollData, armure, encaissement, onEncaisser) {
     // Common conf
     let buttons = {
       "valider": { label: "Valider", callback: html => this.onValider() },
@@ -47,8 +46,6 @@ export class DialogValidationEncaissement extends Dialog {
     this.rollData = rollData;
     this.armure = armure;
     this.encaissement = encaissement;
-    this.show = show;
-    this.attackerId = attackerId;
     this.onEncaisser = onEncaisser;
     this.forceDiceResult = {total: encaissement.roll.result };
   }
@@ -67,6 +64,6 @@ export class DialogValidationEncaissement extends Dialog {
 
   async onValider() {
     this.encaissement = await RdDUtility.jetEncaissement(this.rollData, this.armure, { showDice: SHOW_DICE, forceDiceResult: this.forceDiceResult});
-    this.onEncaisser(this.encaissement, this.show, this.attackerId)
+    this.onEncaisser(this.encaissement)
   }
 }

module/item-arme.js

@@ -20,7 +20,7 @@ const nomCategorieParade = {
 export class RdDItemArme extends Item {
 
   static isArme(item) {
-    return RdDItemCompetenceCreature.getCategorieAttaque(item) || item.type == TYPES.arme;
+    return item.type == TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item);
   }
 
   /* -------------------------------------------- */
@@ -139,7 +139,7 @@ export class RdDItemArme extends Item {
       const uneOuDeuxMains = armeData.system.unemain && armeData.system.deuxmains;
       const containsSlash = !Number.isInteger(armeData.system.dommages) && armeData.system.dommages.includes("/");
       if (containsSlash) { // Sanity check
-        armeData = duplicate(armeData);
+        armeData = foundry.utils.duplicate(armeData);
 
         const tableauDegats = armeData.system.dommages.split("/");
         if (aUneMain)
@@ -166,7 +166,11 @@ export class RdDItemArme extends Item {
   }
 
   static isArmeUtilisable(arme) {
-    return arme.type == 'arme' && arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0);
+    switch (arme.type) {
+      case TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
+      case TYPES.competencecreature: return true
+    }
+    return false
   }
 
   static ajoutCorpsACorps(armes, actor) {
@@ -191,6 +195,7 @@ export class RdDItemArme extends Item {
         dommagesReels: 0,
         mortalite: 'non-mortel',
         competence: 'Corps à corps',
+        resistance: 1,
         deuxmains: true,
         categorie_parade: 'sans-armes'
       }

module/item-competence.js

@@ -199,7 +199,7 @@ export class RdDItemCompetence extends Item {
     if (idOrName == undefined || idOrName == "") {
       return RdDItemCompetence.sansCompetence();
     }
-    options = mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false });
+    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false, inplace: false });
     return RdDItemCompetence.findFirstItem(list, idOrName, options);
   }
 
@@ -257,7 +257,7 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static computeResumeArchetype(competences) {
-    const computed = duplicate(limitesArchetypes);
+    const computed = foundry.utils.duplicate(limitesArchetypes);
     computed.forEach(it => { it.nombre = 0; it.reste = it.nombreMax; });
 
     competences.map(it => Math.max(0, it.system.niveau_archetype))

module/item-competencecreature.js

@@ -33,8 +33,7 @@ export class RdDItemCompetenceCreature extends Item {
     if (categorieAttaque != undefined) {
       // si c'est un Item compétence: cloner pour ne pas modifier la compétence
       let arme = item.clone();
-      mergeObject(arme,
+      return foundry.utils.mergeObject(arme, {
-        {
           action: item.isCompetencePossession() ? 'possession' : 'attaque',
           system: {
             competence: arme.name,
@@ -48,13 +47,26 @@ export class RdDItemCompetenceCreature extends Item {
             force: 0,
             rapide: true,
           }
-        });
+        }, { inplace: false });
-      return arme;
     }
     return undefined;
   }
 
   /* -------------------------------------------- */
+  static isCompetenceAttaque(item) {
+    if (item.type == TYPES.competencecreature) {
+      switch (item.system.categorie) {
+        case "melee":
+        case "tir":
+        case "lancer":
+        case "naturelle":
+        case "possession":
+          return true
+      }
+    }
+    return undefined
+  }
+
   static getCategorieAttaque(item) {
     if (item.type == TYPES.competencecreature) {
       switch (item.system.categorie) {
@@ -63,6 +75,7 @@ export class RdDItemCompetenceCreature extends Item {
         case "lancer":
         case "naturelle":
         case "possession":
+        case "parade":
           return item.system.categorie
       }
     }

module/item-monnaie.js

@@ -57,7 +57,7 @@ export class Monnaie {
   }
 
   static creerDeniers(fortune) {
-    const deniers = duplicate(MONNAIE_ETAIN);
+    const deniers = foundry.utils.duplicate(MONNAIE_ETAIN);
     deniers.system.quantite = fortune;
     return deniers;
   }

module/item-sheet.js

@@ -39,12 +39,12 @@ export class RdDItemSheet extends ItemSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
       template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
       width: 550,
       height: 550
-    });
+    }, { inplace: false });
   }
 
   /* -------------------------------------------- */
@@ -98,7 +98,8 @@ export class RdDItemSheet extends ItemSheet {
       description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
       descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
       isComestible: this.item.getUtilisationCuisine(),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable)
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable),
+      config: game.system.rdd.config
     }
     if (this.item.type == TYPES.competencecreature) {
       formData.isparade = RdDItemCompetenceCreature.isParade(this.item)
@@ -108,8 +109,8 @@ export class RdDItemSheet extends ItemSheet {
     const competences = await SystemCompendiums.getCompetences('personnage');
     formData.categories = this.item.getCategories()
     if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
-      formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
+      formData.caracList = foundry.utils.duplicate(game.model.Actor.personnage.carac)
-      formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
+      formData.caracList["reve-actuel"] = foundry.utils.duplicate(game.model.Actor.personnage.reve.reve)
       formData.competences = competences;
     }
     if (this.item.type == 'arme') {
@@ -195,7 +196,8 @@ export class RdDItemSheet extends ItemSheet {
 
     this.html.find('.creer-tache-livre').click((event) => this._getEventActor(event).creerTacheDepuisLivre(this.item));
     this.html.find('.consommer-potion').click((event) => this._getEventActor(event).consommerPotion(this.item, this.getActionRenderItem()));
-    this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).dialogFabriquerPotion(this.item));
+    this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).actionHerbe(this.item));
+    this.html.find('input[name="system.cacher_points_de_tache"]').change(async event => await this.item.update({ 'system.cacher_points_de_tache': event.currentTarget.checked }));
 
     this.html.find('.alchimie-tache a').click((event) => {
       let actor = this._getEventActor(event);
@@ -227,7 +229,7 @@ export class RdDItemSheet extends ItemSheet {
       });
     }
 
-    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: duplicate(timestamp) })
+    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: foundry.utils.duplicate(timestamp) })
 
     RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.debut', updateItemTimestamp);
     RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.fin', updateItemTimestamp);
@@ -256,7 +258,7 @@ export class RdDItemSheet extends ItemSheet {
 
     if (this.item.isCompetence()) {
       const categorie = event.currentTarget.value;
-      const level =  RdDItemCompetence.getNiveauBase(categorie, this.item.getCategories());
+      const level = RdDItemCompetence.getNiveauBase(categorie, this.item.getCategories());
       this.item.system.base = level;
       this.html.find('[name="system.base"]').val(level);
     }

module/item.js

@@ -1,4 +1,4 @@
-import { DialogItemVente } from "./dialog-item-vente.js";
+import { DialogItemVente } from "./achat-vente/dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDHerbes } from "./rdd-herbes.js";
@@ -177,7 +177,7 @@ export class RdDItem extends Item {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      mergeObject(context, { rdd: { ready: true } });
+      foundry.utils.mergeObject(context, { rdd: { ready: true } });
       const ItemConstructor = game.system.rdd.itemClasses[docData.type];
       if (ItemConstructor) {
         if (!docData.img) {
@@ -189,6 +189,7 @@ export class RdDItem extends Item {
     if (!docData.img) {
       docData.img = RdDItem.getDefaultImg(docData.type);
     }
+    context.rdd = undefined
     super(docData, context);
   }
 
@@ -227,25 +228,15 @@ export class RdDItem extends Item {
   }
 
   isCorpsACorps() {
-    return (this.isCompetence()
+    return this.isCompetence()
       && this.system.categorie == 'melee'
-      && Grammar.includesLowerCaseNoAccent(this.name, 'Corps à Corps'));
+      && Grammar.includesLowerCaseNoAccent(this.name, 'Corps à Corps')
   }
 
   isCompetenceArme() {
-    if (this.isCompetence()) {
+    return this.isCompetence() && ['melee', 'tir', 'lancer'].includes(this.system.categorie)
-      switch (this.system.categorie) {
-        case 'melee':
-          return !this.isCorpsACorps() && !this.isEsquive()
-        case 'tir':
-        case 'lancer':
-          return true;
-      }
-    }
-    return false;
   }
 
-
   isCompetencePossession() { return TYPES.competencecreature == this.type && this.system.categorie == "possession" }
   isTemporel() { return typesObjetsTemporels.includes(this.type) }
   isOeuvre() { return typesObjetsOeuvres.includes(this.type) }
@@ -327,8 +318,8 @@ export class RdDItem extends Item {
       const timestampFin = await this.calculerFinPeriodeTemporel(timestampDebut);
       await actor.updateEmbeddedDocuments('Item', [{
         _id: this.id,
-        'system.temporel.debut': duplicate(timestampDebut),
+        'system.temporel.debut': foundry.utils.duplicate(timestampDebut),
-        'system.temporel.fin': duplicate(timestampFin),
+        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
       }])
     }
   }
@@ -498,11 +489,11 @@ export class RdDItem extends Item {
     if (this.actor?.isPersonnage()) {
       const warn = options.warnIfNot;
       if (this.getUtilisationCuisine() == 'brut') {
-        return 'Utiliser';
+        return 'Cuisiner';
       }
       switch (this.type) {
         case TYPES.nourritureboisson: return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn);
-        case TYPES.potion: return this._actionOrWarnQuantiteZero('Boire', warn);
+        case TYPES.potion: return this._actionOrWarnQuantiteZero('Consommer', warn);
         case TYPES.livre: return this._actionOrWarnQuantiteZero('Lire', warn);
         case TYPES.herbe: return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined;
         case TYPES.queue: case TYPES.ombre: return this.system.refoulement > 0 ? 'Refouler' : undefined;
@@ -513,19 +504,8 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   async actionPrincipale(actor, onActionItem = async () => { }) {
-    if (!this.getActionPrincipale()) {
+    if (!this.getActionPrincipale()) { return }
-      return;
+    await actor?.actionPrincipale(this, onActionItem);
-    }
-    if (await actor.actionNourritureboisson(this, onActionItem)) {
-      return;
-    }
-    switch (this.type) {
-      case TYPES.potion: return await actor.consommerPotion(this, onActionItem);
-      case TYPES.livre: return await actor.actionLire(this);
-      case TYPES.conteneur: return await this.sheet.render(true);
-      case TYPES.herbe: return await actor.actionHerbe(this, onActionItem);
-      case TYPES.queue: case TYPES.ombre: return await actor.actionRefoulement(this);
-    }
   }
 
   _actionOrWarnQuantiteZero(actionName, warn) {
@@ -559,7 +539,7 @@ export class RdDItem extends Item {
           _id: this.id,
           'system.quantite': this.system.quantite * sust,
           'system.encombrement': Misc.keepDecimals(this.system.encombrement / sust, 2),
-          'system.cout': Misc.keepDecimals(this.system.cout / sust, 2),
+          'system.cout': Math.max(0, Misc.keepDecimals(this.system.cout / sust, 2)),
           'system.sust': 1
         }])
       }
@@ -642,23 +622,7 @@ export class RdDItem extends Item {
       ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le proposer`);
       return;
     }
-    await DialogItemVente.display({
+    await DialogItemVente.display({ item: this, quantiteMax })
-      item: this,
-      quantiteMax,
-      callback: async (vente) => {
-        vente["properties"] = this.getProprietes();
-        if (vente.isOwned) {
-          if (vente.quantiteNbLots * vente.tailleLot > vente.quantiteMax) {
-            ui.notifications.warn(`Vous avez ${vente.quantiteMax} ${vente.item.name}, ce n'est pas suffisant pour vendre ${vente.quantiteNbLots} de ${vente.tailleLot}`)
-            return;
-          }
-        }
-        vente.jsondata = JSON.stringify(vente.item);
-
-        let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
-        ChatMessage.create(RdDUtility.chatDataSetup(html));
-      }
-    });
   }
 
   /* -------------------------------------------- */
@@ -808,7 +772,7 @@ export class RdDItem extends Item {
       `<b>Périodicité</b>: ${this.system.periodicite}`,
       `<b>Fatigue</b>: ${this.system.fatigue}`,
       `<b>Difficulté</b>: ${this.system.difficulte}`,
-      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, this.system.cacher_points_de_tache),
+      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, !this.system.cacher_points_de_tache),
       `<b>Points de Tâche atteints</b>: ${this.system.points_de_tache_courant}`]
   }
   /* -------------------------------------------- */
@@ -817,7 +781,7 @@ export class RdDItem extends Item {
       `<b>Compétence</b>: ${this.system.competence}`,
       `<b>Auteur</b>: ${this.system.auteur}`,
       `<b>Difficulté</b>: ${this.system.difficulte}`,
-      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, this.system.cacher_points_de_tache),
+      RdDItem.propertyIfDefined('Points de Tâche', this.system.points_de_tache, !this.system.cacher_points_de_tache),
       ...this._inventaireTemplateChatData()
     ]
   }

module/item/blessure.js

@@ -1,6 +1,7 @@
 import { RdDItem } from "../item.js";
 import { Misc } from "../misc.js";
 import { RdDTimestamp } from "../time/rdd-timestamp.js";
+import { ChatUtility } from "../chat-utility.js";
 
 const BASE_TACHE_SOIN_BLESSURE = {
   type: "tache",
@@ -14,10 +15,10 @@ const TACHES_SOIN_BLESSURE = {
 }
 
 const definitionsBlessures = [
-  { type: "contusion", gravite: 0, label: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
+  { type: "contusion", gravite: 0, endurance: "1d4", vie: 0, label: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
-  { type: "legere", gravite: 2, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "legere", gravite: 2, endurance: "1d6", vie: 0, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
-  { type: "grave", gravite: 4, label: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "grave", gravite: 4, endurance: "2d6", vie: -2, label: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
-  { type: "critique", gravite: 6, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "critique", gravite: 6, endurance: "-100", vie: -4, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
   { type: "mort", gravite: 8, label: 'Mort', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/mort.webp" }
 ]
 
@@ -38,8 +39,34 @@ export class RdDItemBlessure extends RdDItem {
       ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
       return undefined;
     }
-    return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
+    return foundry.utils.mergeObject(BASE_TACHE_SOIN_BLESSURE, tache, { inplace: false })
   }
+
+  static async applyFullBlessure(actor, gravite) {
+    const definition = RdDItemBlessure.getDefinition(gravite)
+    
+    let lostEndurance = 0
+    let lostVie = 0
+    if (definition.endurance) {
+      lostEndurance = await new Roll(definition.endurance).roll().total;
+      actor.santeIncDec("endurance", -Number(lostEndurance));
+    }
+    if (definition.vie) {
+      lostVie = definition.vie
+      actor.santeIncDec("vie", definition.vie)
+    }
+    
+    await this.createBlessure(actor, gravite)
+
+    ChatMessage.create({
+      content: `Blessure ${definition.label} appliquée à ${actor.name}`+
+        `<br>Perte d'endurance : ${lostEndurance}`+
+        `<br>Perte de Vie : ${lostVie}`,
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name)
+    });
+
+  }
+
   static async createBlessure(actor, gravite, localisation = '', attacker) {
     const definition = RdDItemBlessure.getDefinition(gravite)
     const blessure = {
@@ -79,12 +106,12 @@ export class RdDItemBlessure extends RdDItem {
   }
 
   async setSoinsBlessure(systemUpdate = {}) {
-    systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }),
+    systemUpdate = foundry.utils.mergeObject(systemUpdate, this.system, { overwrite: false })
-      systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
+    systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
     await this.update({
       img: this.getImgSoins(systemUpdate.gravite, systemUpdate.soinscomplets.done),
       system: systemUpdate
-    });
+    })
   }
 
   async recuperationBlessure({ actor, timestamp, message, isMaladeEmpoisonne, blessures }) {
@@ -107,15 +134,18 @@ export class RdDItemBlessure extends RdDItem {
       if (rolled.isETotal) {
         message.content += ` -- une blessure ${label} s'infecte (temps de guérison augmenté de ${gravite} jours, perte de vie)`;
         await actor.santeIncDec("vie", -1);
-        mergeObject(update, {
+        foundry.utils.mergeObject(update, {
           system: { fin: { indexDate: timestamp.addJours(gravite).indexDate } }
         });
       }
       else {
         if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
           message.content += ` -- une blessure ${label} cicatrise`;
-          mergeObject(update, {
+          foundry.utils.mergeObject(update, {
-            system: { gravite: graviteMoindre, fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }
+            system: {
+              gravite: graviteMoindre,
+              temporel: { fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }
+            }
           });
         }
         else {

module/item/maladie.js

@@ -38,7 +38,7 @@ export class RdDItemMaladie extends RdDItem {
 
       await mal.actor.updateEmbeddedDocuments('Item', [{
         _id: mal.id,
-        'system.temporel.fin': duplicate(timestampFin),
+        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
       }])
     }
   }

module/item/sheet-base-inventaire.js

@@ -8,9 +8,9 @@ const TYPE_ITEMS_NATURELS = ["faune", "herbe", "plante", "ingredient"];
 export class RdDItemInventaireSheet extends RdDItemSheet {
 
   static get defaultOptions() {
-    return mergeObject(RdDItemSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
-    });
+    }, { inplace: false })
   }
 
   setPosition(options = {}) {
@@ -23,9 +23,10 @@ export class RdDItemInventaireSheet extends RdDItemSheet {
 
   async getData() {
     const formData = await super.getData();
-    return mergeObject(formData, {
+    foundry.utils.mergeObject(formData, {
       milieux: await game.system.rdd.environnement.autresMilieux(this.item)
-    });
+    })
+    return formData
   }
 
   activateListeners(html) {

module/item/sheet-rencontre.js

@@ -6,9 +6,9 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
   static get ITEM_TYPE() { return "rencontre" };
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }]
-    });
+    }, { inplace: false })
   }
 
   /* -------------------------------------------- */
@@ -24,7 +24,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
   /* -------------------------------------------- */
   async getData() {
     const formData = await super.getData();
-    mergeObject(formData, {
+    foundry.utils.mergeObject(formData, {
       effets: {
         succes: {
           liste: RdDRencontre.getEffetsSucces(),
@@ -35,7 +35,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
           select: RdDRencontre.mapEffets(this.item.system.echec.effets)
         }
       }
-    });
+    })
     return formData;
   }
 

module/migrations.js

@@ -5,6 +5,7 @@ import { Monnaie } from "./item-monnaie.js";
 import { RdDItem, TYPES } from "./item.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDRaretes } from "./item/raretes.js";
+import { RdDCalendrier } from "./time/rdd-calendrier.js";
 
 class Migration {
   get code() { return "sample"; }
@@ -70,17 +71,17 @@ class _10_0_16_MigrationSortsReserve extends Migration {
   get version() { return "10.0.16"; }
 
   async migrate() {
-    await game.actors
+    const actors = game.actors.filter((actor) => actor.type == "personnage" && (actor.system.reve?.reserve?.list?.length ?? 0 > 0))
-      .filter((actor) => actor.type == "personnage")
+    Promise.all(actors.map(async it => await this.convertirSortsReserveActeur(it)))
-      .filter((actor) => actor.system.reve?.reserve?.list?.length ?? 0 > 0)
+  }
-      .forEach(async (actor) => {
+
-        const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
+  async convertirSortsReserveActeur(actor) {
-        console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
+    const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
-        await actor.createEmbeddedDocuments("Item", sortsReserve, {
+    console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
-          renderSheet: false,
+    await actor.createEmbeddedDocuments("Item", sortsReserve, {
-        });
+      renderSheet: false,
-        await actor.update({ 'system.reve.reserve': undefined })
+    });
-      });
+    await actor.update({ 'system.reve.reserve': undefined });
   }
 
   conversionSortReserve(it) {
@@ -189,7 +190,7 @@ class _10_2_5_ArmesTirLancer extends Migration {
   get version() { return "10.2.5"; }
 
   migrateArmeTirLancer(it) {
-    let updates = mergeObject({ _id: it.id }, this.getMapping(it).updates);
+    let updates = foundry.utils.mergeObject({ _id: it.id }, this.getMapping(it).updates);
     console.log(it.name, updates);
     return updates;
   }
@@ -364,7 +365,7 @@ class _10_4_6_ServicesEnCommerces extends Migration {
     const item = await RdDItem.getCorrespondingItem(serviceRefItem);
     const itemToCreate = {
       name: item.name, img: item.img, type: item.type,
-      system: mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
+      system: foundry.utils.mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
     };
     return itemToCreate;
   }
@@ -507,13 +508,28 @@ class _10_7_19_PossessionsEntiteVictime extends Migration {
   }
 
   migratePossession(it) {
-    return { _id: it.id,
+    return {
+      _id: it.id,
       'system.entite.actorid': it.system.possesseurid,
       'system.victime.actorid': it.system.possedeid
     }
   }
 }
 
+class _11_2_20_MigrationAstrologie extends Migration {
+  get code() { return "migration-astrologie" }
+  get version() { return "11.2.20" }
+
+  async migrate() {
+    const nombresAstraux = game.system.rdd.calendrier.getNombresAstraux()
+    nombresAstraux.forEach(na => {
+      na.lectures = na.valeursFausses
+      na.valeursFausses = undefined
+    })
+    await game.system.rdd.calendrier.setNombresAstraux(nombresAstraux)
+  }
+}
+
 export class Migrations {
   static getMigrations() {
     return [
@@ -532,6 +548,7 @@ export class Migrations {
       new _10_7_0_MigrationBlessures(),
       new _10_7_19_CategorieCompetenceCreature(),
       new _10_7_19_PossessionsEntiteVictime(),
+      new _11_2_20_MigrationAstrologie(),
     ];
   }
 
@@ -546,15 +563,18 @@ export class Migrations {
   }
 
   migrate() {
-    const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
+    let currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion")
-    if (isNewerVersion(game.system.version, currentVersion)) {
+    if (currentVersion.startsWith("v")) {
+      currentVersion = currentVersion.substring(1)
+    }
+    if (foundry.utils.isNewerVersion(game.system.version, currentVersion)) {
       // if (true) { /* comment previous and uncomment here to test before upgrade  */
-      const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
+      const migrations = Migrations.getMigrations().filter(m => foundry.utils.isNewerVersion(m.version, currentVersion));
       if (migrations.length > 0) {
         migrations.sort((a, b) => this.compareVersions(a, b));
         migrations.forEach(async (m) => {
           ui.notifications.info(
-            `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
+            `${LOG_HEAD} Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
           );
           await m.migrate();
         });
@@ -562,9 +582,7 @@ export class Migrations {
           `Migrations done, version will change to ${game.system.version}`
         );
       } else {
-        console.log(
+        console.log(`${LOG_HEAD} No migration needeed, version will change to ${game.system.version}`
-          LOG_HEAD +
-          `No migration needeed, version will change to ${game.system.version}`
         );
       }
 
@@ -574,7 +592,7 @@ export class Migrations {
         game.system.version
       );
     } else {
-      console.log(LOG_HEAD + `No system version changed`);
+      console.log(`${LOG_HEAD} No system version changed`);
     }
   }
 

module/misc.js

@@ -22,6 +22,10 @@ export class Misc {
     const isPositiveNumber = value != NaN && value > 0;
     return isPositiveNumber ? "+" + number : number
   }
+  
+  static modulo(n, m) {
+    return ((n % m) + m) % m;
+  }
 
   static sum() {
     return (a, b) => Number(a) + Number(b);
@@ -42,7 +46,7 @@ export class Misc {
   }
 
   static typeName(type, subType) {
-    return subType ? game.i18n.localize(`TYPES.${type}.${Misc.upperFirst(subType)}`)
+    return subType ? game.i18n.localize(`TYPES.${type}.${subType}`)
       : '';
   }
 
@@ -63,8 +67,8 @@ export class Misc {
 
   static keepDecimals(num, decimals) {
     if (decimals <= 0 || decimals > 6) return num;
-    const decimal = Math.pow(10, parseInt(decimals));
+    const power10n = Math.pow(10, parseInt(decimals));
-    return Math.round(num * decimal) / decimal;
+    return Math.round(num * power10n) / power10n;
   }
 
   static getFractionHtml(diviseur) {
@@ -162,15 +166,42 @@ export class Misc {
   }
 
   static firstConnectedGM() {
-    return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
+    if (game.users?.activeGM) {
+      return game.users.activeGM 
+    } 
+    return game.users.sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
+  }
+  static connectedGMs() {
+    return game.users.filter(u => u.isGM && u.active);
   }
 
-  static isOwnerPlayer(actor, user = undefined) {
+  /**
-    return actor.testUserPermission(user ?? game.user, CONST.DOCUMENT_PERMISSION_LEVELS.OWNER)
+   * This helper method allows to get the docuument, for a single user (either first connected GM, or the owner
+   * if there is no connected GMs), or else return undefined.
+   * 
+   * This allows for example update hooks that should apply modifications to actors to be called only for one
+   * user (preventing the "User ... lacks permission to update Item" that was occuring on hooks when Item updates
+   * were triggering other changes)
+   * 
+   * @param {*} document the Document with is potentially an Actor
+   * @returns the actor if either the game.user is the first connected GM, or if the game.user is the owner
+   *  and there is no connected GM
+   */
+  static documentIfResponsible(document) {
+    if (document instanceof Document) {
+      if (Misc.isUniqueConnectedGM() || (Misc.connectedGMs().length == 0 && Misc.isOwnerPlayer(document))) {
+        return document
+      }
+    }
+    return undefined
   }
 
-  static isOwnerPlayerOrUniqueConnectedGM(actor, user = undefined) {
+  static isOwnerPlayer(actor) {
-    return Misc.isOwnerPlayer(actor, user) ?? Misc.isUniqueConnectedGM();
+    return actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
+  }
+
+  static isOwnerPlayerOrUniqueConnectedGM(actor) {
+    return Misc.isOwnerPlayer(actor) ?? Misc.isUniqueConnectedGM();
   }
 
   /**
@@ -196,7 +227,7 @@ export class Misc {
 
   /* -------------------------------------------- */
   static findFirstLike(value, elements, options = {}) {
-    options = mergeObject({
+    options = foundry.utils.mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',
@@ -205,6 +236,7 @@ export class Misc {
 
     const subset = this.findAllLike(value, elements, options);
     if (subset.length == 0) {
+      console.log(`Aucune ${options.description} pour ${value}`);
       return undefined
     }
     if (subset.length == 1) {
@@ -220,7 +252,7 @@ export class Misc {
   }
 
   static findAllLike(value, elements, options = {}) {
-    options = mergeObject({
+    options = foundry.utils.mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',

module/rdd-audio.js

@@ -15,7 +15,7 @@ export class RdDAudio {
       if ( audioData ) {
         let audioPath = "systems/foundryvtt-reve-de-dragon/sounds/" + audioData.file;
         console.log(`foundryvtt-reve-de-dragon | Playing Sound: ${audioPath}`)
-        AudioHelper.play({ src: audioPath }, audioData.isGlobal);
+        foundry.audio.AudioHelper.play({ src: audioPath }, audioData.isGlobal);
       }
     }
   }

module/rdd-bonus.js

@@ -19,10 +19,6 @@ export class RdDBonus {
   }
 
 
-  static isAjustementAstrologique(rollData) {
-    return RdDCarac.isChance(rollData.selectedCarac) ||
-      rollData.selectedSort?.system.isrituel;
-  }
   /* -------------------------------------------- */
   static isDefenseAttaqueFinesse(rollData) {
     if (rollData.isEmpoignade && rollData.rolled?.isPart) {
@@ -36,20 +32,18 @@ export class RdDBonus {
 
   /* -------------------------------------------- */
   static dmg(rollData, dmgActor, isEntiteIncarnee = false) {
-    let dmg = { total: 0 };
+    const dmgArme = RdDBonus._dmgArme(rollData)
-    if (rollData.arme && rollData.arme.name.toLowerCase() == "esquive") {
+    let dmg = {
-      // Specific case management
+      total: 0,
-      ui.notifications.warn("Calcul de bonus dégats sur esquive !");
+      dmgArme: dmgArme,
-    } else {
+      penetration: RdDBonus._peneration(rollData),
-      dmg.dmgArme = RdDBonus._dmgArme(rollData);
+      dmgTactique: RdDBonus.dmgBonus(rollData.tactique),
-      dmg.penetration = RdDBonus._peneration(rollData);
+      dmgParticuliere: RdDBonus._dmgParticuliere(rollData),
-      dmg.dmgTactique = RdDBonus.dmgBonus(rollData.tactique);
+      dmgSurprise: RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used),
-      dmg.dmgParticuliere = RdDBonus._dmgParticuliere(rollData);
+      mortalite: RdDBonus._calculMortalite(rollData, isEntiteIncarnee),
-      dmg.dmgSurprise = RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used);
+      dmgActor: RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac?.label, dmgArme)
-      dmg.dmgActor = rollData.selectedCarac ? RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac.label, dmg.dmgArme) : 0;
-      dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere;
-      dmg.mortalite = RdDBonus._calculMortalite(rollData, isEntiteIncarnee)
     }
+    dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere;
     return dmg;
   }
 
@@ -93,6 +87,9 @@ export class RdDBonus {
 
   /* -------------------------------------------- */
   static _dmgPerso(dmgActor, categorie, dmgArme) {
+    if (categorie == undefined) {
+      return 0
+    }
     switch (categorie) {
       case "Tir": return 0;
       case "Lancer": return Math.max(0, Math.min(dmgArme, dmgActor));

module/rdd-carac.js

@@ -1,7 +1,7 @@
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 
-const tableCaracDerivee = {
+const TABLE_CARACTERISTIQUES_DERIVEES = {
   // xp: coût pour passer du niveau inférieur à ce niveau
   1: { xp: 3, poids: "moins de 1kg", plusdom: -5, sconst: 0.5, sust: 0.1 },
   2: { xp: 3, poids: "1-5", plusdom: -4, sconst: 0.5, sust: 0.3 },
@@ -58,6 +58,10 @@ export class RdDCarac {
       selectedCarac?.label.match(/(Apparence|Force|Agilité|Dextérité|Vue|Ouïe|Odorat-Goût|Empathie|Dérobée|Mêlée|Tir|Lancer)/);
   }
 
+  static getCaracDerivee(value) {
+    return TABLE_CARACTERISTIQUES_DERIVEES[Math.min(Math.max(Number(value), 1), 32)];
+  }
+
   static computeTotal(carac, beaute = undefined) {
     const total = Object.values(carac ?? {}).filter(c => !c.derivee)
       .map(it => parseInt(it.value))
@@ -73,7 +77,7 @@ export class RdDCarac {
 
   /* -------------------------------------------- */
   static calculSConst(constitution) {
-    return Number(tableCaracDerivee[Number(constitution)].sconst);
+    return RdDCarac.getCaracDerivee(constitution).sconst;
   }
 
   /* -------------------------------------------- */
@@ -84,7 +88,7 @@ export class RdDCarac {
   }
 
   static getCaracXp(targetValue) {
-    return tableCaracDerivee[targetValue]?.xp ?? 200;
+    return RdDCarac.getCaracDerivee(targetValue)?.xp ?? 200;
   }
 
 
@@ -97,37 +101,4 @@ export class RdDCarac {
     return Grammar.toLowerCaseNoAccent(selectedCarac?.label)?.match(/(apparence|force|agilite|dexterite|vue|ouie|odorat|empathie|melee|tir|lancer|derobee)/);
   }
 
-  /* -------------------------------------------- */
-  static computeCarac(system) {
-    system.carac.force.value = Math.min(system.carac.force.value, parseInt(system.carac.taille.value) + 4);
-
-    system.carac.derobee.value = Math.floor(parseInt(((21 - system.carac.taille.value)) + parseInt(system.carac.agilite.value)) / 2);
-    let bonusDomKey = Math.floor((parseInt(system.carac.force.value) + parseInt(system.carac.taille.value)) / 2);
-    bonusDomKey = Math.min(Math.max(bonusDomKey, 0), 32); // Clamp de securite
-
-    let tailleData = tableCaracDerivee[bonusDomKey];
-    system.attributs.plusdom.value = tailleData.plusdom;
-
-    system.attributs.sconst.value = RdDCarac.calculSConst(system.carac.constitution.value);
-    system.attributs.sust.value = tableCaracDerivee[Number(system.carac.taille.value)].sust;
-
-    system.attributs.encombrement.value = (parseInt(system.carac.force.value) + parseInt(system.carac.taille.value)) / 2;
-    system.carac.melee.value = Math.floor((parseInt(system.carac.force.value) + parseInt(system.carac.agilite.value)) / 2);
-    system.carac.tir.value = Math.floor((parseInt(system.carac.vue.value) + parseInt(system.carac.dexterite.value)) / 2);
-    system.carac.lancer.value = Math.floor((parseInt(system.carac.tir.value) + parseInt(system.carac.force.value)) / 2);
-
-    system.sante.vie.max = Math.ceil((parseInt(system.carac.taille.value) + parseInt(system.carac.constitution.value)) / 2);
-
-    system.sante.vie.value = Math.min(system.sante.vie.value, system.sante.vie.max)
-    system.sante.endurance.max = Math.max(parseInt(system.carac.taille.value) + parseInt(system.carac.constitution.value), parseInt(system.sante.vie.max) + parseInt(system.carac.volonte.value));
-    system.sante.endurance.value = Math.min(system.sante.endurance.value, system.sante.endurance.max);
-    system.sante.fatigue.max = system.sante.endurance.max * 2;
-    system.sante.fatigue.value = Math.min(system.sante.fatigue.value, system.sante.fatigue.max);
-
-    //Compteurs
-    system.reve.reve.max = system.carac.reve.value;
-    system.compteurs.chance.max = system.carac.chance.value;
-  }
-
-
 }

module/rdd-combat.js

@@ -75,7 +75,7 @@ export class RdDCombatManager extends Combat {
       }
     }
   }
-  
+
   /************************************************************************************/
   async rollInitiative(ids, formula = undefined, messageOptions = {}) {
     console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
@@ -87,7 +87,7 @@ export class RdDCombatManager extends Combat {
       let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, 0);
       if (!formula) {
         if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
-          const competence = combatant.actor.items.find(it => RdDItemCompetenceCreature.getCategorieAttaque(it))
+          const competence = combatant.actor.items.find(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
           if (competence) {
             rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, 0);
           }
@@ -119,7 +119,7 @@ export class RdDCombatManager extends Combat {
       //console.log("Combatat", c);
       const roll = combatant.getInitiativeRoll(rollFormula);
       if (!roll.total) {
-        roll.evaluate({ async: false });
+        await roll.evaluate();
       }
       const total = Math.max(roll.total, 0.00);
       console.log("Compute init for", rollFormula, roll, total, combatant);
@@ -128,21 +128,17 @@ export class RdDCombatManager extends Combat {
 
       // Send a chat message
       let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
-      let messageData = mergeObject(
+      let messageData = foundry.utils.mergeObject({
-        {
+        speaker: {
-          speaker: {
+          scene: canvas.scene._id,
-            scene: canvas.scene._id,
+          actor: combatant.actor?._id,
-            actor: combatant.actor?._id,
+          token: combatant.token._id,
-            token: combatant.token._id,
+          alias: combatant.token.name,
-            alias: combatant.token.name,
+          sound: CONFIG.sounds.dice,
-            sound: CONFIG.sounds.dice,
-          },
-          flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})
-          <br>
-          `,
         },
-        messageOptions
+        flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})<br>`,
-      );
+      },
+        messageOptions);
       roll.toMessage(messageData, { rollMode, create: true });
 
       RdDCombatManager.processPremierRoundInit();
@@ -218,7 +214,7 @@ export class RdDCombatManager extends Combat {
 
   static $prepareAttaqueArme(infoAttaque) {
     const comp = infoAttaque.competences.find(c => c.name == infoAttaque.competence);
-    const attaque = duplicate(infoAttaque.arme);
+    const attaque = foundry.utils.duplicate(infoAttaque.arme);
     attaque.action = 'attaque';
     attaque.system.competence = infoAttaque.competence;
     attaque.system.dommagesReels = infoAttaque.dommagesReel;
@@ -229,7 +225,9 @@ export class RdDCombatManager extends Combat {
   }
 
   static listActionsCreature(competences) {
-    return competences.map(it => RdDItemCompetenceCreature.armeCreature(it))
+    return competences
+      .filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+      .map(it => RdDItemCompetenceCreature.armeCreature(it))
       .filter(it => it != undefined);
   }
 
@@ -326,8 +324,8 @@ export class RdDCombatManager extends Combat {
       }
     }
     options = [
-      { name: "Incrémenter initiative", condition: true, icon: '<i class="fas fa-plus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), +0.01); } },
+      { name: "Incrémenter initiative", condition: true, icon: '<i class="fa-solid fa-plus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), +0.01); } },
-      { name: "Décrémenter initiative", condition: true, icon: '<i class="fas fa-minus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), -0.01); } }
+      { name: "Décrémenter initiative", condition: true, icon: '<i class="fa-solid fa-minus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), -0.01); } }
     ].concat(options);
   }
   /* -------------------------------------------- */
@@ -448,7 +446,7 @@ export class RdDCombat {
     if (Misc.isUniqueConnectedGM()) {
       let turn = combat.turns.find(t => t.token?.id == combat.current.tokenId);
       if (turn?.actor) {
-        RdDCombat.displayActorCombatStatus(combat, turn.actor);
+        RdDCombat.displayActorCombatStatus(combat, turn.actor, turn.token.id);
         // TODO Playaudio for player??
       }
     }
@@ -512,8 +510,12 @@ export class RdDCombat {
   /* -------------------------------------------- */
   static _callJetDeVie(event) {
     let actorId = event.currentTarget.attributes['data-actorId'].value;
-    let actor = game.actors.get(actorId);
+    let tokenId = event.currentTarget.attributes['data-tokenId'].value;
-    actor.jetVie();
+    let token = canvas.tokens.get(tokenId)
+    const actor = token?.actor ?? game.actors.get(actorId);
+    if (actor?.isOwner) {
+      actor.jetDeVie();
+    }
   }
 
   /* -------------------------------------------- */
@@ -539,7 +541,7 @@ export class RdDCombat {
         }
       });
     }
-    html.on("click", '#chat-jet-vie', event => {
+    html.on("click", 'a.chat-jet-vie', event => {
       event.preventDefault();
       RdDCombat._callJetDeVie(event);
     });
@@ -748,11 +750,11 @@ export class RdDCombat {
   /* -------------------------------------------- */
   async attaque(competence, arme) {
     if (!await this.attacker.accorder(this.defender, 'avant-attaque')) {
-      return;
+      return
     }
     if (arme.system.cac == 'empoignade') {
       RdDEmpoignade.onAttaqueEmpoignade(this.attacker, this.defender)
-      return;
+      return
     }
     RdDEmpoignade.checkEmpoignadeEnCours(this.attacker)
 
@@ -818,8 +820,8 @@ export class RdDCombat {
     // finesse seulement en mélée, pour l'empoignade, ou si la difficulté libre est de -1 minimum
     // rapidité seulement en mêlée, si l'arme le permet, et si la difficulté libre est de -1 minimum
     const isForce = !rollData.arme.system.empoignade;
-    const isFinesse = rollData.arme.system.empoignade || isMeleeDiffNegative;
+    const isFinesse = rollData.tactique != 'charge' && (rollData.arme.system.empoignade || isMeleeDiffNegative);
-    const isRapide = !rollData.arme.system.empoignade && isMeleeDiffNegative && rollData.arme.system.rapide;
+    const isRapide = rollData.tactique != 'charge' && !rollData.arme.system.empoignade && isMeleeDiffNegative && rollData.arme.system.rapide;
     // si un seul choix possible, le prendre
     if (isForce && !isFinesse && !isRapide) {
       return await this.choixParticuliere(rollData, "force");
@@ -879,12 +881,12 @@ export class RdDCombat {
 
     this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
     if (essaisPrecedents) {
-      mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
+      foundry.utils.mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
     }
 
     // # utilisation esquive
     const corpsACorps = this.defender.getCompetenceCorpsACorps({ onMessage: it => console.info(it, this.defender) });
-    const esquives = duplicate(this.defender.getCompetencesEsquive())
+    const esquives = foundry.utils.duplicate(this.defender.getCompetencesEsquive())
     esquives.forEach(e => e.system.nbUsage = e?._id ? this.defender.getItemUse(e._id) : 0);
 
     const paramChatDefense = {
@@ -1276,7 +1278,7 @@ export class RdDCombat {
       attackerRoll.defenderTokenId = defenderTokenId;
 
       await this.computeRecul(defenderRoll);
-      this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
+      await this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
     }
     else { // envoi à un GM: les joueurs n'ont pas le droit de modifier les personnages qu'ils ne possèdent pas
       game.socket.emit(SYSTEM_SOCKET_ID, {
@@ -1292,7 +1294,7 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  static async displayActorCombatStatus(combat, actor) {
+  static async displayActorCombatStatus(combat, actor, tokenId) {
     let formData = {
       combatId: combat._id,
       alias: actor.name,
@@ -1301,12 +1303,19 @@ export class RdDCombat {
       blessuresStatus: actor.computeResumeBlessure(),
       SConst: actor.getSConst(),
       actorId: actor.id,
+      actor: actor,
+      tokenId: tokenId,
       isGrave: actor.countBlessures(it => it.isGrave()) > 0,
       isCritique: actor.countBlessures(it => it.isCritique()) > 0
     }
-
+    await ChatMessage.create({
-    ChatUtility.createChatWithRollMode(actor.name, {
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-acteur.hbs`, formData),
-      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html`, formData)
+      alias: actor.name
+    });
+    await ChatMessage.create({
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-sante.hbs`, formData),
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name),
+      alias: actor.name
     });
   }
-}
+}

module/rdd-commands.js

@@ -16,6 +16,7 @@ import { RdDRollTables } from "./rdd-rolltables.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { FenetreRechercheTirage } from "./tirage/fenetre-recherche-tirage.js";
 import { TMRUtility } from "./tmr-utility.js";
+import { DialogFatigueVoyage } from "./voyage/dialog-fatigue-voyage.js";
 
 const rddRollNumeric = /^(\d+)\s*([\+\-]?\d+)?\s*(s)?/;
 
@@ -76,6 +77,7 @@ export class RdDCommands {
     this.registerCommand({ path: ["/tirer", "desir"], func: (content, msg, params) => RdDRollTables.getDesirLancinant('chat'), descr: "Tire un Désir Lancinant" });
     this.registerCommand({ path: ["/tirer", "rencontre"], func: (content, msg, params) => this.getRencontreTMR(params), descr: `Détermine une rencontre dans les TMR (synonyme de "/tmrr")` });
     this.registerCommand({ path: ["/tirage"], func: (content, msg, params) => this.tirage(), descr: "Ouvre la fenêtre de recherche et tirage" });
+    this.registerCommand({ path: ["/voyage"], func: (content, msg, params) => this.voyage(msg, params), descr: "Gérer le voyage" });
 
     this.registerCommand({ path: ["/sommeil"], func: (content, msg, params) => this.sommeil(msg, params), descr: "Prépare le passage de journée pour chateau dormant" });
     this.registerCommand({ path: ["/meteo"], func: (content, msg, params) => this.getMeteo(msg, params), descr: "Propose une météo marine" });
@@ -298,7 +300,7 @@ export class RdDCommands {
   async getRencontreTMR(params) {
     if (params.length == 1 || params.length == 2) {
       return game.system.rdd.rencontresTMR.rollRencontre(params[0], params[1])
-    }
+    }    
     return false;
   }
 
@@ -461,14 +463,13 @@ export class RdDCommands {
 
       let motif = params.slice(1, params.length - 2);
       let name = params[params.length - 1];
+      const personnages = game.actors.filter(actor => actor.isPersonnageJoueur());
       if (name == undefined) {
-        for (let actor of game.actors) {
+        for (let actor of personnages) {
-          // TODO: ne plus stresser les entités de cauchemar!
           await actor.distribuerStress('stress', stress, motif);
         }
       } else {
-        //console.log(stressValue, nomJoueur);
+        let actor = Misc.findActor(name, personnages) ?? Misc.findPlayer(name)?.character
-        let actor = Misc.findActor(name, game.actors.filter(it => it.hasPlayerOwner)) ?? Misc.findPlayer(name)?.character
         if (actor) {
           await actor.distribuerStress('stress', stress, motif);
         }
@@ -485,10 +486,13 @@ export class RdDCommands {
   }
 
   async tirage() {
-    FenetreRechercheTirage.create();
+    FenetreRechercheTirage.create()
+  }
+  async voyage() {
+    DialogFatigueVoyage.create()
   }
   async sommeil() {
-    DialogChateauDormant.create();
+    DialogChateauDormant.create()
   }
 }
 

module/rdd-confirm.js

@@ -1,32 +1,28 @@
-import { Grammar } from "./grammar.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 
 export class RdDConfirm {
   /* -------------------------------------------- */
   static confirmer(options, autresActions) {
-    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionnelles.isUsing(options.settingConfirmer));
+    if (options.settingConfirmer && !ReglesOptionnelles.isSet(options.settingConfirmer)) {
-    if (options.bypass) {
+      return options.onAction()
-      options.onAction();
     }
-    else {
+    let buttons = {
-      let buttons = {
+      "action": RdDConfirm._createButtonAction(options),
-        "action": RdDConfirm._createButtonAction(options),
+      "cancel": RdDConfirm._createButtonCancel()
-        "cancel": RdDConfirm._createButtonCancel()
+    };
-      };
+    if (options.settingConfirmer) {
-      if (options.settingConfirmer) {
+      buttons = foundry.utils.mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
-        buttons = mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
-      }
-      if (autresActions) {
-        buttons = mergeObject(autresActions, buttons);
-      }
-      const dialogDetails = {
-        title: options.title,
-        content: options.content,
-        default: "cancel",
-        buttons: buttons
-      };
-      new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
     }
+    if (autresActions) {
+      buttons = foundry.utils.mergeObject(autresActions, buttons, { inplace: false });
+    }
+    const dialogDetails = {
+      title: options.title,
+      content: options.content,
+      default: "cancel",
+      buttons: buttons
+    };
+    new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
   }
 
   static _createButtonCancel() {

module/rdd-dice.js

@@ -17,7 +17,7 @@ const imagesHeures = [1, 2, 3, 4, 5, 6, 7, 9, 9, 10, 11, 12].map(it => iconHeure
 const imgSigneDragon = img(imagesHeures[4]);
 
 /** De pour les jets de rencontre */
-export class DeTMR extends Die {
+export class DeTMR extends foundry.dice.terms.Die {
   /** @override */
   static DENOMINATION = "t";
 
@@ -36,8 +36,8 @@ export class DeTMR extends Die {
     super(termData);
   }
 
-  async evaluate() {
+  async evaluate(options) {
-    super.evaluate();
+    await super.evaluate(options);
     this.explode("x=8");
     return this;
   }
@@ -55,7 +55,7 @@ export class DeTMR extends Die {
 }
 
 /** DeDraconique pour le D8 sans limite avec 8=>0 */
-export class DeDraconique extends Die {
+export class DeDraconique extends foundry.dice.terms.Die {
   static DENOMINATION = "r";
 
   static diceSoNiceData(system) {
@@ -73,8 +73,8 @@ export class DeDraconique extends Die {
     super(termData);
   }
 
-  async evaluate() {
+  async evaluate(options) {
-    super.evaluate();
+    await super.evaluate(options);
     this.explode("x=7");
     return this;
   }
@@ -93,7 +93,7 @@ export class DeDraconique extends Die {
 }
 
 /** De 12 avec les heures */
-export class DeHeure extends Die {
+export class DeHeure extends foundry.dice.terms.Die {
 
   /** @override */
   static DENOMINATION = "h";
@@ -138,7 +138,7 @@ export class RdDDice {
 
   static async roll(formula, options = { showDice: SHOW_DICE, rollMode: undefined }) {
     const roll = new Roll(RdDDice._formulaOrFake(formula, options));
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     await this.showDiceSoNice(roll, options);
     return roll;
   }
@@ -164,7 +164,7 @@ export class RdDDice {
     if (options.showDice == HIDE_DICE || !game.modules.get("dice-so-nice")?.active || !game.dice3d) {
       return;
     }
-    
+
     let { whisper, blind } = RdDDice._getWhisperBlind(options);
     if (options.forceDiceResult?.total) {
       let terms = await RdDDice._getForcedTerms(options);
@@ -197,49 +197,26 @@ export class RdDDice {
     function terms1d100(total) {
       const unites = total % 10;
       const dizaines = Math.floor(total / 10);
-      return [{
+      return [
-        resultLabel: dizaines * 10,
+        { type: "d100", result: dizaines, resultLabel: dizaines * 10, vectors: [], options: {}, d100Result: total },
-        d100Result: total,
+        { type: "d10", result: unites, resultLabel: unites, vectors: [], options: {}, d100Result: total }
-        result: dizaines,
+      ];
-        type: "d100",
-        vectors: [],
-        options: {}
-      },
-      {
-        resultLabel: unites,
-        d100Result: total,
-        result: unites,
-        type: "d10",
-        vectors: [],
-        options: {}
-      }];
     }
 
     async function terms2d10(total) {
-      if (total>20 || total<2) { return undefined }
+      if (total > 20 || total < 2) { return undefined }
-      let first = await RdDDice.d10();
+      const first = await RdDDice.fakeD10(Math.min(10, total - 1));
-      let second = Math.min(total-first, 10);
+      const second = total - first;
-      first = Math.max(first, total-second);
+      return [
-      return [{
+        { type: "d10", result: first, resultLabel: first, vectors: [], options: {} },
-        resultLabel:first,
+        { type: "d10", result: second, resultLabel: second, vectors: [], options: {} }
-        result: first,
+      ];
-        type: "d10",
-        vectors: [],
-        options: {}
-      },
-      {
-        resultLabel: second,
-        result: second,
-        type: "d10",
-        vectors: [],
-        options: {}
-      }];
     }
   }
 
-  static async d10() {
+  static async fakeD10(faces) {
-    let roll = new Roll('1d10');
+    let roll = new Roll(`1d${faces}`);
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     return roll.total;
   }
 

module/rdd-empoignade.js

@@ -98,7 +98,7 @@ export class RdDEmpoignade {
   /* -------------------------------------------- */
   static getEmpoignadeById(actor, id) {
     let emp = actor.itemTypes[TYPES.empoignade].find(it => it.system.empoignadeid == id)
-    return emp && duplicate(emp) || undefined;
+    return emp && foundry.utils.duplicate(emp) || undefined;
   }
 
   /* -------------------------------------------- */
@@ -108,7 +108,7 @@ export class RdDEmpoignade {
       (it.system.empoigneurid == defender.id && it.system.empoigneid == attacker.id)
     )
     if (emp) {
-      return duplicate(emp);
+      return foundry.utils.duplicate(emp);
     }
     return undefined;
   }
@@ -267,7 +267,7 @@ export class RdDEmpoignade {
       return
     }
 
-    empoignade = duplicate(empoignade)
+    empoignade = foundry.utils.duplicate(empoignade)
     let defenderRoll = {
       mode, attacker, defender, empoignade, attackerRoll,
       diffLibre: attackerRoll.diffLibre,

module/rdd-hotbar-drop.js

@@ -65,7 +65,7 @@ export class RdDHotbar {
           await this.createItemMacro(item, slot++, 'pugilat')
           await this.createItemMacro(item, slot++, 'empoignade')
         }
-        if (item.isCompetenceArme()) {
+        else if (item.isCompetenceArme()) {
           ui.notifications.info(`${item.name} est une compétence d'arme, la macro n'est pas liée à un arme.<br>
           Créez la macro depuis l'arme ou l'onglet combat pour garder les automatisations de combat.`);
         }

module/rdd-main.js

@@ -1,4 +1,4 @@
-import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID, RDD_CONFIG } from "./constants.js";
 import { Migrations } from './migrations.js';
 
 import { RdDUtility } from "./rdd-utility.js";
@@ -29,11 +29,13 @@ import { Environnement } from "./environnement.js";
 import { RdDActor } from "./actor.js";
 import { RdDBaseActor } from "./actor/base-actor.js";
 import { RdDCommerce } from "./actor/commerce.js";
+import { RdDEntite } from "./actor/entite.js";
+import { RdDVehicule } from "./actor/vehicule.js";
 import { RdDActorSheet } from "./actor-sheet.js";
 import { RdDCommerceSheet } from "./actor/commerce-sheet.js";
-import { RdDActorCreatureSheet } from "./actor-creature-sheet.js";
+import { RdDCreatureSheet } from "./actor/creature-sheet.js";
-import { RdDActorVehiculeSheet } from "./actor-vehicule-sheet.js";
+import { RdDActorEntiteSheet } from "./actor/entite-sheet.js";
-import { RdDActorEntiteSheet } from "./actor-entite-sheet.js";
+import { RdDActorVehiculeSheet } from "./actor/vehicule-sheet.js";
 
 import { RdDItem } from "./item.js";
 import { RdDItemBlessure } from "./item/blessure.js";
@@ -60,6 +62,8 @@ import { RdDItemInventaireSheet } from "./item/sheet-base-inventaire.js";
 import { AppAstrologie } from "./sommeil/app-astrologie.js";
 import { RdDItemArmure } from "./item/armure.js";
 import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-darkness.js";
+import { RdDCreature } from "./actor/creature.js";
+import { RdDTMRDialog } from "./rdd-tmr-dialog.js";
 
 /**
  * RdD system
@@ -69,9 +73,10 @@ import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-dar
 export class SystemReveDeDragon {
 
   static start() {
-    const system = new SystemReveDeDragon();
+    const system = new SystemReveDeDragon()
-    Hooks.once('init', async () => await system.onInit());
+    Hooks.once('init', async () => await system.onInit())
-    Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d));
+    Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d))
+    Hooks.once('ready', () => system.onReady())
   }
 
   constructor() {
@@ -91,10 +96,10 @@ export class SystemReveDeDragon {
     }
     this.actorClasses = {
       commerce: RdDCommerce,
-      creature: RdDActor,
+      creature: RdDCreature,
-      entite: RdDActor,
+      entite: RdDEntite,
       personnage: RdDActor,
-      vehicule: RdDActor,
+      vehicule: RdDVehicule,
     }
   }
 
@@ -103,7 +108,8 @@ export class SystemReveDeDragon {
   /* -------------------------------------------- */
   async onInit() {
     game.system.rdd = this;
-    this.AppAstrologie = AppAstrologie;
+    game.system.rdd.config = RDD_CONFIG; 
+    this.AppAstrologie = AppAstrologie;    
 
 
     console.log(`Initializing Reve de Dragon System`);
@@ -150,7 +156,7 @@ export class SystemReveDeDragon {
     Actors.unregisterSheet("core", ActorSheet);
     Actors.registerSheet(SYSTEM_RDD, RdDCommerceSheet, { types: ["commerce"], makeDefault: true });
     Actors.registerSheet(SYSTEM_RDD, RdDActorSheet, { types: ["personnage"], makeDefault: true });
-    Actors.registerSheet(SYSTEM_RDD, RdDActorCreatureSheet, { types: ["creature"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDCreatureSheet, { types: ["creature"], makeDefault: true });
     Actors.registerSheet(SYSTEM_RDD, RdDActorVehiculeSheet, { types: ["vehicule"], makeDefault: true });
     Actors.registerSheet(SYSTEM_RDD, RdDActorEntiteSheet, { types: ["entite"], makeDefault: true });
     Items.unregisterSheet("core", ItemSheet);
@@ -198,12 +204,12 @@ export class SystemReveDeDragon {
     RdDCompendiumOrganiser.init();
     EffetsDraconiques.init()
     TMRUtility.init();
+    await RdDTMRDialog.init()
     RdDHotbar.initDropbar();
     RdDPossession.init();
     TMRRencontres.init();
     Environnement.init();
 
-    Hooks.once('ready', () => this.onReady());
   }
 
   initSystemSettings() {
@@ -261,16 +267,16 @@ export class SystemReveDeDragon {
     /* -------------------------------------------- */
     /*  Foundry VTT Initialization                  */
     /* -------------------------------------------- */
-    // CSS patch for v9
-    if (game.version) {
-      let sidebar = document.getElementById("sidebar");
-      sidebar.style.width = "min-content";
-    }
     game.system.rdd.calendrier = new RdDCalendrier();
     if (Misc.isUniqueConnectedGM()) {
       new Migrations().migrate();
       this.messageDeBienvenue();
-      this.registerUsageCount(SYSTEM_RDD);
+      import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter=>{
+        console.log("ClassCounter loaded", moduleCounter)
+        moduleCounter.ClassCounter.registerUsageCount()
+      }).catch(err=>
+        console.log("No stats available, giving up.")
+      )    
     }
 
     StatusEffects.onReady();
@@ -301,30 +307,6 @@ export class SystemReveDeDragon {
       ` });
     }
   }
-
-  /* -------------------------------------------- */
-  // Register world usage statistics
-  async registerUsageCount(registerKey) {
-    if (game.user.isGM) {
-      game.settings.register("world", "world-key", {
-        name: "Unique world key",
-        scope: "world",
-        config: false,
-        default: "NONE",
-        type: String
-      });
-
-      let worldKey = game.settings.get("world", "world-key")
-      if (worldKey == undefined || worldKey == "") {
-        worldKey = randomID(32)
-        game.settings.set("world", "world-key", worldKey)
-      }
-      let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-      $.ajax(regURL)
-      /* -------------------------------------------- */
-    }
-  }
-
 }
 
 SystemReveDeDragon.start();

module/rdd-meteo.js

@@ -56,7 +56,7 @@ const temperatures = [
 export class RdDMeteo {
   static async getForce() {
     const roll = new Roll(`1dr`);
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     return roll.total;
   }
 
@@ -67,14 +67,14 @@ export class RdDMeteo {
   static async getTemperature() {
     const degre = await RdDMeteo.getForce();
     const rollChaudFroid = new Roll('1d2');
-    await rollChaudFroid.evaluate({ async: true });
+    await rollChaudFroid.evaluate();
     const chaudFroid = rollChaudFroid.total == 1;
     return chaudFroid.total ? degre : -degre;
   }
 
   static async getDirection(direction) {
     const roll = new Roll(`1d16`);
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     switch (roll.total % 16) {
       case 0: return 'Nord';
       case 1: return 'Nord Nord Est';

module/rdd-possession.js

@@ -24,7 +24,7 @@ export class RdDPossession {
     if (!poss) {
       poss = defender.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
     }
-    return poss && duplicate(poss) || undefined;
+    return poss && foundry.utils.duplicate(poss) || undefined;
   }
 
   /* -------------------------------------------- */
@@ -52,7 +52,7 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static async onConjurerPossession(attacker, possession) {
-    possession = duplicate(possession);
+    possession = foundry.utils.duplicate(possession);
     RdDPossession.$updateEtatPossession(possession)
 
     const defender = game.actors.get(possession.system.entite.actorid);
@@ -80,7 +80,7 @@ export class RdDPossession {
       ui.notifications.warn("Une erreur s'est produite : Aucune possession trouvée !!")
       return
     }
-    possession = duplicate(possession)
+    possession = foundry.utils.duplicate(possession)
     // Update for draconic roll
     let rollData = {
       mode: "defense",

module/rdd-resolution-table.js

@@ -28,7 +28,7 @@ const reussites = [
 
 const reussiteInsuffisante = { code: "notSign", isPart: false, isSign: false, isSuccess: false, isEchec: true, isEPart: false, isETotal: false, ptTache: 0, ptQualite: -2, quality: "Réussite insuffisante", condition: (target, roll) => false }
 /* -------------------------------------------- */
-const caracMaximumResolution = 60;
+const CARAC_MAXIMUM_RESOLUTION = 40;
 /* -------------------------------------------- */
 export class RdDResolutionTable {
   static resolutionTable = this.build()
@@ -36,7 +36,7 @@ export class RdDResolutionTable {
   /* -------------------------------------------- */
   static build() {
     let table = []
-    for (var caracValue = 0; caracValue <= caracMaximumResolution; caracValue++) {
+    for (var caracValue = 0; caracValue <= CARAC_MAXIMUM_RESOLUTION; caracValue++) {
       table[caracValue] = this._computeRow(caracValue);
     }
     return table;
@@ -114,7 +114,7 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async roll(caracValue, finalLevel, rollData = {}) {
-    let chances = duplicate(this.computeChances(caracValue, finalLevel));
+    let chances = foundry.utils.duplicate(this.computeChances(caracValue, finalLevel));
     this._updateChancesWithBonus(chances, rollData.bonus, finalLevel);
     this._updateChancesFactor(chances, rollData.diviseurSignificative);
     chances.showDice = rollData.showDice;
@@ -158,7 +158,7 @@ export class RdDResolutionTable {
   static _updateChancesFactor(chances, diviseur) {
     if (chances.level > -11 && diviseur && diviseur > 1) {
       let newScore = Math.floor(chances.score / diviseur);
-      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
@@ -166,27 +166,27 @@ export class RdDResolutionTable {
   static _updateChancesWithBonus(chances, bonus, finalLevel) {
     if (bonus && finalLevel > -11) {
       let newScore = Number(chances.score) + bonus;
-      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
   /* -------------------------------------------- */
   static significativeRequise(chances) {
     chances.roll = Math.floor(chances.score / 2);
-    mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
+    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static succesRequis(chances) {
     chances.roll = chances.score;
-    mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
+    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static async rollChances(chances, diviseur, forceDiceResult = -1) {
     chances.forceDiceResult = forceDiceResult <= 0 || forceDiceResult > 100 ? undefined : { total: forceDiceResult };
     chances.roll = await RdDDice.rollTotal("1d100", chances);
-    mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
+    foundry.utils.mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
     return chances;
   }
 

module/rdd-roll-resolution-table.js

@@ -38,7 +38,7 @@ export class RdDRollResolutionTable extends Dialog {
       diffLibre: 0,
       use: { conditions:true, libre:true }
     }
-    mergeObject(rollData, defRollData, { overwrite: false });
+    foundry.utils.mergeObject(rollData, defRollData, { overwrite: false });
     for (let i = 1; i < 21; i++) {
       const key = `${i}`;
       rollData.carac[key] = { type: "number", value: i, label: key }

module/rdd-roll.js

@@ -22,7 +22,7 @@ export class RdDRoll extends Dialog {
 
     const html = await renderTemplate(dialogConfig.html, rollData);
 
-    let options = { classes: ["rdd-roll-dialog"], width: 600, height: 'fit-content', 'z-index': 99999, close: html => {} };
+    let options = { classes: ["rdd-roll-dialog"], width: 650, height: 'fit-content', 'z-index': 99999, close: html => { } };
     if (dialogConfig.close) {
       options.close = dialogConfig.close;
     }
@@ -37,21 +37,22 @@ export class RdDRoll extends Dialog {
       difficultesLibres: CONFIG.RDD.difficultesLibres,
       etat: actor.getEtatGeneral(),
       moral: actor.getMoralTotal(), /* La valeur du moral pour les jets de volonté */
+      amoureux: actor.listeSuivants(it => it.coeur > 0),
       carac: actor.system.carac,
       finalLevel: 0,
       diffConditions: 0,
       diffLibre: rollData.competence?.system.default_diffLibre ?? 0,
       perteMoralEchec: false, /* Pour l'affichage dans le chat */
       use: {
+        astrologique: true,
         moral: false, /* Est-ce que le joueur demande d'utiliser le moral ? Utile si le joueur change plusieurs fois de carac associée. */
         libre: true,
+        coeur: undefined,
         conditions: true,
         surenc: actor.isSurenc(),
         encTotal: true
       },
       isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
-      malusArmureValue: actor.getMalusArmure(),
-      surencMalusValue: actor.computeMalusSurEncombrement(),
       encTotal: actor.getEncTotal(),
       ajustementAstrologique: actor.ajustementAstrologique(),
       surprise: actor.getSurprise(false),
@@ -64,7 +65,7 @@ export class RdDRoll extends Dialog {
       defaultRollData.carac["reve-actuel"] = actor.system.reve.reve
     }
 
-    mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
+    foundry.utils.mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
     if (rollData.forceCarac) {
       rollData.carac = rollData.forceCarac;
     }
@@ -176,6 +177,15 @@ export class RdDRoll extends Dialog {
       this.rollData.competence = this.rollData.competences.find(it => it.name == competence);
       this.updateRollResult(html);
     });
+    this.html.find('.select-suivant-coeur').change((event) => {
+      const selectedActorId = event.currentTarget.value;
+      this.rollData.use.coeur = this.actor.getSuivant(selectedActorId)
+      if (this.rollData.use.coeur) {
+        this.html.find(".utilisation-coeur img.selected-suivant-coeur").attr('src', this.rollData.use.coeur?.img)
+        this.html.find(".utilisation-coeur img.selected-suivant-coeur").attr('title', this.rollData.use.coeur?.name)
+      }
+      this.updateRollResult(html);
+    });
     this.html.find('.roll-signedraconique').change((event) => {
       let sortKey = Misc.toInt(event.currentTarget.value);
       this.setSelectedSigneDraconique(this.rollData.signes[sortKey]);
@@ -187,7 +197,7 @@ export class RdDRoll extends Dialog {
       console.log("RdDRollSelectDialog - Cout reve", ptreve);
       this.updateRollResult(html);
     });
-    this.html.find("[name='mortalite']").change((event) => {
+    this.html.find("input.check-mortalite").change((event) => {
       this.rollData.dmg.mortalite = event.currentTarget.checked ? "non-mortel" : "mortel";
       this.updateRollResult(html);
     });
@@ -205,6 +215,10 @@ export class RdDRoll extends Dialog {
       this.rollData[attribute] = event.currentTarget.checked;
       this.updateRollResult(html);
     });
+    this.html.find('input.use-astrologique').change((event) => {
+      this.rollData.use.astrologique = event.currentTarget.checked;
+      this.updateRollResult(html);
+    });
     this.html.find('input.use-encTotal').change((event) => {
       this.rollData.use.encTotal = event.currentTarget.checked;
       this.updateRollResult(html);
@@ -291,18 +305,12 @@ export class RdDRoll extends Dialog {
 
   /* -------------------------------------------- */
   async updateRollResult(html) {
-    let rollData = this.rollData;
+    const rollData = this.rollData;
 
     rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat())
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-    rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? rollData.mortalite ?? 'mortel';
+    rollData.dmg.mortalite = rollData.dmg.mortalite ?? 'mortel';
     rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);
-    let dmgText = Misc.toSignedString(rollData.dmg.total);
-
-    switch (rollData.mortalite) {
-      case 'non-mortel': dmgText = `(${dmgText}) non-mortel`; break;
-      case 'empoignade': dmgText = `empoignade`; break;
-    }
 
     RollDataAjustements.calcul(rollData, this.actor);
 
@@ -311,14 +319,20 @@ export class RdDRoll extends Dialog {
 
     HtmlUtility.showControlWhen(this.html.find(".use-encTotal"), rollData.ajustements.encTotal.visible && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac));
     HtmlUtility.showControlWhen(this.html.find(".use-surenc"), rollData.ajustements.surenc.visible && RdDCarac.isActionPhysique(rollData.selectedCarac));
+    HtmlUtility.showControlWhen(this.html.find(".use-astrologique"), rollData.ajustements.astrologique.visible);
     HtmlUtility.showControlWhen(this.html.find(".utilisation-moral"), rollData.use.appelAuMoral);
     HtmlUtility.showControlWhen(this.html.find(".divAppelAuMoral"), rollData.use.appelAuMoral);
-    HtmlUtility.showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moralTotal.used);
+    HtmlUtility.showControlWhen(this.html.find(".utilisation-coeur"), rollData.ajustements.coeur.visible);
+    HtmlUtility.showControlWhen(this.html.find(".utilisation-coeur img.selected-suivant-coeur"), rollData.ajustements.coeur.visible && rollData.use.coeur != undefined)
+    // HtmlUtility.showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moral.used);
 
     // Mise à jour valeurs
     this.html.find(".dialog-roll-title").text(this._getTitle(rollData));
-    this.html.find("[name='mortalite']").prop('checked', rollData.mortalite == 'non-mortel');
+    this.html.find("input.check-mortalite").prop('checked', rollData.dmg.mortalite == 'non-mortel');
-    this.html.find(".dmg-arme-actor").text(dmgText);
+    this.html.find("label.dmg-arme-actor").text(rollData.dmg.mortalite == 'empoignade' ? 'empoignade' : Misc.toSignedString(rollData.dmg.total));
+    this.html.find("label.arme-mortalite").text(rollData.dmg.mortalite);
+    // this.html.find("[name='dmg-arme-actor']").text(rollData.dmg.mortalite == 'empoignade'? 'empoignade': Misc.toSignedString(rollData.dmg.total) );
+    // this.html.find("[name='arme-mortalite']").text(rollData.dmg.mortalite);
     this.html.find("div.placeholder-ajustements").empty().append(adjustements);
     this.html.find("div.placeholder-resolution").empty().append(resolutionTable)
   }
@@ -336,16 +350,19 @@ export class RdDRoll extends Dialog {
       return carac;
     }
     const compName = rollData.competence.name;
-    if (rollData.draconicList && rollData.selectedSort) {
-      return compName + " - " + rollData.selectedSort.name;
-    }
-    // If a weapon is there, add it in the title
     const niveau = Misc.toSignedString(rollData.competence.system.niveau)
     if (compName == carac) {
       // cas des créatures
-      return carac + " Niveau " + niveau
+      return `${carac} Niveau ${niveau}`
     }
-    const armeTitle = (rollData.arme) ? " (" + rollData.arme.name + ") " : "";
+    if (rollData.draconicList && rollData.selectedSort) {
-    return carac + "/" + compName + armeTitle + " Niveau " + niveau
+      // cas de lancer de sort
+      return `${rollData.competence.name} Niveau ${niveau} ${rollData.selectedSort.name}`
+    }
+    if (rollData.arme && rollData.arme.name != compName) {
+      // ajouter l'arme au titre si son nom n'est pas la compétence
+      return `${carac} /  ${compName} (${rollData.arme.name}) Niveau ${niveau}`
+    }
+    return `${carac} / ${compName} Niveau ${niveau}`
   }
 }

module/rdd-sheet-utility.js

@@ -16,7 +16,7 @@ export class RdDSheetUtility {
       isObserver: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
       isOwner: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
     }
-    mergeObject(options, newOptions);
+    foundry.utils.mergeObject(options, newOptions);
     return options;
   }
 
@@ -43,11 +43,17 @@ export class RdDSheetUtility {
       item = await RdDItem.getCorrespondingItem(item);
     }
     if (actor.canReceive(item)) {
+      if (!actor.prototypeToken.actorLink && actor.token) {
+        ui.notifications.warn(`Impossible de donner ${item.name} à ${actor.name}, c'est un acteur temporaire
+          <br>La suppression de son token entraînera la perte définitive de ${item.name}.`)
+        return
+      }
       return {
         destId: destItemId,
         targetActorId: actor.id,
         itemId: item.id,
         sourceActorId: item.actor?.id,
+        sourceTokenId: item.actor?.token?.id,
         srcId: objetVersConteneur[item.id],
         onEnleverConteneur: () => { delete objetVersConteneur[item.id]; },
         onAjouterDansConteneur: (itemId, conteneurId) => { objetVersConteneur[itemId] = conteneurId; }
@@ -70,7 +76,7 @@ export class RdDSheetUtility {
   static async _onSplitItem(item, split, actor) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = duplicate(item);
+      const splitItem = foundry.utils.duplicate(item);
       // todo: ajouter dans le même conteneur?
       splitItem.system.quantite = split;
       await actor.createEmbeddedDocuments('Item', [splitItem])

module/rdd-tmr-dialog.js

@@ -1,4 +1,4 @@
-import { SHOW_DICE } from "./constants.js";
+import { SHOW_DICE, SYSTEM_RDD } from "./constants.js";
 import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { TMRUtility } from "./tmr-utility.js";
@@ -16,20 +16,43 @@ import { RdDDice } from "./rdd-dice.js";
 import { STATUSES } from "./settings/status-effects.js";
 import { RdDRencontre } from "./item/rencontre.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
+import { TYPES } from "./item.js";
+import { Misc } from "./misc.js";
+
+const TMR_DISPLAY_SIZE = {
+  code: 'tmr-display-size',
+  range: {
+    min: 32,
+    max: 128,
+    step: 8,
+  },
+  def: 64,
+  clamp: (size, inc = 0) => Math.max(TMR_DISPLAY_SIZE.range.min, Math.min(size + (inc * TMR_DISPLAY_SIZE.range.step), TMR_DISPLAY_SIZE.range.max)),
+  get: () => TMR_DISPLAY_SIZE.clamp(game.settings.get(SYSTEM_RDD, TMR_DISPLAY_SIZE.code) ?? TMR_DISPLAY_SIZE.def),
+  set: (size) => game.settings.set(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, TMR_DISPLAY_SIZE.clamp(size)),
+};
 
 /* -------------------------------------------- */
-
 export class RdDTMRDialog extends Dialog {
+  static async init() {
+    game.settings.register(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, {
+      name: 'Taille des cases des TMR',
+      hint: "Taille en pixel des cases des TMR (réglable directement dans la fenêtre des TMR)",
+      scope: "client",
+      config: true,
+      default: TMR_DISPLAY_SIZE.def,
+      type: Number,
+      range: TMR_DISPLAY_SIZE.range
+    })
+  }
 
   static async create(actor, tmrData) {
+    await PixiTMR.init()
     let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrData);
-
+    if (tmrData.mode != 'visu' && !game.user.isGM) {
-    if (tmrData.mode != 'visu') {
-      // Notification au MJ
       ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatMessage.getWhisperRecipients("GM") });
     }
-
+    return new RdDTMRDialog(html, actor, tmrData)
-    return new RdDTMRDialog(html, actor, tmrData);
   }
 
   /* -------------------------------------------- */
@@ -37,66 +60,133 @@ export class RdDTMRDialog extends Dialog {
     const dialogConf = {
       title: "Terres Médianes de Rêve",
       content: html,
-      buttons: {
+      buttons: {}
-        closeButton: {
-          label: "Fermer", callback: html => this.close()
-        }
-      },
-      default: "closeButton"
     }
-
     const dialogOptions = {
       classes: ["tmrdialog"],
-      width: 920, maxheight: 1024, height: 'fit-content',
+      width: 'fit-content',
+      height: 'fit-content',
+      'max-height': 1024,
       'z-index': 40
     }
     super(dialogConf, dialogOptions);
-
+    this.tmrdata = foundry.utils.duplicate(tmrData);
-    this.tmrdata = duplicate(tmrData);
     this.actor = actor;
     this.actor.tmrApp = this; // reference this app in the actor structure
     this.viewOnly = tmrData.mode == "visu"
-    this.fatigueParCase = this.viewOnly || !ReglesOptionnelles.isUsing("appliquer-fatigue") ? 0 : this.actor.getTMRFatigue();
+    this.fatigueParCase = this.viewOnly ? 0 : this.actor.getCoutFatigueTMR();
     this.cumulFatigue = 0;
     this.loadRencontres();
     this.loadCasesSpeciales();
     this.allTokens = [];
     this.rencontreState = 'aucune';
-    this.pixiApp = new PIXI.Application({ width: 720, height: 860 });
-    this.pixiTMR = new PixiTMR(this, this.pixiApp);
     this.subdialog = undefined
-
+    this.displaySize = undefined
-    this.callbacksOnAnimate = [];
     if (!this.viewOnly) {
       this._tellToGM(this.actor.name + " monte dans les terres médianes (" + tmrData.mode + ")");
     }
+    this.callbacksOnAnimate = [];
+    const displaySize = TMR_DISPLAY_SIZE.clamp(game.settings.get(SYSTEM_RDD, TMR_DISPLAY_SIZE.code) ?? TMR_DISPLAY_SIZE.def);
+    this.pixiTMR = new PixiTMR(this, displaySize);
+    this.resizePixiTMR(displaySize)
+  }
 
-    // load the texture we need
+  resizePixiTMR(displaySize) {
-    this.pixiTMR.load((loader, resources) => this.createPixiSprites());
+    if (displaySize != this.displaySize) {
+      this.displaySize = displaySize
+      this.pixiTMR.resizeTMR(displaySize);
+      this._removeTokens()
+      this.allTokens = []
+      this.createPixiSprites()
+      this.pixiTMR.loadAnimations();
+    }
+  }
+
+  /* -------------------------------------------- */
+  async activateListeners(html) {
+    super.activateListeners(html);
+    this.html = html;
+
+    // this.activateTMRSize()
+    this.addTMRMap()
+    this.html.find('div.tmr-size a.tmr-size-zoom-minus*').click(event => {
+      this.$changeTMRSize(-1)
+    });
+    this.html.find('div.tmr-size a.tmr-size-zoom-plus*').click(event => {
+      this.$changeTMRSize(1)
+    });
+
+
+    if (this.viewOnly) {
+      this.html.find('.lancer-sort').remove();
+      this.html.find('.lire-signe-draconique').remove();
+      return;
+    }
+
+    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
+    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(this._getCoordActor()));
+
+    this.html.find('form.tmr-dialog *').click(event => this.subdialog?.bringToTop());
+
+    // Roll Sort
+    this.html.find('.lancer-sort').click(event => this.actor.rollUnSort(this._getCoordActor()));
+    this.html.find('.lire-signe-draconique').click(event => this.actor.rollLireSigneDraconique(this._getCoordActor()));
+
+    this.html.find('img.tmr-move').click(event => this.deplacementTMR(this.html.find(event.currentTarget)?.data('move')));
+
+    // Gestion du cout de montée en points de rêve
+    await this.actor.reveActuelIncDec(this.calculCoutMonteeTMR());
+    this.cumulFatigue += this.fatigueParCase;
+
+    // Le reste...
+    this.updateValuesDisplay();
+  }
+
+  async onDeplacement() {
+    await this.manageRencontre(TMRUtility.getTMR(this._getCoordActor()));
+  }
+
+  addTMRMap() {
+    const tmrCell = document.getElementsByClassName("tmr-map")[0];
+    tmrCell.childNodes.forEach(node => tmrCell.removeChild(node))
+    tmrCell.append(this.pixiTMR.view);
+  }
+
+  $changeTMRSize(inc) {
+    let displaySize = TMR_DISPLAY_SIZE.clamp(this.displaySize, inc)
+    if (displaySize != this.displaySize) {
+      game.settings.set(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, TMR_DISPLAY_SIZE.clamp(displaySize))
+      this.resizePixiTMR(displaySize)
+      this.render()
+    }
   }
 
   async forceTMRDisplay() {
-    this.bringToTop();
+    if (this.rendered) {
-    if (this.subdialog) {
+      this.bringToTop()
-      this.subdialog.bringToTop();
+      if (this.subdialog?.bringToTop) {
+        this.subdialog.bringToTop();
+      }
     }
   }
+
   async restoreTMRAfterAction() {
     this.subdialog = undefined
+    await this.maximize();
     this.bringToTop();
   }
 
   forceTMRContinueAction() {
     ui.notifications.warn('Vous devez finir votre action avant de continuer dans les TMR');
-    this.subdialog.bringToTop();
+    if (this.subdialog?.bringToTop) {
+      this.subdialog.bringToTop();
+    }
     return;
   }
 
   setTMRPendingAction(dialog) {
     this.subdialog = dialog
-    if (dialog instanceof Application) {
+    this.forceTMRDisplay()
-      dialog.bringToTop();
-    }
   }
 
   isDemiReveCache() {
@@ -109,11 +199,11 @@ export class RdDTMRDialog extends Dialog {
   }
 
   get sortsReserve() {
-    return this.actor.itemTypes['sortreserve'];
+    return this.actor.itemTypes[TYPES.sortreserve];
   }
 
   getSortsReserve(coord) {
-    return this.actor.itemTypes['sortreserve'].filter(// Reserve sur une case fleuve ou normale
+    return this.actor.itemTypes[TYPES.sortreserve].filter(// Reserve sur une case fleuve ou normale
       TMRUtility.getTMR(coord).type == 'fleuve'
         ? it => TMRUtility.getTMR(it.system.coord).type == 'fleuve'
         : it => it.system.coord == coord
@@ -122,14 +212,14 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   loadRencontres() {
-    this.rencontresExistantes = this.actor.getTMRRencontres();
+    this.rencontresExistantes = this.actor.getRencontresTMR();
   }
 
   /* -------------------------------------------- */
   createPixiSprites() {
-    EffetsDraconiques.carteTmr.createSprite(this.pixiTMR);
+    this.pixiTMR.setup()
-    this.updateTokens();
+    this.updateTokens()
-    this.forceDemiRevePositionView();
+    this.forceDemiRevePositionView()
   }
 
   /* -------------------------------------------- */
@@ -138,13 +228,9 @@ export class RdDTMRDialog extends Dialog {
       this.demiReve = this._tokenDemiReve();
       this._trackToken(this.demiReve);
     }
-    let tokens = this._getTokensCasesTmr()
+    this._getTokensCasesTmr().forEach(t => this._trackToken(t))
-      .concat(this._getTokensRencontres())
+    this._getTokensRencontres().forEach(t => this._trackToken(t))
-      .concat(this._getTokensSortsReserve());
+    this._getTokensSortsReserve().forEach(t => this._trackToken(t))
-
-    for (let t of tokens) {
-      this._trackToken(t);
-    }
   }
 
   /* -------------------------------------------- */
@@ -163,26 +249,21 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   _getTokensCasesTmr() {
-    return this.casesSpeciales.map(c => this._tokenCaseSpeciale(c)).filter(token => token);
+    return Misc.concat(this.casesSpeciales.map(caseSpeciale =>
-  }
+      Draconique.get(caseSpeciale.system.specific)?.token(this.pixiTMR, caseSpeciale, () => caseSpeciale.system.coord)
-  _getTokensRencontres() {
+    ))
-    return this.rencontresExistantes.map(it => this._tokenRencontre(it));
-  }
-  _getTokensSortsReserve() {
-    return this.actor.itemTypes['sortreserve'].map(it => this._tokenSortEnReserve(it));
   }
 
-  /* -------------------------------------------- */
+  _getTokensRencontres() {
-  _tokenRencontre(rencontre) {
+    return Misc.concat(this.rencontresExistantes.map(rencontre =>
-    return EffetsDraconiques.rencontre.token(this.pixiTMR, rencontre, () => rencontre.system.coord);
+      EffetsDraconiques.rencontre.tokens(this.pixiTMR, rencontre, () => rencontre.system.coord)
+    ))
   }
-  _tokenCaseSpeciale(casetmr) {
+
-    const caseData = casetmr;
+  _getTokensSortsReserve() {
-    const draconique = Draconique.get(caseData.system.specific);
+    const sortsReserve = this.actor.itemTypes[TYPES.sortreserve];
-    return draconique?.token(this.pixiTMR, caseData, () => caseData.system.coord);
+    return Misc.concat(sortsReserve.map(sortReserve =>
-  }
+      EffetsDraconiques.sortReserve.tokens(this.pixiTMR, sortReserve, () => sortReserve.system.coord)))
-  _tokenSortEnReserve(sortReserve) {
-    return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortReserve, () => sortReserve.system.coord);
   }
 
   _tokenDemiReve() {
@@ -190,96 +271,38 @@ export class RdDTMRDialog extends Dialog {
   }
 
   forceDemiRevePositionView() {
-    this.notifierResonanceSigneDraconique(this._getActorCoord());
+    this.notifierResonanceSigneDraconique(this._getCoordActor());
     this._trackToken(this.demiReve);
   }
 
-  _getActorCoord() {
+  _getCoordActor() {
     return this.actor.system.reve.tmrpos.coord;
   }
 
   /* -------------------------------------------- */
-  async moveFromKey(move) {
+  async deplacementTMR(move) {
     if (this.subdialog) {
       return this.forceTMRContinueAction();
     }
-    let oddq = TMRUtility.coordTMRToOddq(this._getActorCoord());
 
-    if (move == 'top') oddq.row -= 1;
+    const coordOrig = this._getCoordActor();
-    if (move == 'bottom') oddq.row += 1;
+    const coordTarget = TMRUtility.deplacement(coordOrig, move);
-    if (move.includes('left')) oddq.col -= 1;
+    await this._deplacerDemiReve(coordTarget, 'normal');
-    if (move.includes('right')) oddq.col += 1;
-    if (oddq.col % 2 == 1) {
-      if (move == 'top-left') oddq.row -= 1;
-      if (move == 'top-right') oddq.row -= 1;
-    } else {
-      if (move == 'bottom-left') oddq.row += 1;
-      if (move == 'bottom-right') oddq.row += 1;
-    }
-
-    let targetCoord = TMRUtility.oddqToCoordTMR(oddq);
-    await this._deplacerDemiReve(targetCoord, 'normal');
     this.checkQuitterTMR();
   }
 
-  /* -------------------------------------------- */
+  calculCoutMonteeTMR() {
-  async activateListeners(html) {
+    return ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
-    super.activateListeners(html);
-    this.html = html;
-
-    document.getElementsByClassName("tmr-row")
-      .item(0)
-      .insertCell(0).append(this.pixiApp.view);
-
-    if (this.viewOnly) {
-      this.html.find('.lancer-sort').remove();
-      this.html.find('.lire-signe-draconique').remove();
-      return;
-    }
-
-    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
-    HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(this._getActorCoord()));
-
-    this.html.find('tr.tmr-row *').click((event) => {
-      this.subdialog?.bringToTop();
-    });
-
-    // Roll Sort
-    this.html.find('.lancer-sort').click((event) => {
-      this.actor.rollUnSort(this._getActorCoord());
-    });
-    this.html.find('.lire-signe-draconique').click((event) => {
-      this.actor.rollLireSigneDraconique(this._getActorCoord());
-    });
-
-    this.html.find('#dir-top').click((event) => this.moveFromKey("top"));
-    this.html.find('#dir-top-left').click((event) => this.moveFromKey("top-left"));
-    this.html.find('#dir-top-right').click((event) => this.moveFromKey("top-right"));
-    this.html.find('#dir-bottom-left').click((event) => this.moveFromKey("bottom-left"));
-    this.html.find('#dir-bottom-right').click((event) => this.moveFromKey("bottom-right"));
-    this.html.find('#dir-bottom').click((event) => this.moveFromKey("bottom"));
-
-    // Gestion du cout de montée en points de rêve
-    let reveCout = ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
-    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
-      this.cumulFatigue += this.fatigueParCase;
-    }
-    await this.actor.reveActuelIncDec(reveCout);
-    // Le reste...
-    this.updateValuesDisplay();
-    let tmr = TMRUtility.getTMR(this._getActorCoord());
-    await this.manageRencontre(tmr);
   }
 
   /* -------------------------------------------- */
   async updateValuesDisplay() {
-    if (!this.rendered) {
+    if (this.viewOnly || !this.rendered) {
       return;
     }
-    const coord = this._getActorCoord();
+    const coord = this._getCoordActor();
-
     HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
-
+    
     let ptsreve = document.getElementById("tmr-pointsreve-value");
     ptsreve.innerHTML = this.actor.system.reve.reve.value;
 
@@ -307,7 +330,6 @@ export class RdDTMRDialog extends Dialog {
     if (this.subdialog) {
       return this.forceTMRContinueAction()
     }
-
     this.descenteTMR = true;
     if (this.actor.tmrApp) {
       this.actor.tmrApp = undefined; // Cleanup reference
@@ -315,9 +337,12 @@ export class RdDTMRDialog extends Dialog {
         await this.actor.setEffect(STATUSES.StatusDemiReve, false)
         this._tellToGM(this.actor.name + " a quitté les terres médianes");
       }
-      await this.actor.santeIncDec("fatigue", this.cumulFatigue)
+      await this.actor.santeIncDec((ReglesOptionnelles.isUsing("appliquer-fatigue") ? "fatigue" : "endurance"),
+        this.cumulFatigue)
     }
     await super.close();
+    this.pixiTMR.close()
+    this.pixiTMR = undefined
   }
 
   /* -------------------------------------------- */
@@ -357,7 +382,7 @@ export class RdDTMRDialog extends Dialog {
   async refouler() {
     console.log("-> refouler", this.currentRencontre);
     await this.actor.ajouterRefoulement(this.currentRencontre.system.refoulement, `${this.currentRencontre.system.genre == 'f' ? 'une' : 'un'} ${this.currentRencontre.name}`);
-    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
+    await this.actor.deleteRencontreTMRAtPosition()
     this.updateTokens();
     this.updateValuesDisplay();
     this.nettoyerRencontre();
@@ -367,7 +392,7 @@ export class RdDTMRDialog extends Dialog {
   async ignorerRencontre() {
     console.log("-> ignorer", this.currentRencontre);
     this._tellToGM(this.actor.name + " a ignoré: " + this.currentRencontre.name);
-    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
+    await this.actor.deleteRencontreTMRAtPosition()
     this.updateTokens();
     this.updateValuesDisplay();
     this.nettoyerRencontre();
@@ -382,19 +407,8 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   $marquerCasesTMR(listCoordTMR) {
-    this.currentRencontre.graphics = []; // Keep track of rectangles to delete it
+    this.currentRencontre.locList = foundry.utils.duplicate(listCoordTMR); // And track of allowed location
-    this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
+    this.currentRencontre.graphics = listCoordTMR.map(coordTMR => this.pixiTMR.addMarkTMR(coordTMR))
-    for (let coordTMR of listCoordTMR) {
-      const rect = this._getCaseRectangleCoord(coordTMR);
-      const rectDraw = new PIXI.Graphics();
-      rectDraw.beginFill(0xffff00, 0.3);
-      // set the line style to have a width of 5 and set the color to red
-      rectDraw.lineStyle(5, 0xff0000);
-      // draw a rectangle
-      rectDraw.drawRect(rect.x, rect.y, rect.w, rect.h);
-      this.pixiApp.stage.addChild(rectDraw);
-      this.currentRencontre.graphics.push(rectDraw); // garder les objets pour gestion post-click
-    }
   }
 
   /* -------------------------------------------- */
@@ -404,12 +418,16 @@ export class RdDTMRDialog extends Dialog {
       this.close();
       return true;
     }
-    const resteAvantInconscience = this.actor.getFatigueMax() - this.actor.getFatigueActuelle() - this.cumulFatigue;
+
-    if (ReglesOptionnelles.isUsing("appliquer-fatigue") && resteAvantInconscience <= 0) {
+    if (ReglesOptionnelles.isUsing("appliquer-fatigue")
+      ? (this.actor.getFatigueRestante() <= this.cumulFatigue)
+      : (this.actor.getEnduranceActuelle() <= this.cumulFatigue)
+    ) {
       this._tellToGM("Vous vous écroulez de fatigue : vous quittez les Terres médianes !");
       this.quitterLesTMRInconscient();
       return true;
     }
+
     if (this.actor.getReveActuel() == 0) {
       this._tellToGM("Vos Points de Rêve sont à 0 : vous quittez les Terres médianes !");
       this.quitterLesTMRInconscient();
@@ -428,7 +446,7 @@ export class RdDTMRDialog extends Dialog {
   async maitriserRencontre() {
     console.log("-> maitriser", this.currentRencontre);
 
-    await this.actor.deleteTMRRencontreAtPosition();
+    await this.actor.deleteRencontreTMRAtPosition()
     this.updateTokens();
 
     let rencontreData = {
@@ -440,7 +458,7 @@ export class RdDTMRDialog extends Dialog {
       nbRounds: 1,
       canClose: false,
       selectedCarac: { label: "reve-actuel" },
-      tmr: TMRUtility.getTMR(this._getActorCoord())
+      tmr: TMRUtility.getTMR(this._getCoordActor())
     }
 
     await this._tentativeMaitrise(rencontreData);
@@ -518,7 +536,7 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   _rollPresentCite(rencData) {
     let rolled = RdDResolutionTable.computeChances(rencData.reve, 0);
-    mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
+    foundry.utils.mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
     RdDResolutionTable.succesRequis(rolled);
     return rolled;
   }
@@ -559,7 +577,7 @@ export class RdDTMRDialog extends Dialog {
     }
     this.descenteTMR = false;
     this.currentRencontre = undefined;
-    if (this._presentCite(tmr)) {
+    if (await this._presentCite(tmr)) {
       return;
     }
     this.currentRencontre = await this._jetDeRencontre(tmr);
@@ -570,7 +588,7 @@ export class RdDTMRDialog extends Dialog {
       }
       else {
         const dialog = new RdDTMRRencontreDialog(this.actor, this.currentRencontre, tmr);
-        dialog.render(true);
+        await dialog.render(true);
         this.setTMRPendingAction(dialog);
       }
     }
@@ -580,11 +598,11 @@ export class RdDTMRDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  _presentCite(tmr) {
+  async _presentCite(tmr) {
     const presentCite = this.casesSpeciales.find(c => EffetsDraconiques.presentCites.isCase(c, tmr.coord));
     if (presentCite) {
       const caseData = presentCite;
-      const dialog = EffetsDraconiques.presentCites.choisirUnPresent(caseData, present => {
+      const dialog = await EffetsDraconiques.presentCites.choisirUnPresent(caseData, present => {
         this._utiliserPresentCite(presentCite, present, tmr)
         this.restoreTMRAfterAction();
       });
@@ -623,19 +641,18 @@ export class RdDTMRDialog extends Dialog {
     if (rencontre) {
       return game.system.rdd.rencontresTMR.calculRencontre(rencontre, tmr);
     }
-    let locTMR = (this.isDemiReveCache()
+    const coordTMR = (this.isDemiReveCache()
       ? TMRUtility.getTMRType(tmr.coord) + " ??"
       : tmr.label + " (" + tmr.coord + ")");
 
-    const fakeDialogRencontre = { bringToTop: () => { } };
+    this.setTMRPendingAction({ bringToTop: () => { } })
-    this.setTMRPendingAction(fakeDialogRencontre)
+    const myRoll = await RdDDice.rollTotal("1dt", { showDice: SHOW_DICE });
-    let myRoll = await RdDDice.rollTotal("1dt", { showDice: SHOW_DICE });
     this.restoreTMRAfterAction()
     if (myRoll == 7) {
-      this._tellToUser(myRoll + ": Rencontre en " + locTMR);
+      this._tellToUser(myRoll + ": Rencontre en " + coordTMR);
       return await game.system.rdd.rencontresTMR.getRencontreAleatoire(tmr, this.actor.isMauvaiseRencontre())
     } else {
-      this._tellToUser(myRoll + ": Pas de rencontre en " + locTMR);
+      this._tellToUser(myRoll + ": Pas de rencontre en " + coordTMR);
       return undefined;
     }
   }
@@ -662,7 +679,7 @@ export class RdDTMRDialog extends Dialog {
     if (this.isCaseHumide(tmr)) {
       let rollData = {
         actor: this.actor,
-        competence: duplicate(this.actor.getBestDraconic()),
+        competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
         tmr: tmr,
         canClose: false,
         diffLibre: -7,
@@ -681,7 +698,6 @@ export class RdDTMRDialog extends Dialog {
   }
 
   async _resultatMaitriseCaseHumide(rollData) {
-    await this.souffleSiEchecTotal(rollData);
     if (rollData.rolled.isSuccess && rollData.double) {
       rollData.previous = { rolled: rollData.rolled, ajustements: rollData.ajustements };
       rollData.double = undefined;
@@ -696,6 +712,7 @@ export class RdDTMRDialog extends Dialog {
     if (rollData.rolled.isEchec) {
       await this.close();
     }
+    await this.souffleSiEchecTotal(rollData);
   }
 
   /* -------------------------------------------- */
@@ -787,7 +804,7 @@ export class RdDTMRDialog extends Dialog {
   async _conquerir(tmr, options) {
     let rollData = {
       actor: this.actor,
-      competence: duplicate(this.actor.getBestDraconic()),
+      competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
       tmr: tmr,
       canClose: options.canClose ?? false,
       diffLibre: options.difficulte ?? -7,
@@ -903,15 +920,11 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   nettoyerRencontre() {
-    if (!this.currentRencontre) return; // Sanity check
+    // Suppression des dessins des zones possibles
-    if (this.currentRencontre.graphics) {
+    this.currentRencontre?.graphics?.forEach(graphic => this.pixiTMR.removeGraphic(graphic))
-      for (let drawRect of this.currentRencontre.graphics) {
+    // Nettoyage de la structureet de l'état
-        // Suppression des dessins des zones possibles
+    this.currentRencontre = undefined;
-        this.pixiApp.stage.removeChild(drawRect);
+    this.rencontreState = 'aucune';
-      }
-    }
-    this.currentRencontre = undefined; // Nettoyage de la structure
-    this.rencontreState = 'aucune'; // Et de l'état
   }
 
   /* -------------------------------------------- */
@@ -953,19 +966,18 @@ export class RdDTMRDialog extends Dialog {
     if (this.subdialog) {
       return this.forceTMRContinueAction()
     }
-    let clickOddq = TMRUtility.computeEventOddq(event);
+    const currentCoord = this._getCoordActor()
-    let currentOddq = TMRUtility.coordTMRToOddq(this._getActorCoord());
+    const currentOddq = TMRUtility.coordTMRToOddq(currentCoord)
-
+    const targetOddq = this.pixiTMR.computeEventOddq(event)
-    let targetCoord = TMRUtility.oddqToCoordTMR(clickOddq);
+    const targetCoord = TMRUtility.oddqToCoordTMR(targetOddq)
-    let currentCoord = TMRUtility.oddqToCoordTMR(currentOddq);
 
     // Validation de la case de destination (gestion du cas des rencontres qui peuvent téléporter)
-    let deplacementType = this._calculDeplacement(targetCoord, currentCoord, currentOddq, clickOddq);
+    const typeDeplacement = this._calculDeplacement(targetCoord, currentCoord, currentOddq, targetOddq);
 
     if (this.isDemiReveCache()) {
       if (this.isTerreAttache(targetCoord)
         || this.isConnaissanceFleuve(currentCoord, targetCoord)
-        || deplacementType == 'changeur') {
+        || typeDeplacement == 'changeur') {
         // déplacement possible
         await this.actor.setTMRVisible(true);
         this.demiReve = this._tokenDemiReve();
@@ -980,11 +992,11 @@ export class RdDTMRDialog extends Dialog {
       }
     }
 
-    switch (deplacementType) {
+    switch (typeDeplacement) {
       case 'normal':
       case 'changeur':
       case 'passeur':
-        await this._deplacerDemiReve(targetCoord, deplacementType);
+        await this._deplacerDemiReve(targetCoord, typeDeplacement);
         break;
       case 'messager':
         await this._messagerDemiReve(targetCoord);
@@ -1068,7 +1080,7 @@ export class RdDTMRDialog extends Dialog {
   }
 
   async notifierResonanceSigneDraconique(coord) {
-    if (this.actor.isResonanceSigneDraconique(coord)) {
+    if (!this.viewOnly && this.actor.isResonanceSigneDraconique(coord)) {
       ChatMessage.create({
         whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
         content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-resonance.html`, { alias: this.actor.name, typeTMR: TMRUtility.getTMRType(coord) })
@@ -1102,26 +1114,23 @@ export class RdDTMRDialog extends Dialog {
     await this.postRencontre(tmr);
     return tmr;
   }
-  /* -------------------------------------------- */
-  /** Retourne les coordonnées x, h, w, h du rectangle d'une case donnée */
-  _getCaseRectangleCoord(coord) {
-    return this.pixiTMR.getCaseRectangle(TMRUtility.coordTMRToOddq(coord));
-  }
 
   /* -------------------------------------------- */
-  _removeTokens(filter) {
+  _removeTokens(filter = it => true) {
-    const tokensToRemove = this.allTokens.filter(filter);
+    this.allTokens.filter(filter).forEach(token => this.pixiTMR.removeToken(token))
-    for (let token of tokensToRemove) {
-      this.pixiApp.stage.removeChild(token.sprite);
-    }
   }
 
   /* -------------------------------------------- */
   _trackToken(token) {
+    if (!token) {
+      return
+    }
     if (this.demiReve === token && this.isDemiReveCache()) {
       return;
     }
-    this.pixiTMR.setPosition(token.sprite, TMRUtility.coordTMRToOddq(token.coordTMR()));
+    this.pixiTMR.positionToken(token);
-    this.allTokens.push(token);
+    if (!this.allTokens.includes(token)) {
+      this.allTokens.push(token);
+    }
   }
 }

module/rdd-tmr-rencontre-dialog.js

@@ -46,7 +46,7 @@ export class RdDTMRRencontreDialog extends Dialog {
       }
       else {
         ui.notifications.info("Vous devez résoudre la rencontre.");
-        this.actor.tmrApp.forceTMRContinueAction();
+        return this.actor.tmrApp.forceTMRContinueAction();
       }
     }
     else {

module/rdd-token-hud.js

@@ -90,7 +90,6 @@ export class RdDTokenHud {
     if (target?.actor) {
       const hudSoins = { blessures: target.actor.blessuresASoigner() ?? [] };
       if (hudSoins.blessures.length > 0) {
-        // soins
         const controlIconTarget = html.find('.control-icon[data-action=combat]');
         await RdDTokenHud._configureSubMenu(controlIconTarget,
           'systems/foundryvtt-reve-de-dragon/templates/hud-actor-soins.hbs',

module/rdd-utility.js

@@ -4,7 +4,7 @@ import { RdDCombat } from "./rdd-combat.js";
 import { Misc } from "./misc.js";
 import { Grammar } from "./grammar.js";
 import { TMRUtility } from "./tmr-utility.js";
-import { DialogItemAchat } from "./dialog-item-achat.js";
+import { DialogItemAchat } from "./achat-vente/dialog-item-achat.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { RdDDice } from "./rdd-dice.js";
 import { RdDItem } from "./item.js";
@@ -17,6 +17,8 @@ import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDRaretes } from "./item/raretes.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { ExperienceLog } from "./actor/experience-log.js";
+import { RdDCoeur } from "./coeur/rdd-coeur.js";
+import { APP_ASTROLOGIE_REFRESH } from "./sommeil/app-astrologie.js";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -28,9 +30,9 @@ const ajustementsEncaissement = Misc.intArray(-10, 26);
 /* -------------------------------------------- */
 function _buildAllSegmentsFatigue(max) {
   const cycle = [5, 2, 4, 1, 3, 0];
-  let fatigue = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]];
+  const fatigue = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]];
   for (let i = 0; i <= max; i++) {
-    const ligneFatigue = duplicate(fatigue[i]);
+    const ligneFatigue = foundry.utils.duplicate(fatigue[i]);
     const caseIncrementee = cycle[i % 6];
     ligneFatigue[caseIncrementee]++;
     ligneFatigue[caseIncrementee + 6]++;
@@ -44,7 +46,7 @@ function _buildAllSegmentsFatigue(max) {
 function _cumulSegmentsFatigue(matrix) {
   let cumulMatrix = [];
   for (let line of matrix) {
-    let cumul = duplicate(line);
+    let cumul = foundry.utils.duplicate(line);
 
     for (let i = 1; i < 12; i++) {
       cumul[i] += cumul[i - 1];
@@ -55,18 +57,13 @@ function _cumulSegmentsFatigue(matrix) {
 }
 
 /* -------------------------------------------- */
-const fatigueMatrix = _buildAllSegmentsFatigue(60);
+export const MAX_ENDURANCE_FATIGUE = 60;
+const fatigueMatrix = _buildAllSegmentsFatigue(MAX_ENDURANCE_FATIGUE);
 const cumulFatigueMatrix = _cumulSegmentsFatigue(fatigueMatrix);
 
 const fatigueMalus = [0, 0, 0, -1, -1, -1, -2, -3, -4, -5, -6, -7]; // Provides the malus for each segment of fatigue
 const fatigueLineSize = [3, 6, 7, 8, 9, 10, 11, 12];
 const fatigueLineMalus = [0, -1, -2, -3, -4, -5, -6, -7];
-const fatigueMarche = {
-  "aise": { "4": 1, "6": 2, "8": 3, "10": 4, "12": 6 },
-  "malaise": { "4": 2, "6": 3, "8": 4, "10": 6 },
-  "difficile": { "4": 3, "6": 4, "8": 6 },
-  "tresdifficile": { "4": 4, "6": 6 }
-}
 
 /* -------------------------------------------- */
 const nomEthylisme = ["Emeché", "Gris", "Pinté", "Pas frais", "Ivre", "Bu", "Complètement fait", "Ivre mort"];
@@ -74,22 +71,22 @@ const nomEthylisme = ["Emeché", "Gris", "Pinté", "Pas frais", "Ivre", "Bu", "C
 /* -------------------------------------------- */
 const definitionsEncaissement = {
   "mortel": [
-    { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1},
+    { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1 },
-    { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0},
+    { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0 },
-    { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 2},
+    { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 2 },
-    { minimum: 16, maximum: 19, endurance: "2d6", vie: "2", gravite: 4},
+    { minimum: 16, maximum: 19, endurance: "2d6", vie: "2", gravite: 4 },
-    { minimum: 20, maximum: undefined, endurance: "100", vie: "4 + @over20", gravite: 6},
+    { minimum: 20, maximum: undefined, endurance: "100", vie: "4 + @over20", gravite: 6 },
   ],
   "non-mortel": [
-    { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1},
+    { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1 },
     { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0 },
     { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 0 },
     { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", gravite: 2 },
     { minimum: 20, maximum: undefined, endurance: "100", vie: "0", gravite: 2 },
   ],
   "entiteincarnee": [
-    { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1},
+    { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1 },
-    { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0},
+    { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0 },
     { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 0 },
     { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", gravite: 0 },
     { minimum: 20, maximum: undefined, endurance: "3d6 + @over20", vie: "0", gravite: 0 },
@@ -98,11 +95,13 @@ const definitionsEncaissement = {
 
 /* -------------------------------------------- */
 export class RdDUtility {
-
+  // persistent handling of conteneur show/hide
+  static afficheContenu = {}
   /* -------------------------------------------- */
   static async init() {
-    Hooks.on("renderChatMessage", async (app, html, msg) => RdDUtility.onRenderChatMessage(app, html, msg));
+    Hooks.on("renderChatMessage", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
-    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html));
+    Hooks.on("createChatMessage", async (chatMessage, options, id) => await ChatUtility.onCreateChatMessage(chatMessage, options, id))
+    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html))
   }
 
   /* -------------------------------------------- */
@@ -164,15 +163,16 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html',
       "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.html",
-      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-animaux.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-animaux.hbs',
-      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-suivants.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-suivants.hbs',
-      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-vehicules.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-vehicules.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire-item.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/scripts/autocomplete-script.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/scripts/autocomplete.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/item/boutons-comestible.html',
+      'systems/foundryvtt-reve-de-dragon/templates/item/icon-arme-broken.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.html',
       'systems/foundryvtt-reve-de-dragon/templates/item/partial-environnement.html',
@@ -200,23 +200,30 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html',
       // Partials
+      'systems/foundryvtt-reve-de-dragon/templates/coeur/chat-effet-tendre-moment.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/coeur/afficher-coeur.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/voyage/fatigue-actor.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/periodicite.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/enum-duree.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/compendium-link.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-description-sort.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-astrologique.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-coeur.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-competences.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-competences.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-item-hautrevant.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-item-frequence.html',
@@ -245,7 +252,8 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/chat-description.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-info-distance.html',
-      'systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html',
+      'systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-acteur.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-sante.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/chat-actor-competence-xp.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-actor-carac-xp.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-potionenchantee-chateaudormant.html',
@@ -279,6 +287,7 @@ export class RdDUtility {
     Handlebars.registerHelper('timestamp-formulesDuree', () => RdDTimestamp.formulesDuree());
     Handlebars.registerHelper('timestamp-formulesPeriode', () => RdDTimestamp.formulesPeriode());
 
+    Handlebars.registerHelper('array-includes', (array, value) => array.includes(value));
     Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
     Handlebars.registerHelper('regle-optionnelle', (option) => ReglesOptionnelles.isUsing(option));
     Handlebars.registerHelper('trier', list => list.sort((a, b) => a.name.localeCompare(b.name)));
@@ -288,8 +297,17 @@ export class RdDUtility {
     Handlebars.registerHelper('isFieldInventaireModifiable', (type, field) => RdDItem.isFieldInventaireModifiable(type, field));
     Handlebars.registerHelper('rarete-getChamp', (rarete, field) => RdDRaretes.getChamp(rarete, field));
 
+    Handlebars.registerHelper('plusMoins', diff => (diff > 0 ? '+' : '') + Math.round(diff))
     Handlebars.registerHelper('experienceLog-topic', topic => ExperienceLog.labelTopic(topic));
 
+    // Handle v12 removal of this helper
+    Handlebars.registerHelper('select', function (selected, options) { 
+      const escapedValue = RegExp.escape(Handlebars.escapeExpression(selected));
+      const rgx = new RegExp(' value=[\"\']' + escapedValue + '[\"\']');
+      const html = options.fn(this);
+      return html.replace(rgx, "$& selected");    
+    }); 
+
     return loadTemplates(templatePaths);
   }
 
@@ -319,24 +337,16 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static getNomEthylisme(niveauEthylisme) {
+  static getNomEthylisme(niveauEthylisme) { return niveauEthylisme > 0 ? 'Aucun' : nomEthylisme[-niveauEthylisme] }
-    let index = -niveauEthylisme;
-    return index < 0 ? 'Aucun' : nomEthylisme[index];
-  }
 
-  /* -------------------------------------------- */
-  static initAfficheContenu() { // persistent handling of conteneur show/hide
-    if (!this.afficheContenu)
-      this.afficheContenu = {};
-  }
   /* -------------------------------------------- */
   static toggleAfficheContenu(conteneurId) {
-    this.afficheContenu[conteneurId] = !this.afficheContenu[conteneurId];
+    RdDUtility.afficheContenu[conteneurId] = !RdDUtility.afficheContenu[conteneurId];
   }
   /* -------------------------------------------- */
   static getAfficheContenu(conteneurId) {
     if (conteneurId)
-      return this.afficheContenu[conteneurId];
+      return RdDUtility.afficheContenu[conteneurId];
     return undefined;
   }
 
@@ -459,18 +469,15 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static getSegmentsFatigue(maxEnd) {
+  static getSegmentsFatigue(maxEndurance) {
-    maxEnd = Math.max(maxEnd, 1);
+    return fatigueMatrix[Math.min(Math.max(maxEndurance, 1), fatigueMatrix.length)];
-    maxEnd = Math.min(maxEnd, fatigueMatrix.length);
-    return fatigueMatrix[maxEnd];
   }
 
   /* -------------------------------------------- */
-  static calculMalusFatigue(fatigue, maxEnd) {
+  static calculMalusFatigue(fatigue, endurance) {
-    maxEnd = Math.max(maxEnd, 1);
+    endurance = Math.min(Math.max(endurance, 1), cumulFatigueMatrix.length);
-    maxEnd = Math.min(maxEnd, cumulFatigueMatrix.length);
+    let segments = cumulFatigueMatrix[endurance];
-    let segments = cumulFatigueMatrix[maxEnd];
+    for (let i = 0; i < segments.length; i++) {
-    for (let i = 0; i < 12; i++) {
       if (fatigue <= segments[i]) {
         return fatigueMalus[i]
       }
@@ -490,7 +497,7 @@ export class RdDUtility {
   // Build the nice (?) html table used to manage fatigue.
   // max should be the endurance max value
   static makeHTMLfatigueMatrix(fatigue, maxEndurance) {
-    let segments = this.getSegmentsFatigue(maxEndurance);
+    const segments = this.getSegmentsFatigue(maxEndurance);
     return this.makeHTMLfatigueMatrixForSegment(fatigue, segments);
   }
 
@@ -553,49 +560,54 @@ export class RdDUtility {
 
   /* -------------------------------------------- */
   static async jetEncaissement(rollData, armure, options = { showDice: HIDE_DICE }) {
-    let formula = "2d10";
+    const diff = Math.abs(rollData.diffLibre);
+    let formula = RdDUtility.formuleEncaissement(diff, options)
+    const roll = await RdDDice.roll(formula, options);
 
-    // Chaque dé fait au minmum la difficulté libre
+    RdDUtility.remplaceDeMinParDifficulte(roll, diff, options);
-    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        formula += "min" + valeurMin;
-      }
-    }
-    // Chaque dé fait au minmum la difficulté libre
-    if (ReglesOptionnelles.isUsing('degat-ajout-malus-libre')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        formula += "+" + valeurMin;
-      }
-    }
-
-    let roll = await RdDDice.roll(formula, options);
-
-    // 1 dé fait au minmum la difficulté libre
-    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre-simple')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        if (roll.terms[0].results[0].result < valeurMin) {
-          roll.terms[0].results[0].result = valeurMin;
-        } else if (roll.terms[0].results[1].result < valeurMin) {
-          roll.terms[0].results[1].result = valeurMin;
-        }
-        roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
-      }
-    }
 
     return await RdDUtility.prepareEncaissement(rollData, roll, armure);
   }
 
+  static remplaceDeMinParDifficulte(roll, diff, options) {
+    if (!ReglesOptionnelles.isUsing('degat-minimum-malus-libre-simple')) {
+      return
+    }
+    // 1 dé fait au minmum la difficulté libre
+    const total = options.forceDiceResult?.total;
+    if (total) {
+      const reste = Math.max(total - diff, 1)
+      roll.terms[0].number = reste + diff
+    }
+    else {
+      if (roll.terms[0].results[0].result < diff) {
+        roll.terms[0].results[0].result = diff;
+      } else if (roll.terms[0].results[1].result < diff) {
+        roll.terms[0].results[1].result = diff;
+      }
+      roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
+    }
+  }
+
+  static formuleEncaissement(diff, options) {
+    // Chaque dé fait au minimum la difficulté libre
+    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre')) {
+      return `2d10min${diff}`
+    }
+    return '2d10'
+  }
+
   /* -------------------------------------------- */
   static async prepareEncaissement(rollData, roll, armure) {
-    const jetTotal = roll.total + rollData.dmg.total - armure;
+    // La difficulté d'ataque s'ajoute aux dégâts
-    let encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    const bonusDegatsDiffLibre = ReglesOptionnelles.isUsing('degat-ajout-malus-libre') ? Math.abs(rollData.diffLibre ?? 0) : 0
-    let over20 = Math.max(jetTotal - 20, 0);
+    const jetTotal = roll.total + rollData.dmg.total - armure + bonusDegatsDiffLibre
+    const encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    const over20 = Math.max(jetTotal - 20, 0);
     encaissement.dmg = rollData.dmg;
     encaissement.dmg.loc = rollData.dmg.loc ?? await RdDUtility.getLocalisation(this.type);
     encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;';
+    encaissement.dmg.bonusDegatsDiffLibre = bonusDegatsDiffLibre
     encaissement.roll = roll;
     encaissement.armure = armure;
     encaissement.penetration = rollData.arme?.system.penetration ?? 0;
@@ -611,53 +623,28 @@ export class RdDUtility {
     for (let encaissement of table) {
       if ((encaissement.minimum === undefined || encaissement.minimum <= degats)
         && (encaissement.maximum === undefined || degats <= encaissement.maximum)) {
-        return duplicate(encaissement);
+        return foundry.utils.duplicate(encaissement);
       }
     }
-    return duplicate(table[0]);
+    return foundry.utils.duplicate(table[0]);
   }
 
   /* -------------------------------------------- */
   static async _evaluatePerte(formula, over20) {
     let perte = new Roll(formula, { over20: over20 });
-    await perte.evaluate({ async: true });
+    await perte.evaluate();
     return perte.total;
   }
 
-  /* -------------------------------------------- */
-  static currentFatigueMalus(value, max) {
-    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
-      max = Math.max(1, Math.min(max, 60));
-      value = Math.min(max * 2, Math.max(0, value));
-
-      let fatigueTab = fatigueMatrix[max];
-      let fatigueRem = value;
-      for (let idx = 0; idx < fatigueTab.length; idx++) {
-        fatigueRem -= fatigueTab[idx];
-        if (fatigueRem <= 0) {
-          return fatigueMalus[idx];
-        }
-      }
-      return -7; // This is the max !
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  static async responseNombreAstral(callData) {
-    let actor = game.actors.get(callData.id);
-    actor.ajouteNombreAstral(callData);
-  }
-
   /* -------------------------------------------- */
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
       case "msg_gm_chat_message":
         return ChatUtility.handleGMChatMessage(sockmsg.data);
+      case "msg_app_astrologie_refresh":
+        return Hooks.callAll(APP_ASTROLOGIE_REFRESH);
       case "msg_request_nombre_astral":
         return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data);
-      case "msg_response_nombre_astral":
-        return RdDUtility.responseNombreAstral(sockmsg.data);
       case "msg_tmr_move":
         let actor = game.actors.get(sockmsg.data.actorId);
         if (actor.isOwner || game.user.isGM) {
@@ -669,8 +656,9 @@ export class RdDUtility {
 
   /* -------------------------------------------- */
   static async chatListeners(html) {
-    RdDCombat.registerChatCallbacks(html);
+    RdDCombat.registerChatCallbacks(html)
-    RdDEmpoignade.registerChatCallbacks(html);
+    RdDEmpoignade.registerChatCallbacks(html)
+    RdDCoeur.registerChatCallbacks(html)
 
     // Gestion spécifique message passeurs
     html.on("click", '.tmr-passeur-coord a', event => {
@@ -829,7 +817,7 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static confirmerSuppressionSubacteur(sheet, subActor, htmlToDelete, onSuppression = ()=>{}) {
+  static confirmSubActeurDelete(sheet, subActor, htmlToDelete, onSuppression = () => { }) {
     RdDConfirm.confirmer({
       settingConfirmer: "confirmation-supprimer-lien-acteur",
       content: `<p>Etes vous certain de vouloir supprimer le lien vers ${subActor.name} ?</p>`,
@@ -912,10 +900,4 @@ export class RdDUtility {
     }
   }
 
-  /*-------------------------------------------- */
-  static async onRenderChatMessage(app, html, msg) {
-    // TODO 
-    //console.log(app, html, msg);
-  }
-
 }

module/rolldata-ajustements.js

@@ -64,32 +64,44 @@ export const referenceAjustements = {
   },
   encTotal: {
     isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
-    isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use.encTotal,
+    isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use?.encTotal,
     getLabel: (rollData, actor) => 'Encombrement total',
     getValue: (rollData, actor) => -actor.getEncTotal()
   },
   surenc: {
-    isVisible: (rollData, actor) => actor.isSurenc(),
+    isVisible: (rollData, actor) => RdDCarac.isActionPhysique(rollData.selectedCarac) && actor.isSurenc(),
-    isUsed: (rollData, actor) => rollData.use?.surenc,
+    isUsed: (rollData, actor) => rollData.use.surenc && RdDCarac.isActionPhysique(rollData.selectedCarac),
     getLabel: (rollData, actor) => 'Sur-encombrement',
     getValue: (rollData, actor) => actor.computeMalusSurEncombrement()
   },
+  rituel: {
+    isUsed: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && rollData.selectedSort?.system.isrituel,
+    getLabel: (rollData, actor) => 'Astrologique',
+    getValue: (rollData, actor) => actor.ajustementAstrologique()
+  },
+  astrologique: {
+    isVisible: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && RdDCarac.isChance(rollData.selectedCarac),
+    isUsed: (rollData, actor) =>  RdDCarac.isChance(rollData.selectedCarac) && rollData.use.astrologique,
+    getLabel: (rollData, actor) => 'Astrologique',
+    getValue: (rollData, actor) => actor.ajustementAstrologique()
+  },
   moral: {
     isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac) && rollData.use?.moral,
-    isUsed: (rollData, actor) => rollData.use?.moral,
+    isUsed: (rollData, actor) => rollData.use.moral,
     getLabel: (rollData, actor) => 'Appel au moral',
     getValue: (rollData, actor) => 1
   },
+  coeur: {
+    isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isVolonte(rollData.selectedCarac),
+    isUsed: (rollData, actor) => rollData.use.coeur != undefined,
+    getLabel: (rollData, actor) => 'Ajustement de cœur',
+    getValue: (rollData, actor) => -2 * (rollData.use.coeur?.coeur ?? 0)
+  },
   moralTotal: {
     isUsed: (rollData, actor) => RdDCarac.isVolonte(rollData.selectedCarac),
     getLabel: (rollData, actor) => 'Moral',
     getValue: (rollData, actor) => actor.getMoralTotal()
   },
-  astrologique: {
-    isUsed: (rollData, actor) => ReglesOptionnelles.isUsing("astrologie") && RdDBonus.isAjustementAstrologique(rollData),
-    getLabel: (rollData, actor) => 'Astrologique',
-    getValue: (rollData, actor) => actor.ajustementAstrologique()
-  },
   facteurSign: {
     isUsed: (rollData, actor) => rollData.diviseurSignificative > 1,
     getLabel: (rollData, actor) => Misc.getFractionHtml(rollData.diviseurSignificative),
@@ -135,7 +147,7 @@ export const referenceAjustements = {
     getLabel: (rollData, actor) => "Force de l'alcool: ",
     getValue: (rollData, actor) => rollData.forceAlcool,
   },
-  ethylisme:{
+  ethylisme: {
     isVisible: (rollData, actor) => rollData.ethylisme != undefined,
     isUsed: (rollData, actor) => rollData.ethylisme != undefined,
     getLabel: (rollData, actor) => "Ethylisme - " + RdDUtility.getNomEthylisme(rollData.ethylisme),
@@ -153,7 +165,9 @@ export class RollDataAjustements {
 
   /* -------------------------------------------- */
   static calcul(rollData, actor) {
-    rollData.ajustements = {};
+    // s'assurer de la correction des infos rollData
+    foundry.utils.mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
+
     for (var key in referenceAjustements) {
       const reference = referenceAjustements[key];
       rollData.ajustements[key] = {
@@ -185,4 +199,5 @@ export class RollDataAjustements {
       RdDCarac.isChance(selectedCarac) ||
       (RdDCarac.isReve(selectedCarac) && !rollData.competence);
   }
+
 }

module/settings/regles-optionnelles.js

@@ -4,6 +4,12 @@ import { Misc } from "../misc.js";
 const listeReglesOptionnelles = [
   { group: 'Règles générales', name: 'appliquer-fatigue',           descr: "Appliquer les règles de fatigue"},
   { group: 'Règles générales', name: 'astrologie',                  descr: "Appliquer les ajustements astrologiques aux jets de chance et aux rituels"},
+  { group: 'Récupération', name: 'transformation-stress',           descr: "Transformer le stress durant Château Dormant"},
+  { group: 'Récupération', name: 'recuperation-chance',             descr: "Récupérer la chance durant Château Dormant"},
+  { group: 'Récupération', name: 'recuperation-ethylisme',          descr: "Récupérer l'éthylisme"},
+  { group: 'Récupération', name: 'recuperation-reve',               descr: "Récupérer le rêve pendant la nuit (les jets sont toujours faits pour les Rêves de Dragons)"},
+  { group: 'Récupération', name: 'recuperation-moral',              descr: "Le moral revient vers 0 durant Château Dormant"},
+
 
   { group: 'Règles de combat', name: 'recul',                       descr: "Appliquer le recul en cas de particulière en force ou de charge" },
   { group: 'Règles de combat', name: 'resistanceArmeParade',        descr: "Faire le jet de résistance des armes lors de parades pouvant les endommager" },
@@ -20,6 +26,7 @@ const listeReglesOptionnelles = [
   
   { group: 'Confirmations', name: 'confirmer-combat-sans-cible',         descr: "Confirmer avant une attaque sans cible", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-tmr',                    descr: "Confirmer pour monter dans les TMR", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-tmr-rencontre',          descr: "Confirmer pour monter dans les TMR avec rencontre en attente", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-refouler',               descr: "Confirmer avant de refouler", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-vider',                  descr: "Confirmer pour vider l'équipement", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-supprimer-lien-acteur',  descr: "Confirmer pour détacher un animal/suivant/véhicule", scope: "client"},
@@ -64,23 +71,21 @@ export class ReglesOptionnelles extends FormApplication {
   }
 
   static get defaultOptions() {
-    const options = super.defaultOptions;
+    return foundry.utils.mergeObject(super.defaultOptions, {
-    mergeObject(options, {
       id: "regles-optionnelles",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.html",
-      height: 600,
+      height: 650,
-      width: 450,
+      width: 550,
       minimizable: false,
       closeOnSubmit: true,
       title: "Règles optionnelles"
-    });
+    }, { inplace: false })
-    return options;
   }
 
   getData() {
     let formData = super.getData();
     const regles = listeReglesOptionnelles.filter(it => game.user.isGM || it.scope == "client").map(it => {
-      it = duplicate(it);
+      it = foundry.utils.duplicate(it);
       it.id = ReglesOptionnelles._getIdRegle(it.name);
       it.active = ReglesOptionnelles.isSet(it.name);
       return it;

module/settings/status-effects.js

@@ -1,13 +1,13 @@
 import { SYSTEM_RDD } from "../constants.js";
 
 export const STATUSES = {
-  StatusStunned : 'stun',
+  StatusStunned: 'stun',
   StatusBleeding: 'bleeding',
   StatusProne: 'prone',
   StatusGrappling: 'grappling',
   StatusGrappled: 'grappled',
   StatusRestrained: 'restrain',
-  StatusUnconscious: 'unconscious', 
+  StatusUnconscious: 'unconscious',
   StatusBlind: 'blind',
   StatusComma: 'comma',
   StatusDead: 'dead',
@@ -18,8 +18,8 @@ const rddStatusEffects = [
   { rdd: true, id: STATUSES.StatusStunned, label: 'EFFECT.StatusStunned', icon: 'icons/svg/stoned.svg', "duration.rounds": 1 },
   { rdd: true, id: STATUSES.StatusBleeding, label: 'EFFECT.StatusBleeding', icon: 'icons/svg/blood.svg' },
   { rdd: true, id: STATUSES.StatusProne, label: 'EFFECT.StatusProne', icon: 'icons/svg/falling.svg' },
-  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
-  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
   { rdd: true, id: STATUSES.StatusRestrained, label: 'EFFECT.StatusRestrained', icon: 'icons/svg/net.svg' },
   { rdd: true, id: STATUSES.StatusUnconscious, label: 'EFFECT.StatusUnconscious', icon: 'icons/svg/unconscious.svg' },
   { rdd: true, id: STATUSES.StatusBlind, label: 'EFFECT.StatusBlind', icon: 'icons/svg/blind.svg' },
@@ -29,13 +29,16 @@ const rddStatusEffects = [
 ];
 const demiReveStatusEffect = rddStatusEffects.find(it => it.id == STATUSES.StatusDemiReve);
 
-const statusDemiSurprise = [STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained];
+const statusDemiSurprise = new Set([STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained])
-const statusSurpriseTotale = [STATUSES.StatusUnconscious, STATUSES.StatusBlind, STATUSES.StatusComma];
+const statusSurpriseTotale = new Set([STATUSES.StatusUnconscious, STATUSES.StatusBlind, STATUSES.StatusComma])
 
 export class StatusEffects extends FormApplication {
   static onReady() {
-    const rddStatusIds = rddStatusEffects.map(it => it.id);
+    const rddEffectIds = rddStatusEffects.map(it => it.id);
-    rddStatusEffects.forEach(it => it.flags = { core: { statusId: it.id } });
+    rddStatusEffects.forEach(it => {
+      it.statuses = new Set()
+      it.statuses.add(it.id)
+    })
     const defaultStatusEffectIds = CONFIG.statusEffects.map(it => it.id);
     game.settings.register(SYSTEM_RDD, "use-status-effects", {
       name: "use-status-effects",
@@ -54,37 +57,47 @@ export class StatusEffects extends FormApplication {
       restricted: true
     });
 
-    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddStatusIds.includes(it.id)));
+    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddEffectIds.includes(it.id)));
 
     StatusEffects._setUseStatusEffects(StatusEffects._getUseStatusEffects());
     console.log('statusEffects', CONFIG.statusEffects);
   }
 
   static valeurSurprise(effect, isCombat) {
-    // const id = StatusEffects.statusId(effect);
+    if (statusSurpriseTotale.intersects(effect.statuses)) {
-    if (statusSurpriseTotale.includes(effect.flags?.core?.statusId)) {
+      return 2
-      return 2;
     }
-    return statusDemiSurprise.includes(effect.flags?.core?.statusId) || (isCombat && effect.flags?.core?.statusId == STATUSES.StatusDemiReve) ? 1 : 0;
+    if (statusDemiSurprise.intersects(effect.statuses)) {
+      return 1
+    }
+    if (isCombat && effect.statuses.find(e => e == STATUSES.StatusDemiReve)) {
+      return 1
+    }
+    return 0
   }
 
   static _getUseStatusEffects() {
-     return game.settings.get(SYSTEM_RDD, "use-status-effects")?.split(',') ?? [];
+    return game.settings.get(SYSTEM_RDD, "use-status-effects")?.split(',') ?? [];
   }
 
-  static _setUseStatusEffects(statusIds) {
+  static _setUseStatusEffects(effectIds) {
     if (game.user.isGM) {
-      game.settings.set(SYSTEM_RDD, "use-status-effects", statusIds.join());
+      game.settings.set(SYSTEM_RDD, "use-status-effects", effectIds.join());
     }
 
     for (let effect of CONFIG.RDD.allEffects) {
-      effect.active = effect.rdd || statusIds.includes(effect.flags?.core?.statusId);
+      effect.active = effect.rdd || effectIds.includes(effect.id);
     }
     CONFIG.statusEffects = CONFIG.RDD.allEffects.filter(it => it.active);
   }
 
-  static status(statusId) {
+  static prepareActiveEffect(effectId) {
-    return rddStatusEffects.find(it => it.flags?.core?.statusId == statusId);
+    let status = rddStatusEffects.find(it => it.id == effectId)
+    if (status) {
+      status = foundry.utils.duplicate(status)
+      status.statuses = [effectId]
+    }
+    return status;
   }
 
   static demiReve() {
@@ -97,7 +110,7 @@ export class StatusEffects extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    mergeObject(options, {
+    foundry.utils.mergeObject(options, {
       id: "status-effects",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html",
       height: 800,
@@ -112,7 +125,7 @@ export class StatusEffects extends FormApplication {
   getData() {
     const used = StatusEffects._getUseStatusEffects();
     let formData = super.getData();
-    formData.effects = duplicate(CONFIG.RDD.allEffects);
+    formData.effects = foundry.utils.duplicate(CONFIG.RDD.allEffects);
     formData.effects.forEach(it => it.active = used.includes(it.id))
     return formData;
   }

module/settings/system-compendiums.js

@@ -27,7 +27,7 @@ export class SystemCompendiums extends FormApplication {
   static init() {
     Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => {
       const definition = CONFIGURABLE_COMPENDIUMS[compendium];
-      mergeObject(definition, {
+      foundry.utils.mergeObject(definition, {
         compendium: compendium,
         default: SystemCompendiums._getDefaultCompendium(compendium),
         setting: SystemCompendiums._getSettingCompendium(compendium)
@@ -138,7 +138,7 @@ export class SystemCompendiums extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    mergeObject(options, {
+    foundry.utils.mergeObject(options, {
       id: "system-compendiums",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.html",
       height: 'fit-content',
@@ -152,7 +152,7 @@ export class SystemCompendiums extends FormApplication {
 
   getData() {
     const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS)
-      .map(it => mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
+      .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }, { inplace: false }))
     const availableCompendiums = game.packs.map(pack => {
       return {
         name: pack.collection,
@@ -160,10 +160,10 @@ export class SystemCompendiums extends FormApplication {
         type: pack.metadata.type
       }
     });
-    return mergeObject(super.getData(), {
+    return foundry.utils.mergeObject(super.getData(), {
       systemCompendiums: systemCompendiums,
       availableCompendiums: availableCompendiums
-    });
+    }, { inplace: false })
   }
 
   activateListeners(html) {
@@ -301,11 +301,12 @@ export class CompendiumTableHelpers {
       table,
       isGM: game.user.isGM,
     });
-    ChatMessage.create({
+    const messageData = {
       user: game.user.id,
       whisper: game.user.id,
       content: flavorContent
-    }, { rollMode: "gmroll" });
+    };
+    ChatMessage.create(messageData, { rollMode: "gmroll" });
   }
 
 }

module/sommeil/app-astrologie.js

@@ -17,7 +17,7 @@ export class AppAstrologie extends Application {
 
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/sommeil/app-astrologie.hbs",
       title: "Astrologie",
       width: 'fit-content',
@@ -25,19 +25,18 @@ export class AppAstrologie extends Application {
       classes: ['calendar-astrologie'],
       popOut: true,
       resizable: false
-    });
+    }, { inplace: false })
   }
 
   constructor(actor, options = {}) {
     super(options);
     this.actor = actor;
-    this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
   }
 
   getData(options) {
     this.appData = super.getData(options)
     const calendrier = game.system.rdd.calendrier;
-    mergeObject(this.appData, {
+    foundry.utils.mergeObject(this.appData, {
       isGM: game.user.isGM,
       isActor: this.actor != undefined,
       calendrier: calendrier.getTimestamp().toCalendrier(),
@@ -50,7 +49,7 @@ export class AppAstrologie extends Application {
         signeNaissance: RdDTimestamp.definition(0)
       }
     })
-    return this.appData;
+    return this.appData
   }
 
   getActorAstrologie() {
@@ -85,9 +84,10 @@ export class AppAstrologie extends Application {
       const nbAstral = calendrier.getNombreAstral()
       const heures = RdDTimestamp.heures();
       return {
-        ajustementsActors: game.actors.filter(it => it.isPersonnage() && it.hasPlayerOwner)
+        ajustementsActors: game.actors.filter(actor => actor.isPersonnageJoueur())
           .map(actor => this.getAjustementActor(actor, nbAstral, heures)),
-        nombresAstraux: calendrier.getNombresAstraux().map(na => this.getDetailNombreAstral(na))
+        nombresAstraux: game.system.rdd.calendrier.getNombresAstraux()
+          .map(na => this.getDetailNombreAstral(na))
       }
     }
     return {}
@@ -104,22 +104,25 @@ export class AppAstrologie extends Application {
   }
 
   getDetailNombreAstral(nombreAstral) {
-    const detail = duplicate(nombreAstral);
+    const detail = foundry.utils.duplicate(nombreAstral);
     const timestamp = new RdDTimestamp({ indexDate: nombreAstral.index });
     detail.date = { mois: timestamp.mois, jour: timestamp.jour + 1 };
-    detail.valeursFausses.forEach(fausse => fausse.actorName = game.actors.get(fausse.actorId).name ?? "Inconnu");
+    detail.lectures.forEach(lecture => lecture.actorName = game.actors.get(lecture.actorId).name ?? "Inconnu");
     return detail;
   }
 
   /* -------------------------------------------- */
   activateListeners(html) {
+    if (!this.hookReference){
+      this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
+    }
     super.activateListeners(html);
     this.html = html;
     this.html.find('select[name="signe-astral"]').change(event => {
-      this.selectNombreAstral(this.html.find('select[name="signe-astral"]').val());
+      this.selectNombreAstral(event.currentTarget.value);
     })
     this.html.find('select[name="signe-naissance"]').change(event => {
-      this.selectHeureNaissance(this.html.find('select[name="signe-naissance"]').val());
+      this.selectHeureNaissance(event.currentTarget.value);
     })
     this.html.find('td.nombre-astral').click(event => {
       this.selectNombreAstral(Number.parseInt(event.currentTarget.attributes['data-nombre-astral'].value) - 1);
@@ -145,8 +148,7 @@ export class AppAstrologie extends Application {
 
   /* -------------------------------------------- */
   async onRebuild() {
-    game.system.rdd.calendrier.resetNombresAstraux();
+    await game.system.rdd.calendrier.resetNombresAstraux();
-
     await game.system.rdd.calendrier.rebuildNombresAstraux();
   }
 
@@ -195,6 +197,8 @@ export class AppAstrologie extends Application {
   }
 
   refreshAstrologie() {
+    this.count = (this.count ?? 0)+1
+    console.log(`Refreshing ${this.count}`);
     this.render(true)
   }
 

module/sommeil/dialog-chateau-dormant.js

@@ -3,10 +3,8 @@ export class DialogChateauDormant extends Dialog {
 
   static async create() {
     const date = game.system.rdd.calendrier.dateCourante();
-    const actors = game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage());
-
     const dialogData = {
-      actors: actors,
+      actors: game.actors.filter(actor => actor.isPersonnageJoueur()),
       date: date,
       motifStress: `Nuit du ${date}`,
       finChateauDormant: game.system.rdd.calendrier.getTimestampFinChateauDormant()

module/sommeil/dialog-repos.js

@@ -21,7 +21,7 @@ export class DialogRepos extends Dialog {
   }
 
   constructor(html, actor) {
-    let options = { classes: ["DialogCreateSigneDraconiqueActorsActors"], width: 400, height: 'fit-content', 'z-index': 99999 };
+    let options = { classes: ["dialog-repos"], width: 400, height: 'fit-content', 'z-index': 99999 };
     let conf = {
       title: "Se reposer",
       content: html,

module/sommeil/dialog-stress.js

@@ -6,7 +6,7 @@ export class DialogStress extends Dialog {
       motif: "Motif",
       stress: 10,
       immediat: false,
-      actors: game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage())
+      actors: game.actors.filter(actor => actor.isPersonnageJoueur())
         .map(actor => ({
             id: actor.id,
             name: actor.name,