Fix odorat-gout

Reviewed-on: #569

.gitignore

@@ -1,14 +1,5 @@
 .vscode/settings.json
 .idea
-.history
+todo.txt
 todo.md
 /.vscode
-/ignored/
-/node_modules/
-/jsconfig.json
-/package.json
-/package-lock.json
-/packs/*/
-/packs/*/CURRENT
-/packs/*/LOG
-/packs/*/LOCK

changelog.md

@@ -1,395 +1,10 @@
-# 12.0
-## 12.0.15 - Le messager d'Astrobazzarh
-- Correction des faces de dés personalisés dice-so-nice
-- Les messages de maladies ne sont plus publics
-- Les messages privés dans les TMR sont aussi envoyés au GM
-- Les informations de compétences pouvant augmenter s'affichent comme tooltips
-- Amélioration du rendu des tables de compendiums (commande /table)
+==================================================================
+v0.9.2 - 05/09/2020
 
-## 12.0.14 - Les légions d'Astrobazzarh
-- Feuille de PNJ:
-  - boutons standard (encaissement, ...)
-  - boutons pour ajuster les compteurs
-  - visualisation des blessures
-  - click sur blessure pour ajouter/enlever
-  - gestion des armes
+Erreur de calcul sur points de vie
+Gestion différente des compétences "troncs"
 
-## 12.0.13 - La Chance d'Astrobazzarh
-- Fix: jets de caractéristiques
-
-## 12.0.12 - L'étalage d'Astrobazzarh
-- Fix: On peut de nouveau vendre des items sans propriétaire, depuis les compendiums ou depuis l'onglet des Objets
-- Début de Feuille PNJ au format des encarts Scriptarium
-  - support des jets de caractéristiques
-  - support des jets de compétences
-
-## 12.0.11 - Le scriptorium d'Astrobazzarh
-- ajout d'un bouton pour générer les éléments de description d'un personnage
-- ajout du logo en background dans la liste des systèmes Foundry
-- ajout d'un champ pour le métier
-- export scriptarium
-  - encodage de l'export en windows-1252
-  - export de l'esquive avec armure et sans armure
-
-## 12.0.10 - Le scriptorium d'Astrobazzarh
-- corrections de l'export scriptarium
-
-## 12.0.9 - Le scriptorium d'Astrobazzarh
-- ajout d'une fonction avancée pour exporter les personnages dans un format csv
-
-## 12.0.8 - La quincaillerie d'Astrobazzarh
-- le propriétaire est indiqué dans les feuilles d'équipements/compétences/...
-- Ecaille d'efficacité
-  - l'écaille d'efficacité est prise en compte même si on n'utilise pas le ciblage en combat
-  - l'écaille d'efficacité est prise en compte pour l'initiative
-- Corrections
-  - l'état général est pris en compte pour les initiatives
-  - le tooltip de l'initiative affiche correctement l'initiative
-
-## 12.0.7 - La propriété d'Astrobazzarh
-- correction des opérations faites à la création d'un Item:
-  - la durée des queues/rencontres/souffles
-  - les effets draconiques d'un souffle/queue
-  - mise à jour des points de tâche des blessures lors des soins
-- pas d'expérience sur les particulières quand aucun MJ n'est connecté
-- Le drag&drop d'un acteur depuis la liste des acteurs sur la fiche
-  d'une entité incarnée permet d'accorder le personnage
-- Les messages pour résister aux possessions/conjuration sont envoyées
-  au défenseur
-- Les messages pour résister aux empoignades sont envoyées au défenseur
-- la commande /voyage affiche maintenant le total de fatigue pour chaque voyageur
-- la commande /voyage affiche maintenant les compétences liées au terrain
-
-## 12.0.6 - Le bazar d'Astrobazzarh
-- Corrections de l'inventaire en bazar:
-  - un problème pouvait survenir en déplaçant les objets 
-    l'inventaire, qui fait qu'un conteneur se retrouve récursivement dans son
-    propre contenu, ce qui empêche d'ouvrir la feuille d'acteur.
-  - un objet non-conteneur pouvait dans certains cas avoir un pseudo contenu
-  - un objet pouvait être considéré comme contenu, sans être présent dans un
-    conteneur (et donc non affiché)
-  - vider les conteneurs supprime correctement toutes les informations liées
-    aux conteneurs/contenus
-- Les messages pour les tirages dans le compendium utilisent le "roll mode" 
-  courant pour leur visibilité
-- Fix: restaurer la compatibilité Foundry 11
-
-## 12.0.5 - Les mauvais jours d'Astrobazzarh
-- Fix: on peut de nouveau ouvrir l'édition de calendrier
-- Fix: on ne peut plus ouvrir plusieurs fenêtres de lancer de sort
-- Fix: Failed to execute 'getComputedStyle' on 'Window'
-
-## 12.0.4 - La plaie d'Astrobazzarh
-- **Support V12**
-  - Fix: les boutons d'encaissement dans le tchat fonctionnent de nouveau
-  - Fix warnings sur "Die" et AudioHelper
-
-## 12.0.3 - L'hémorragie d'Astrobazzarh
-- **Support V12**
-  - On peut de nouveau ouvrir un acteur blessé après redémarrage du monde
-  - On peut de nouveau ouvrir les Items avec une rareté par environnement
-  - Le choix de ne plus afficher les demandes de suppression est bien pris en compte
-
-## 12.0.2 - Les pluies d'Astrobazzarh
-- **Support V12**
-  - correction des actions techniques déleguées au MJ qui bloquaient les fenêtre de lancer de dés des joueurs (et plein d'autres)
-  - la fenêtre de calendrier s'ouvre correctement
-  - 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
-  - lorsqu'une fenêtre liée aux demi-rêve est affichée, cliquer sur les TMRs n'a pas d'effet
-  - les lancers de sorts et lectures de signes sont affichées en premier plan
-  - Les effets qui ouvrent une fenêtre sont bien affichés en premier plan
-  - en cas de rencontre suivie de maîtrises/conquêtes, les fenêtres s'enchaînent
-- Le drag&drop vers la barre de macro est corrigé
-  - pour les créatures, possibilités d'avoir les attaques ou autres compétences
-  - pour les personnages, les macros sont créées:
-    - pour les compétences
-    - pour le corps à corps, trois macros sont créées: compétence, pugilat, empoignade
-    - pour les armes
-      - deux macros sont créées pour les armes à 1/2 mains
-      - deux macros sont créées pour les armes de mélée et lancer
-      - 4 macros si votre arbalête se lance, tire, et se manie à 1 ou 2 mains...
-- les jets de compétences d'attaque des créatures fonctionnent de nouveau
-
-## v11.0.25 - la vision du rêve de Khrachtchoum
-- Les TMRs restent affichées tant que le Haut-rêvant est en demi-rêve
-
-## v11.0.24 - les couleurs de Khrachtchoum
-- nouvelle carte des TMRs
-
-## v11.0.23 - la lumière de Khrachtchoum
-- ajustement automatique de la luminosité selon l'heure pour les scènes:
-   - avec une vision des tokens (sinon: ce n'est pas une scène de carte pour tokens)
-   - avec illumination globale (correspondant à une illumination extérieure)
-   - quand lampe "allumée" dans la fenêtre du calendrier
-
-## v11.0.22 - les automatismes de Khrachtchoum le Problémeux
-- Macro pour attaquer avec les compétences de créatures
-
-## v11.0.20
-- Macro pour attaquer avec les armes des personnages
-
-## v11.0.17
-- Fix: les actions de commerce ne s'appliquait pas bien aux personnages des tokens non liés
-
-## v11.0.15 - L'apprentissage de Khrachtchoum
-- Fix: l'expérience ne s'appliquait plus sur certaines réussites particulières (régression depuis la 11.0.7)
-
-## v11.0.14 - Les pincettes de Khrachtchoum le Problémeux
-- Correction du calcul de la place restante lors de l'ajout dans un conteneur
-
-## v11.0.13 - La multiplication de l'eau de Khrachtchoum le Problémeux
-- Correction de la vente depuis un commerce ayant des quantités illimitées
-
-## v11.0.12 - Les poids de la mesure de Khrachtchoum le Problémeux
-- Correction des malus de surencombrement
-- Le malus armure est correctement affiché dans l'onglet des caractéristiques
-- Correction d'orthographe et amélioration des messages des oeuvres d'art
-
-## v11.0.11 - Les bleus de Khrachtchoum le Problémeux
-- si le gardien configure le sommeil, les joueurs sont notifiés que chateau dormant vient de passer
-- possibilité de créer des armes et des compétences de créatures non-mortelles.
-
-## v11.0.10 - Les Songes de Khrachtchoum le Problémeux
-- on peut de nouveau se déplacer dans les TMRs d'un clic sur la case à atteindre
-- Lire un livre depuis l'inventaire permet de nouveau de faire un jet de la tâche
-  créée au lieu de créer toujours une nouvelle tâche
-- La sélection des TMR pour la création de signes draconiques ne cause plus d'erreurs
-- la récupération d'endurance en cas d'insomnie est limitée à la moitié
-- le résultat du sommeil lors d'un rêve de dragon à la première heure s'affiche normalement
-- lorsque le gardien gère la durée des nuits, en cas de rêve de dragon,
-  les heures dormies sont déduites des heures restant à dormir
-
-## v11.0.9 - Les Souvenirs de Khrachtchoum le Problémeux
-- mode de saisie de l'archétype en vue détaillée
-- création  une nouvelle incarnation depuis l'archétype
-- réorganisation de la fenêtre de sélection des règles optionnelles
-- correction de l'affichage du type dans les fenêtres d'objets
-
-## v11.0.8 - la poigne de Sémolosse
-- lien vers le changelog
-- organisation des compendiums du système
-- correction de l'empoignade
-  - les items d'empoignade sont ajoutés par le MJ quand nécessaire
-  - seul le joueur propriétaire du personnage peut effectuer ses choix et actions d'empoignade
-  - les caractéristiques du défenseur sont utilisées pour la défense
-  - la difficulté d'attaque est imposée au défenseur
-  - les attaques particulières sont en finesse (p133)
-  - on peut entraîner au sol dès 2 points d'empoignade
-  - les actions liée à l'immobilisation sont proposées en fin de round
-
-# v11.0.7
-
-- les créatures ont maintenant le droit d'avoir des compétences de tir, lancer, mêlée, armes naturelles, parade.
-- les créatures armées utilisent la bonne phase d'initiative
-- correction des possessions
-  - la difficulté de la défense est imposée par l'attaque
-  - une attaque particulière de possession est en finesse
-  - le rêve actuel des personnages est bien utilisé
-- correction des achats par le MJ sans acteur sélectionné
-
-Cf branche v10 pour l'historique des versions 10
+==================================================================
+v0.9.1 - 03/09/2020
 
+Initial official release

foundryvtt-reve-de-dragon

@@ -0,0 +1 @@
+foundryvtt-reve-de-dragon

icons/heures/.directory

@@ -1,4 +0,0 @@
-[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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1,124 +0,0 @@
-<?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

@@ -1,55 +0,0 @@
-<?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

@@ -1,190 +0,0 @@
-<?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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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

@@ -1,102 +0,0 @@
-<?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

@@ -1,132 +0,0 @@
-<?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

@@ -1,126 +0,0 @@
-<?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

@@ -1 +0,0 @@
-<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,57 +1,47 @@
 {
-  "TYPES": {
-    "Actor": { 
-      "personnage": "Personnage",
-      "creature": "Créature",
-      "entite": "Entité de cauchemar",
-      "commerce": "Commerce",
-      "vehicule": "Véhicule"
-    },
-    "Item": {
-      "arme": "Arme",
-      "armure": "Armure",
-      "blessure": "Blessure",
-      "casetmr": "Case TMR spéciale",
-      "chant": "Chant",
-      "competence": "Compétence",
-      "competencecreature": "Compétence de créature",
-      "conteneur": "Conteneur",
-      "danse": "Danse",
-      "empoignade": "Empoignade",
-      "extraitpoetique": "Extrait poetique",
-      "faune": "Faune",
-      "gemme": "Gemme",
-      "herbe": "Herbe",
-      "ingredient": "Ingrédient",
-      "jeu": "Jeu",
-      "livre": "Livre",
-      "maladie": "Maladie",
-      "meditation": "Méditation",
-      "monnaie": "Monnaie",
-      "munition": "Munition",
-      "musique": "Musique",
-      "nombreastral": "Nombre astral",
-      "nourritureboisson": "Nourriture & boisson",
-      "objet": "Objet",
-      "oeuvre": "Oeuvre",
-      "ombre": "Ombre de Thanatos",
-      "plante": "Plante",
-      "poison": "Poison",
-      "possession": "Possession",
-      "potion": "Potion",
-      "queue": "Queue de Dragon",
-      "recettealchimique": "Recette alchimique",
-      "recettecuisine": "Recette de cuisine",
-      "rencontre": "Rencontre TMR",
-      "service": "Service",
-      "signedraconique": "Signe draconique",
-      "sort": "Sort",
-      "sortreserve": "Sort en réserve",
-      "souffle": "Souffle de Dragon",
-      "tache": "Tâche",
-      "tarot": "Carte de tarot",
-      "tete": "Tête de Dragon"
-    }
+  "ACTOR": {
+    "TypePersonnage": "Personnage",
+    "TypeCreature": "Créature",
+    "TypeEntite": "Entité de cauchemar",
+    "TypeVehicule": "Véhicule"
+  },
+  "ITEM": {
+    "TypeObjet": "Objet",
+    "TypeGemme": "Gemme",
+    "TypeCompetence": "Compétence",
+    "TypeCompetencecreature": "Compétence de créature",
+    "TypeMaladie": "Maladie",
+    "TypePoison": "Poison",
+    "TypeNombreastral": "Nombre astral",
+    "TypeTarot": "Carte de tarot",
+    "TypeCasetmr": "TMR spéciale",
+    "TypeRencontrestmr": "Rencontre TMR",
+    "TypeMunition": "Munition",
+    "TypeMonnaie": "Monnaie",
+    "TypeHerbe": "Herbe ou plante",
+    "TypeIngredient": "Ingrédient",
+    "TypeLivre": "Livre",
+    "TypePotion": "Potion",
+    "TypeArme": "Arme",
+    "TypeArmure": "Armure",
+    "TypeConteneur": "Conteneur",
+    "TypeNourritureboisson": "Nourriture & boisson",
+    "TypeChant": "Chant",
+    "TypeDanse": "Danse",
+    "TypeMusique": "Musique",
+    "TypeOeuvre": "Oeuvre",
+    "TypeTache": "Tâche",
+    "TypeJeu": "Jeu",
+    "TypeRecettealchimique": "Recette alchimique",
+    "TypeRecettecuisine": "Recette de cuisine",
+    "TypeSort": "Sort",
+    "TypeMeditation": "Méditation",
+    "TypeSignedraconique": "Signe draconique",
+    "TypeQueue": "Queue de Dragon",
+    "TypeOmbre": "Ombre de Thanatos",
+    "TypeSouffle": "Souffle de Dragon",
+    "TypeTete": "Tête de Dragon",
+    "TypePossession": "Possession"
   },
   "EFFECT": {
     "StatusStunned": "Sonné",

module/achat-vente/chat-vente.js

@@ -1,65 +0,0 @@
-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,119 +0,0 @@
-import { Misc } from "../misc.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { ChatVente } from "./chat-vente.js";
-
-export class DialogItemAchat extends Dialog {
-
-  static preparerAchat(chatButton) {
-    return ChatVente.getDetailAchatVente(RdDUtility.findChatMessageId(chatButton))
-  }
-
-  static async onAcheter({ item, vendeur, acheteur, tailleLot, prixLot, nbLots, quantiteIllimite, chatMessageIdVente }) {
-    const venteData = {
-      item,
-      actingUserId: game.user.id,
-      vendeur,
-      acheteur,
-      tailleLot,
-      quantiteIllimite,
-      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)
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData)
-    new DialogItemAchat(html, venteData).render(true)
-  }
-
-  static changeNombreLots(venteData, nombreLots) {
-    venteData.choix.nombreLots = nombreLots;
-    venteData.prixTotal = (nombreLots * venteData.prixLot).toFixed(2);
-    if (venteData.isConsommable) {
-      const doses = nombreLots * venteData.tailleLot;
-      venteData.totalSust = Misc.keepDecimals(doses * (venteData.item.system.sust ?? 0), 2);
-      venteData.totalDesaltere = venteData.item.system.boisson
-        ? Misc.keepDecimals(doses * (venteData.item.system.desaltere ?? 0), 2)
-        : 0;
-    }
-  }
-
-  constructor(html, venteData) {
-    let options = { classes: ["dialogachat"], width: 400, height: 'fit-content', 'z-index': 99999 };
-
-    const actionAchat = venteData.prixLot > 0 ? "Acheter" : "Prendre";
-    const buttons = {};
-    if (venteData.isConsommable) {
-      buttons["consommer"] = { label: venteData.item.system.boisson ? "Boire" : "Manger", callback: it => this.onAchatConsommer() }
-    }
-    buttons[actionAchat] = { label: actionAchat, callback: it => { this.onAchat(); } };
-    buttons["decliner"] = { label: "Décliner", callback: it => { } };
-    const acheteur = venteData.acheteur?.name ?? 'Un acheteur';
-    const vendeur = venteData.vendeur?.name ?? 'Un vendeur';
-    let conf = {
-      title: `${acheteur} - ${actionAchat} à ${vendeur}`,
-      content: html,
-      default: actionAchat,
-      buttons: buttons
-    };
-
-    super(conf, options);
-    this.venteData = venteData;
-  }
-
-  async onAchat() {
-    await this.html.find(".nombreLots").change();
-    (this.venteData.vendeur ?? this.venteData.acheteur).achatVente({
-      userId: game.user.id,
-      vendeurId: this.venteData.vendeur?.id,
-      acheteurId: this.venteData.acheteur?.id,
-      prixTotal: this.venteData.prixTotal,
-      chatMessageIdVente: this.venteData.chatMessageIdVente,
-      choix: this.venteData.choix,
-      vente: this.venteData
-    });
-  }
-
-  async onAchatConsommer() {
-    this.venteData.choix.consommer = true;
-    await this.onAchat();
-  }
-
-  /* -------------------------------------------- */
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-    this.html.find(".nombreLots").change(event => this.setNombreLots(Number(event.currentTarget.value)));
-    this.html.find(".se-forcer").change(event => this.setSeForcer(event));
-  }
-
-  setSeForcer(event) {
-    this.venteData.choix.seForcer = event.currentTarget.checked;
-  }
-
-  setNombreLots(nbLots) {
-
-    if (!this.venteData.quantiteIllimite) {
-      if (!this.venteData.quantiteIllimite && nbLots > this.venteData.nbLots) {
-        ui.notifications.warn(`Seulement ${this.venteData.nbLots} lots disponibles, vous ne pouvez pas en prendre ${nbLots}`)
-      }
-      nbLots = Math.min(nbLots, this.venteData.nbLots);
-    }
-
-    DialogItemAchat.changeNombreLots(this.venteData, nbLots);
-
-    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,110 +0,0 @@
-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, quantiteMax = undefined }) {
-    const quantite = quantiteMax ?? item.getQuantite() ?? 1;
-    const venteData = {
-      item: item,
-      alias: item.actor?.name ?? game.user.name,
-      vendeurId: item.actor?.id,
-      prixOrigine: item.calculerPrixCommercant(),
-      prixUnitaire: item.calculerPrixCommercant(),
-      prixLot: item.calculerPrixCommercant(),
-      tailleLot: 1,
-      nbLots: quantite,
-      maxLots: quantite,
-      quantiteMax: quantite,
-      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !item.parent,
-      isOwned:  item.parent,
-    }
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
-    return new DialogItemVente(venteData, html).render(true);
-  }
-
-  constructor(venteData, html) {
-    let options = { classes: ["dialogvente"], width: 400, height: 'fit-content', 'z-index': 99999 };
-
-    let conf = {
-      title: "Proposer",
-      content: html,
-      default: "proposer",
-      buttons: { "proposer": { label: "Proposer", callback: it => { this.onProposer(it); } } }
-    };
-
-    super(conf, options);
-    this.venteData = venteData;
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    this.html = html;
-    this.html.find(".tailleLot").change(event => this.setTailleLot(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)));
-
-    this.setQuantiteIllimite(this.venteData.quantiteIllimite);
-  }
-
-  async onProposer(it) {
-    this.updateVente(this.getChoixVente());
-
-    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) {
-    foundry.utils.mergeObject(this.venteData, update);
-  }
-
-  getChoixVente() {
-    return {
-      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())
-    };
-  }
-
-  /* -------------------------------------------- */
-  setPrixLot(prixLot) {
-    this.venteData.prixLot = prixLot;
-  }
-
-  setTailleLot(tailleLot) {
-    const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
-    this.updateVente({
-      tailleLot,
-      nbLots: Math.min(maxLots, this.venteData.nbLots),
-      maxLots: maxLots,
-      prixLot: (tailleLot * this.venteData.prixOrigine).toFixed(2)
-    });
-
-    this.html.find(".prixLot").val(this.venteData.prixLot);
-    this.html.find(".nbLots").val(this.venteData.nbLots);
-    this.html.find(".nbLots").attr("max", this.venteData.maxLots)
-  }
-
-  setNbLots(nbLots) {
-    this.updateVente({
-      nbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.maxLots)) : nbLots
-    })
-    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(".nbLots"), !this.venteData.quantiteIllimite)
-  }
-}

module/actor-creature-sheet.js

@@ -0,0 +1,79 @@
+
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+
+import { HtmlUtility } from "./html-utility.js";
+import { RdDUtility } from "./rdd-utility.js";
+import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDCarac } from "./rdd-carac.js";
+
+/* -------------------------------------------- */
+export class RdDActorCreatureSheet extends RdDActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }]
+    });
+  }
+
+
+  /* -------------------------------------------- */
+  async getData() {
+    let formData = await super.getData();
+    console.log("Creature : ", formData);
+    formData.calc = {
+      caracTotal: RdDCarac.computeTotal(formData.data.carac),
+      resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
+      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
+      surEncombrementMessage: this.actor.getMessageSurEncombrement()
+    }
+
+    RdDUtility.filterItemsPerTypeForSheet(formData);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
+
+    console.log("Creature : ", this.objetVersConteneur, formData);
+
+    return formData;
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    // On competence change
+    html.find('.creature-carac').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
+    });
+    html.find('.creature-niveau').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
+    });
+    html.find('.creature-dommages').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
+    });
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.object.update(formData);
+  }
+}

module/actor-entite-sheet.js

@@ -0,0 +1,146 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+
+import { HtmlUtility } from "./html-utility.js";
+import { Misc } from "./misc.js";
+import { RdDUtility } from "./rdd-utility.js";
+
+/* -------------------------------------------- */  
+export class RdDActorEntiteSheet extends ActorSheet {
+
+  /** @override */
+	static get defaultOptions() {
+	  return mergeObject(super.defaultOptions, {
+  	  classes: ["rdd", "sheet", "actor"],
+  	  template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac"}],
+      dragDrop: [{dragSelector: ".item-list .item", dropSelector: null}]
+    });
+  }
+
+
+  /* -------------------------------------------- */
+  async getData() {
+    const objectData = Misc.data(this.object);
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      //   actor: this.object,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      //   items: items,
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+    };
+    
+    formData.options.isGM = game.user.isGM;
+    RdDUtility.filterItemsPerTypeForSheet(formData);
+
+
+    return formData;
+  }
+  
+  /* -------------------------------------------- */
+  /** @override */
+	activateListeners(html) {
+    super.activateListeners(html);
+
+    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    // Update Inventory Item
+    html.find('.item-edit').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      const item = this.actor.getEmbeddedDocument('Item', li.data("itemId"));
+      item.sheet.render(true);
+    });
+
+    // Delete Inventory Item
+    html.find('.item-delete').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.deleteEmbeddedDocuments('Item', [li.data("itemId")]);
+      li.slideUp(200, () => this.render(false));
+    });
+
+    // Roll Carac
+    html.find('.carac-label a').click(async event => {
+      let caracName = event.currentTarget.attributes.name.value;
+      this.actor.rollCarac( caracName.toLowerCase() );
+    });
+    
+    // On competence change
+    html.find('.creature-carac').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCreatureCompetence( compName, "carac_value", parseInt(event.target.value) );
+      } );    
+    html.find('.creature-niveau').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCreatureCompetence( compName, "niveau", parseInt(event.target.value) );
+      } );    
+      html.find('.creature-dommages').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCreatureCompetence( compName, "dommages", parseInt(event.target.value) );
+      } );    
+  
+    // Roll Skill
+    html.find('.competence-label a').click(async event => {
+      let compName = event.currentTarget.text;
+      this.actor.rollCompetence( compName );
+    });
+
+    html.find('.endurance-plus').click(event => {
+      this.actor.santeIncDec("endurance", 1);
+      this.render(true);
+    });
+    html.find('.endurance-moins').click(event => {
+      this.actor.santeIncDec("endurance", -1);
+      this.render(true);
+    });
+
+    html.find('.encaisser-direct').click(event => {
+      this.actor.encaisser();
+    });
+
+    html.find('.remise-a-neuf').click(event => {
+      if (game.user.isGM) {
+        this.actor.remiseANeuf();
+      }
+    });
+  }
+  
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetTabs = this.element.find(".sheet-tabs");
+    const sheetBody = this.element.find(".sheet-body");
+    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
+    sheetBody.css("height", bodyHeight);
+    return position;
+  }
+
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.object.update(formData);
+  }
+}

module/actor-sheet.js

@@ -1,3 +1,8 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+
 import { RdDUtility } from "./rdd-utility.js";
 import { HtmlUtility } from "./html-utility.js";
 import { RdDItemArme } from "./item-arme.js";
@@ -7,351 +12,545 @@ import { Misc } from "./misc.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 import { RdDCarac } from "./rdd-carac.js";
 import { DialogSplitItem } from "./dialog-split-item.js";
-import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
+import { ReglesOptionelles } from "./regles-optionelles.js";
+import { DialogRepos } from "./dialog-repos.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
-import { STATUSES } from "./settings/status-effects.js";
-import { MAINS_DIRECTRICES } from "./actor.js";
-import { RdDBaseActorReveSheet } from "./actor/base-actor-reve-sheet.js";
-import { 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";
-import { AppPersonnageAleatoire } from "./actor/random/app-personnage-aleatoire.js";
 
 /* -------------------------------------------- */
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-export class RdDActorSheet extends RdDBaseActorSangSheet {
+export class RdDActorSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+    RdDUtility.initAfficheContenu();
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
-      width: 550,
+      width: 640,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
+      editCaracComp: false,
       showCompNiveauBase: false,
-      vueArchetype: false,
-    }, { inplace: false });
+      vueDetaillee: false
+    });
   }
 
   /* -------------------------------------------- */
   async getData() {
-    let formData = await super.getData();
-    foundry.utils.mergeObject(formData, {
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      limited: this.actor.limited,
-      owner: this.actor.isOwner,
-      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, {
-      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.isSurenc() ? "Sur-Encombrement!" : "",
-      malusArmure: this.actor.getMalusArmure()
-    })
-
+    const objectData = Misc.data(this.object);
     this.timerRecherche = undefined;
 
-    if (formData.type == 'personnage') {
-      formData.options.mainsDirectrices = MAINS_DIRECTRICES;
-      formData.byCateg = Misc.classify(formData.competences, it => it.system.categorie)
-      formData.calc.comptageArchetype = RdDItemCompetence.computeResumeArchetype(formData.competences);
-      formData.calc.competenceXPTotal = RdDItemCompetence.computeTotalXP(formData.competences);
-      formData.calc.fatigue = RdDUtility.calculFatigueHtml(formData.system.sante.fatigue.value, formData.system.sante.endurance.max);
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+    };
 
-      formData.competences.forEach(item => {
-        item.system.isHidden = this.options.recherche
-          ? !item.isNomLike(this.options.recherche.text)
-          : (this.options.showCompNiveauBase && RdDItemCompetence.isNiveauBase(item));
-        RdDItemCompetence.levelUp(item, formData.system.compteurs.experience.value);
-      });
+    RdDUtility.filterItemsPerTypeForSheet(formData);
 
-      Object.values(formData.system.carac).forEach(c => {
-        RdDCarac.levelUp(c);
-      });
+    formData.options.isGM = game.user.isGM;
 
-      // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
-      const actor = this.actor;
-      formData.combat = foundry.utils.duplicate(formData.armes);
-      RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
-      formData.combat.push(RdDItemArme.mainsNues(actor));
-      formData.combat.push(RdDItemArme.empoignade(actor));
+    if (formData.type == 'creature') return formData; // Shortcut
 
-      formData.esquives = this.actor.getCompetences("Esquive");
-      formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
-      formData.empoignades = this.actor.getEmpoignades();
+    formData.competenceByCategory = Misc.classify(formData.competences, it => it.data.categorie);
 
-      this.armesList = formData.combat;
+    formData.calc = {
+      comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
+      competenceXPTotal: RdDItemCompetence.computeTotalXP(formData.competences),
+      caracTotal: RdDCarac.computeTotal(formData.data.carac, formData.data.beaute),
+      // Mise à jour de l'encombrement total et du prix de l'équipement
+      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
+      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
+      surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
+      fatigue: RdDUtility.calculFatigueHtml(formData.data.sante.fatigue.value, formData.data.sante.endurance.max),
+      resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
+      surEncombrementMessage: this.actor.getMessageSurEncombrement()
+    };
 
-      // Common data
-      formData.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
-      formData.difficultesLibres = CONFIG.RDD.difficultesLibres;
+    formData.competences.forEach(item => {
+      item.visible = this.options.recherche
+        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
+        : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
+      RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value);
+    });
 
-      formData.hautreve = {
-        isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
-        cacheTMR: this.actor.isTMRCache()
-      }
+    Object.values(formData.data.carac).forEach(c => {
+      RdDCarac.levelUp(c);
+    });
 
-      formData.subacteurs = {
-        vehicules: this.actor.listeVehicules(),
-        montures: this.actor.listeMontures(),
-        suivants: this.actor.listeSuivants()
-      }
-      if (this.actor.getBestDraconic().system.niveau > -11 && !this.actor.isHautRevant()) {
-        ui.notifications.error(`${this.actor.name} a des compétences draconiques, mais pas le don de Haut-Rêve!
-          <br>Ajoutez-lui la tête "Don de Haut-Rêve" pour lui permettre d'utiliser ses compétences et d'accéder aux terres médianes du rêve`);
-      }
+
+    // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
+    formData.combat = duplicate(formData.armes ?? []);
+    RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
+    RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.data.carac);
+    formData.esquives = this.actor.getCompetences("Esquive").map(i => foundry.utils.deepClone(i.data));
+    formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.data.carac);
+
+    this.armesList = formData.combat;
+
+    // Common data
+    formData.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
+    formData.difficultesLibres = CONFIG.RDD.difficultesLibres;
+
+    formData.hautreve = {
+      isDemiReve: this.actor.getEffectByLabel("Demi-rêve"),
+      sortsReserve: formData.data.reve.reserve.list,
+      rencontres: duplicate(formData.data.reve.rencontre.list),
+      casesTmr: formData.itemsByType.casetmr,
+      cacheTMR: this.actor.isTMRCache()
+    }
+
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
+
+    formData.subacteurs = {
+      vehicules: this.actor.listeVehicules(),
+      montures: this.actor.listeMontures(),
+      suivants: this.actor.listeSuivants()
+    }
+    if (this.actor.getBestDraconic().data.niveau > -11 && !this.actor.isHautRevant()) {
+      ui.notifications.error(`${this.actor.name} a des compétences draconiques, mais pas le don de Haut-Rêve!
+        <br>Ajoutez-lui la tête "Don de Haut-Rêve" pour lui permettre d'utiliser ses compétences et d'accéder aux terres médianes du rêve`);
     }
     return formData;
   }
 
-  /* -------------------------------------------- */
-  /** @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('.button-tmr-visu').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('.sheet-possession-attack').click(async event => {
-      const poss = RdDSheetUtility.getItem(event, this.actor)
-      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 subActorId = li.data("subactor-id");
-      this.deleteSubActeur(subActorId, li);
-    })
-    this.html.find("input.derivee-value[name='system.compteurs.stress.value']").change(async event => {
-      this.actor.updateCompteurValue("stress", parseInt(event.target.value));
-    });
-    this.html.find("input.derivee-value[name='system.compteurs.experience.value']").change(async event => {
-      this.actor.updateCompteurValue("experience", parseInt(event.target.value));
-    });
-
-    this.html.find('.creer-tache').click(async event => this.createEmptyTache());
-    this.html.find('.creer-une-oeuvre').click(async event => this.selectTypeOeuvreToCreate());
-    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('.blessure-premierssoins-done').change(async event => {
-      const blessure = this.getBlessure(event);
-      await blessure?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
-    });
-    this.html.find('.blessure-soinscomplets-done').change(async event => {
-      const blessure = this.getBlessure(event);
-      await blessure?.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
-    });
-    this.html.find('.blessure-premierssoins-bonus').change(async event => {
-      const blessure = this.getBlessure(event);
-      await blessure?.setSoinsBlessure({ premierssoins: { bonus: Number(event.currentTarget.value) } })
-    });
-    this.html.find('.blessure-soinscomplets-bonus').change(async event => {
-      const blessure = this.getBlessure(event);
-      await blessure?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
-    });
-
-    // Equip Inventory Item
-    this.html.find('.item-equip').click(async event => this.actor.equiperObjet(RdDSheetUtility.getItemId(event)))
-    this.html.find('.chance-actuelle').click(async event => this.actor.rollCarac('chance-actuelle'))
-
-    this.html.find('.button-appel-chance').click(async event => this.actor.rollAppelChance())
-
-    this.html.find('[name="jet-astrologie"]').click(async event => this.actor.astrologieNombresAstraux())
-    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('.chant-label a').click(async event => 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('.description-aleatoire').click(async event => new AppPersonnageAleatoire(this.actor).render(true))
-    if (game.user.isGM) {
-      // experience log
-      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);
-      });
-      // 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('.roll-reve-actuel').click(async event => 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('.roll-arme').click(async event => this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event))))
-
-    // 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);
-      if (combatant) {
-        let action = this._getEventArmeCombat(event);
-        RdDCombatManager.rollInitiativeAction(combatant._id, action);
-      } else {
-        ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
-      }
-    });
-    // Display TMR
-
-    this.html.find('.button-tmr').click(async event => this.actor.displayTMR("normal"))
-    this.html.find('.button-tmr-rapide').click(async event => this.actor.displayTMR("rapide"))
-
-    this.html.find('.button-repos').click(async event => await this.actor.repos())
-
-    this.html.find('.carac-xp-augmenter').click(async event => this.actor.updateCaracXPAuto(event.currentTarget.name.replace("augmenter.", "")))
-    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('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 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));
-      });
-      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);
-      });
-      // On competence archetype change
-      this.html.find('.competence-archetype').change(async event => {
-        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())
-    }
-
-    // On pts de reve change
-    this.html.find('.pointsreve-value').change(async event => this.actor.update({ "system.reve.reve.value": event.currentTarget.value }))
-    this.html.find('.seuil-reve-value').change(async event => this.actor.setPointsDeSeuil(event.currentTarget.value))
-
-    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('.button-ethylisme').click(async event => this.actor.jetEthylisme())
-
-    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 blessureId = this.html.find(event.currentTarget).parents(".item-blessure").data('item-id');
-    return this.actor.getItem(blessureId, 'blessure');
-  }
-
   isCompetenceAffichable(competence) {
     return !this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(competence);
   }
 
   /* -------------------------------------------- */
   async _onDropActor(event, dragData) {
-    const dropActor = fromUuidSync(dragData.uuid);
-    this.actor.addSubActeur(dropActor);
+    console.log("_onDropActor", this.actor.id, dragData);
+    this.actor.addSubActeur(dragData.id || dragData.data._id);
     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 _onDropItem(event, dragData) {
+    const destItemId = $(event.target)?.closest('.item').attr('data-item-id');
+    const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur);
+    const callSuper = await this.actor.processDropItem(dropParams);
+    if (callSuper) {
+      await super._onDropItem(event, dragData)
     }
   }
 
   /* -------------------------------------------- */
-  async selectTypeOeuvreToCreate() {
-    let types = RdDItem.getTypesOeuvres();
-    let content = `<span class="competence-label">Selectionnez le type d'oeuvre</span><select class="item-type">`;
-    for (let typeName of types) {
-      content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
-    }
-    content += '</select>';
-    let dialog = new Dialog({
-      title: "Créer une oeuvre",
-      content: content,
-      buttons: {
-        create: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Créer l'oeuvre",
-          callback: () => this.actor.createItem($(".item-type").val())
-        }
-      }
-    });
-    dialog.render(true);
+  async createItem(name, type) {
+    await this.actor.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
   }
 
   /* -------------------------------------------- */
   async createEmptyTache() {
-    await this.actor.createItem('tache', 'Nouvelle tache');
+    await this.createItem('Nouvelle tache', 'tache');
+  }
+
+  /* -------------------------------------------- */  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
+    HtmlUtility._showControlWhen($(".appliquerFatigue"), ReglesOptionelles.isUsing("appliquer-fatigue"));
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    html.find('.item-split').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      RdDSheetUtility.splitItem(item, this.actor);
+    });
+    html.find('.item-edit').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor)
+      console.log("ITEM :", item)
+      item.sheet.render(true)
+    })
+    html.find('.display-label a').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item.sheet.render(true);
+    });
+    html.find('.rencontre-delete').click(async event => {
+      this.actor.deleteTMRRencontre(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.item-delete').click(async event => {
+      const li = RdDSheetUtility.getEventElement(event);
+      RdDUtility.confirmerSuppression(this, li);
+    });
+    html.find('.item-vendre').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.proposerVente();
+    });
+    html.find('.item-montrer').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.postItem();
+    });
+
+    html.find('.item-action').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor)
+      this.actor.actionItem(item);
+    });
+    html.find('.subacteur-delete').click(async event => {
+      const li = RdDSheetUtility.getEventElement(event);
+      RdDUtility.confirmerSuppressionSubacteur(this, li);
+    });
+
+    html.find('.encaisser-direct').click(async event => {
+      this.actor.encaisser();
+    })
+    html.find('.sheet-possession-attack').click(async event => {
+      const poss = RdDSheetUtility.getItem(event, this.actor)
+      this.actor.conjurerPossession(poss)
+    })
+    html.find('.remise-a-neuf').click(async event => {
+      if (game.user.isGM) {
+        this.actor.remiseANeuf();
+      }
+    });
+    html.find('.creer-tache').click(async event => {
+      this.createEmptyTache();
+    });
+    html.find('.creer-un-objet').click(async event => {
+      RdDUtility.selectObjetType(this);
+    });
+    html.find('.creer-une-oeuvre').click(async event => {
+      RdDUtility.selectTypeOeuvre(this);
+    });
+    html.find('#nettoyer-conteneurs').click(async event => {
+      this.actor.nettoyerConteneurs();
+    });
+
+    // Blessure control
+    html.find('.blessure-control').click(async event => {
+      const tr = $(event.currentTarget).parents(".item");
+      let btype = tr.data("blessure-type");
+      let index = tr.data('blessure-index');
+      let active = $(event.currentTarget).data('blessure-active');
+      //console.log(btype, index, active);
+      await this.actor.manageBlessureFromSheet(btype, index, active);
+    });
+
+    // Blessure data
+    html.find('.blessures-soins').change(async event => {
+      const tr = $(event.currentTarget).parents(".item");
+      let btype = tr.data('blessure-type');
+      let index = tr.data('blessure-index');
+      let psoins = tr.find('.blessure-premiers_soins').val();
+      let pcomplets = tr.find('.blessure-soins_complets').val();
+      let jours = tr.find('.blessure-jours').val();
+      let loc = tr.find('.blessure-localisation').val();
+      let psdone = tr.find('.blessure-psdone:checked').val();
+      let scdone = tr.find('.blessure-scdone:checked').val();
+      console.log(btype, index, psoins, pcomplets, jours, loc, psdone, scdone);
+      await this.actor.setDataBlessureFromSheet(btype, index, psoins, pcomplets, jours, loc, psdone, scdone);
+    });
+
+    // Equip Inventory Item
+    html.find('.item-equip').click(async event => {
+      this.actor.equiperObjet(RdDSheetUtility.getItemId(event));
+    });
+
+    // Roll Carac
+    html.find('.carac-label a').click(async event => {
+      let caracName = event.currentTarget.attributes.name.value;
+      this.actor.rollCarac(caracName.toLowerCase());
+    });
+
+    html.find('.chance-actuelle').click(async event => {
+      this.actor.rollCarac('chance-actuelle');
+    });
+
+    html.find('.chance-appel').click(async event => {
+      this.actor.rollAppelChance();
+    });
+
+    html.find('#jet-astrologie').click(async event => {
+      this.actor.astrologieNombresAstraux();
+    });
+
+    // Roll Skill
+    html.find('a.competence-label').click(async event => {
+      this.actor.rollCompetence(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.tache-label a').click(async event => {
+      this.actor.rollTache(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.meditation-label a').click(async event => {
+      this.actor.rollMeditation(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.chant-label a').click(async event => {
+      this.actor.rollChant(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.danse-label a').click(async event => {
+      this.actor.rollDanse(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.musique-label a').click(async event => {
+      this.actor.rollMusique(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.oeuvre-label a').click(async event => {
+      this.actor.rollOeuvre(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.jeu-label a').click(async event => {
+      this.actor.rollJeu(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.recettecuisine-label a').click(async event => {
+      this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event));
+    });
+    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
+    html.find('.forcer-tmr-aleatoire').click(async event => {
+      this.actor.reinsertionAleatoire("Action MJ");
+    });
+    html.find('.afficher-tmr').click(async event => {
+      this.actor.afficheTMRetMessage();
+    });
+
+    // Points de reve actuel
+    html.find('.ptreve-actuel a').click(async event => {
+      this.actor.rollCarac('reve-actuel');
+    });
+
+    // Roll Weapon1
+    html.find('.arme-label a').click(async event => {
+      let arme = this._getEventArmeCombat(event);
+      this.actor.rollArme(duplicate(arme));
+    });
+    // Initiative pour l'arme
+    html.find('.arme-initiative a').click(async event => {
+      let combatant = game.combat.data.combatants.find(c => c.actor.data._id == this.actor.data._id);
+      if (combatant) {
+        let action = this._getEventArmeCombat(event);
+        RdDCombatManager.rollInitiativeAction(combatant._id, action);
+      } else {
+        ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
+      }
+    });
+    // Display TMR, visualisation
+    html.find('.visu-tmr').click(async event => {
+      this.actor.displayTMR("visu");
+    });
+
+    // Display TMR, normal
+    html.find('.monte-tmr').click(async event => {
+      this.actor.displayTMR("normal");
+    });
+
+    // Display TMR, fast 
+    html.find('.monte-tmr-rapide').click(async event => {
+      this.actor.displayTMR("rapide");
+    });
+
+    html.find('.repos').click(async event => {
+      await DialogRepos.create(this.actor);
+    });
+    html.find('.delete-active-effect').click(async event => {
+      let id = $(event.currentTarget).parents(".active-effect").data('id');
+      this.actor.enleverActiveEffectById(id);
+    });
+    html.find('.enlever-tous-effets').click(async event => {
+      this.actor.enleverTousLesEffets();
+    });
+    html.find('.conteneur-name a').click(async event => {
+      RdDUtility.toggleAfficheContenu(RdDSheetUtility.getItemId(event));
+      this.render(true);
+    });
+    html.find('.carac-xp-augmenter').click(async event => {
+      let caracName = event.currentTarget.name.replace("augmenter.", "");
+      this.actor.updateCaracXPAuto(caracName);
+    });
+    html.find('.competence-xp-augmenter').click(async event => {
+      this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event));
+    });
+    html.find('.competence-stress-augmenter').click(async event => {
+      this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event));
+    });
+
+    if (this.options.editCaracComp) {
+      // On carac change
+      html.find('.carac-value').change(async event => {
+        let caracName = event.currentTarget.name.replace(".value", "").replace("data.carac.", "");
+        //console.log("Value changed :", event, caracName);
+        this.actor.updateCarac(caracName, parseInt(event.target.value));
+      });
+      html.find('.carac-xp').change(async event => {
+        let caracName = event.currentTarget.name.replace(".xp", "").replace("data.carac.", "");
+        //console.log("Value changed :", event, caracName);
+        this.actor.updateCaracXP(caracName, parseInt(event.target.value));
+      });
+      // On competence change
+      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
+      html.find('.competence-xp').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCompetenceXP(compName, parseInt(event.target.value));
+      });
+      // On competence xp change
+      html.find('.competence-xp-sort').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value));
+      });
+      // On competence archetype change
+      html.find('.competence-archetype').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
+      });
+    }
+
+    html.find('.show-hide-competences').click(async event => {
+      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
+      this.render(true);
+    });
+    html.find('.lock-unlock-sheet').click(async event => {
+      this.options.editCaracComp = !this.options.editCaracComp;
+      this.render(true);
+    });
+
+    html.find('.recherche')
+      .each((index, field) => {
+        if (this.options.recherche) {
+          field.focus();
+          field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
+        }
+      })
+      .keyup(async event => {
+        const nouvelleRecherche = this._optionRecherche(event.currentTarget);
+        if (this.options.recherche?.text != nouvelleRecherche?.text){
+          this.options.recherche = nouvelleRecherche;
+          if (this.timerRecherche) {
+            clearTimeout(this.timerRecherche);
+          }
+          this.timerRecherche = setTimeout(() => {
+            this.timerRecherche = undefined;
+            this.render(true);
+          }, 500);
+        }
+      })
+      .change(async event =>
+        this.options.recherche = this._optionRecherche(event.currentTarget)
+      );
+    html.find('.vue-detaillee').click(async event => {
+      this.options.vueDetaillee = !this.options.vueDetaillee;
+      this.render(true);
+    });
+
+    // On pts de reve change
+    html.find('.pointsreve-value').change(async event => {
+      let reveValue = event.currentTarget.value;
+      this.actor.update({ "data.reve.reve.value": reveValue });
+    });
+
+    // On seuil de reve change
+    html.find('.seuil-reve-value').change(async event => {
+      console.log("seuil-reve-value", event.currentTarget)
+      this.actor.setPointsDeSeuil(event.currentTarget.value);
+    });
+
+    html.find('#attribut-protection-edit').change(async event => {
+      this.actor.updateAttributeValue(event.currentTarget.attributes.name.value, parseInt(event.target.value));
+    });
+
+    // On stress change
+    html.find('.compteur-edit').change(async event => {
+      let fieldName = event.currentTarget.attributes.name.value;
+      this.actor.updateCompteurValue(fieldName, parseInt(event.target.value));
+    });
+
+    html.find('#ethylisme').change(async event => {
+      this.actor.setEthylisme(parseInt(event.target.value));
+    });
+    html.find('.stress-test').click(async event => {
+      this.actor.transformerStress();
+    });
+    html.find('.moral-malheureux').click(async event => {
+      this.actor.jetDeMoral('malheureuse');
+    });
+    html.find('.moral-neutre').click(async event => {
+      this.actor.jetDeMoral('neutre');
+    });
+    html.find('.moral-heureux').click(async event => {
+      this.actor.jetDeMoral('heureuse');
+    });
+    html.find('#ethylisme-test').click(async event => {
+      this.actor.jetEthylisme();
+    });
+
+    html.find('.jet-vie').click(async event => {
+      this.actor.jetVie();
+    });
+    html.find('.jet-endurance').click(async event => {
+      this.actor.jetEndurance();
+    });
+
+    html.find('.monnaie-plus').click(async event => {
+      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), 1);
+    });
+    html.find('.monnaie-moins').click(async event => {
+      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), -1);
+    });
+
+    html.find('.vie-plus').click(async event => {
+      this.actor.santeIncDec("vie", 1);
+    });
+    html.find('.vie-moins').click(async event => {
+      this.actor.santeIncDec("vie", -1);
+    });
+    html.find('.endurance-plus').click(async event => {
+      this.actor.santeIncDec("endurance", 1);
+    });
+    html.find('.endurance-moins').click(async event => {
+      this.actor.santeIncDec("endurance", -1);
+    });
+    html.find('.ptreve-actuel-plus').click(async event => {
+      this.actor.reveActuelIncDec(1);
+    });
+    html.find('.ptreve-actuel-moins').click(async event => {
+      this.actor.reveActuelIncDec(-1);
+    });
+    html.find('.fatigue-plus').click(async event => {
+      this.actor.santeIncDec("fatigue", 1);
+    });
+    html.find('.fatigue-moins').click(async event => {
+      this.actor.santeIncDec("fatigue", -1);
+    });
+  }
+
+  _optionRecherche(target) {
+    if (!target.value?.length){
+      return undefined;
+    }
+    return {
+      text: target.value,
+      start: target.selectionStart,
+      end: target.selectionEnd,
+    };
   }
 
   _getEventArmeCombat(event) {
-    const li = this.html.find(event.currentTarget)?.parents(".item");
+    const li = $(event.currentTarget)?.parents(".item");
     let armeName = li.data("arme-name");
     let compName = li.data('competence-name');
-    const arme = this.armesList.find(a => a.name == armeName && a.system.competence == compName);
+    const arme = this.armesList.find(a => a.name == armeName && a.data.competence == compName);
     if (!arme) {
-      return { name: armeName, system: { competence: compName } };
+      return { name: armeName, data: { competence: compName } };
     }
     return arme;
   }
@@ -363,10 +562,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
     const sheetHeader = this.element.find(".sheet-header");
     const sheetTabs = this.element.find(".sheet-tabs");
     const sheetBody = this.element.find(".sheet-body");
-    let bodyHeight = position.height - sheetHeader[0].clientHeight;
-    if (sheetTabs.length > 0) {
-      bodyHeight -= sheetTabs[0].clientHeight;
-    }
+    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
     sheetBody.css("height", bodyHeight);
     return position;
   }
@@ -376,7 +572,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
   /** @override */
   _updateObject(event, formData) {
     // Update the Actor
-    return this.actor.update(formData);
+    return this.object.update(formData);
   }
 
   async splitItem(item) {
@@ -385,11 +581,11 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
   }
 
   async _onSplitItem(item, split) {
-    if (split >= 1 && split < item.system.quantite) {
+    if (split >= 1 && split < Misc.data(item).data.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
-      splitItem.system.quantite = split;
-      await this.actor.createEmbeddedDocuments('Item', [splitItem])
+      const itemData = duplicate(Misc.data(item));
+      itemData.data.quantite = split;
+      await this.actor.createEmbeddedDocuments('Item', [itemData])
     }
   }
 

module/actor-vehicule-sheet.js

@@ -0,0 +1,165 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+
+import { RdDUtility } from "./rdd-utility.js";
+import { HtmlUtility } from "./html-utility.js";
+import { Misc } from "./misc.js";
+import { RdDSheetUtility } from "./rdd-sheet-utility.js";
+
+/* -------------------------------------------- */
+export class RdDActorVehiculeSheet extends ActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    RdDUtility.initAfficheContenu();
+
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }]
+    });
+  }
+
+  /* -------------------------------------------- */
+  async getData() {
+    const objectData = Misc.data(this.object);
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+    };
+
+    RdDUtility.filterItemsPerTypeForSheet(formData);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
+
+    formData.options.isGM = game.user.isGM;
+
+    formData.calc = {
+      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
+      surEncombrementMessage: this.actor.getMessageSurEncombrement()
+    }
+
+    console.log("DATA", formData);
+
+    return formData;
+  }
+
+  async computeMalusArmure() {
+    // pas de malus armure
+  }
+  /* -------------------------------------------- */
+  async _onDropItem(event, dragData) {
+    const destItemId = $(event.target)?.closest('.item').attr('data-item-id');
+    const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur);
+    const callSuper = await this.actor.processDropItem(dropParams);
+    if (callSuper) {
+      await super._onDropItem(event, dragData)
+    }
+  }
+
+  /* -------------------------------------------- */
+  async createItem(name, type) {
+    await this.actor.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
+  }
+
+  /* -------------------------------------------- */
+  async monnaieIncDec(id, value) {
+    let monnaie = this.getMonnaie(id);
+    if (monnaie) {
+      const quantite = Math.max(0, Misc.templateData(monnaie).quantite + value);
+      await this.updateEmbeddedDocuments('Item', [{ _id: monnaie.id, 'data.quantite': quantite }]);
+    }
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    // Update Inventory Item
+    html.find('.item-edit').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item.sheet.render(true);
+    });
+    // Delete Inventory Item
+    html.find('.item-delete').click(async event => {
+      const li = RdDSheetUtility.getEventElement(event);
+      RdDUtility.confirmerSuppression(this, li);
+    });
+    html.find('.item-vendre').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.proposerVente();
+    });
+    html.find('.item-montrer').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.postItem();
+    });
+
+    html.find('.item-action').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      this.actor.actionItem(item);
+    });
+
+    html.find('.creer-un-objet').click(async event => {
+      RdDUtility.selectObjetType(this);
+    });
+    html.find('#nettoyer-conteneurs').click(async event => {
+      this.actor.nettoyerConteneurs();
+    });
+
+    html.find('.monnaie-plus').click(async event => {
+      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), 1);
+    });
+    html.find('.monnaie-moins').click(async event => {
+      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), -1);
+    });
+
+    // Display info about queue
+    html.find('.conteneur-name a').click((event) => {
+      RdDUtility.toggleAfficheContenu(RdDSheetUtility.getItemId(event));
+      this.render(true);
+    });
+
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetTabs = this.element.find(".sheet-tabs");
+    const sheetBody = this.element.find(".sheet-body");
+    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
+    sheetBody.css("height", bodyHeight);
+    return position;
+  }
+
+
+  /* -------------------------------------------- */
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.object.update(formData);
+  }
+}

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

@@ -1,42 +0,0 @@
-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('.button-encaissement').click(async event => this.actor.encaisser())
-    this.html.find('.roll-carac').click(async event => {
-      this.actor.rollCarac(Grammar.toLowerCaseNoAccent(event.currentTarget.attributes['data-carac-name'].value))});
-    this.html.find('.roll-competence').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('.button-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

@@ -1,510 +0,0 @@
-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 { ITEM_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[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp <= 0))
-      .concat(this.itemTypes[ITEM_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[ITEM_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[ITEM_TYPES.possession].find(it => it.system.possessionid == possessionId);
-  }
-  getPossessions() {
-    return this.itemTypes[ITEM_TYPES.possession];
-  }
-  getEmpoignades() {
-    return this.itemTypes[ITEM_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) {
-    if (Grammar.equalsInsensitive(caracName, 'taille')) {
-      return
-    }
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-    let selectedCarac = this.getCaracByName(caracName)
-    console.log("selectedCarac", selectedCarac)
-    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, arme: undefined }) {
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-    const competence = this.getCompetence(idOrName);
-    let rollData = { carac: this.system.carac, competence: competence, arme: options.arme }
-    if (competence.type == ITEM_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") {
-    const 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, arme: arme })
-        }
-      });
-      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) {
-    return RdDItemArme.getCompetenceArme(arme, competenceName)
-  }
-
-  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(
-      {
-        roll: encaissement.roll,
-        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
-      },
-      this
-    )
-
-    if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
-      encaissement = foundry.utils.duplicate(encaissement)
-      encaissement.isGM = true
-      ChatMessage.create({
-        whisper: ChatUtility.getGMs(),
-        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(actor) {
-    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entité incarnée");
-  }
-
-}

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

@@ -1,46 +0,0 @@
-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.getOwners(this.actor)
-    })
-  }
-
-}

module/actor/base-actor-sang.js

@@ -1,296 +0,0 @@
-import { MAX_ENDURANCE_FATIGUE, RdDUtility } from "../rdd-utility.js";
-import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
-import { STATUSES } from "../settings/status-effects.js";
-import { ITEM_TYPES } from "../item.js";
-import { RdDBaseActorReve } from "./base-actor-reve.js";
-import { RdDDice } from "../rdd-dice.js";
-import { RdDItemBlessure } from "../item/blessure.js";
-import { ChatUtility } from "../chat-utility.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[ITEM_TYPES.blessure].filter(it => it.isLegere()).length }
-  nbBlessuresGraves() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isGrave()).length }
-  nbBlessuresCritiques() { return this.itemTypes[ITEM_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 supprimerBlessure({ gravite }) {
-    const toDelete = this.itemTypes[ITEM_TYPES.blessure].find(it => it.system.gravite == gravite)?.id
-    if (toDelete) {
-      await this.deleteEmbeddedDocuments('Item', [toDelete]);
-    }
-  }
-
-  async supprimerBlessures(filterToDelete) {
-    const toDelete = this.filterItems(filterToDelete, ITEM_TYPES.blessure)
-      .map(it => it.id);
-    await this.deleteEmbeddedDocuments('Item', toDelete);
-  }
-
-  countBlessures(filter = it => !it.isContusion()) {
-    return this.filterItems(filter, ITEM_TYPES.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: ChatUtility.getOwners(this)
-      })
-      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: ChatUtility.getOwners(this)
-    });
-  }
-
-  /* -------------------------------------------- */
-  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

@@ -1,326 +0,0 @@
-import { RdDUtility } from "../rdd-utility.js";
-import { Misc } from "../misc.js";
-import { DialogSplitItem } from "../dialog-split-item.js";
-import { RdDSheetUtility } from "../rdd-sheet-utility.js";
-import { Monnaie } from "../item-monnaie.js";
-import { RdDItem, ITEM_TYPES } from "../item.js";
-import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
-
-/* -------------------------------------------- */
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-export class RdDBaseActorSheet extends ActorSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(ActorSheet.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
-      vueDetaillee: false
-    }, { inplace: false })
-  }
-
-  /* -------------------------------------------- */
-  async getData() {
-    Monnaie.validerMonnaies(this.actor.itemTypes['monnaie']);
-
-    this.actor.computeEtatGeneral();
-    let formData = {
-      title: this.title,
-      id: this.actor.id,
-      type: this.actor.type,
-      img: this.actor.img,
-      name: this.actor.name,
-      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),
-      effects: this.actor.effects
-    }
-
-    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-    formData.calc = {
-      fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
-      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
-      encTotal: await this.actor.computeEncTotal(),
-    }
-
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
-    this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
-    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
-    formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
-      .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
-    return formData;
-  }
-
-  _appliquerRechercheObjets(conteneurs, inventaires) {
-    if (this.options.recherche?.text) {
-      const recherche = this.options.recherche;
-      const allVisible = inventaires.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id);
-      let addVisible = conteneurs.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id)
-      do {
-        allVisible.push(...addVisible)
-        const parentsIds = conteneurs.filter(it => it.system.contenu.find(id => allVisible.includes(id))).map(it => it.id)
-        addVisible = parentsIds.filter(id => !allVisible.includes(id))
-      }
-      while (addVisible.length > 0)
-      inventaires.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
-      conteneurs.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
-    }
-    else {
-      inventaires.forEach(it => it.system.isHidden = false)
-      conteneurs.forEach(it => it.system.isHidden = false)
-    }
-  }
-
-  /* -------------------------------------------- */
-  static filterItemsPerTypeForSheet(formData, itemTypes) {
-    formData.blessures = Misc.arrayOrEmpty(itemTypes['blessure']);
-    formData.recettescuisine = Misc.arrayOrEmpty(itemTypes['recettecuisine']);
-    formData.recettesAlchimiques = Misc.arrayOrEmpty(itemTypes['recettealchimique']);
-    formData.maladies = Misc.arrayOrEmpty(itemTypes['maladie']);
-    formData.poisons = Misc.arrayOrEmpty(itemTypes['poison']);
-    formData.possessions = Misc.arrayOrEmpty(itemTypes['possession']);
-    formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
-    formData.competences = (itemTypes['competence'] ?? []).concat(itemTypes['competencecreature'] ?? []);
-    formData.sortsReserve = Misc.arrayOrEmpty(itemTypes['sortreserve']);
-
-    formData.sorts = Misc.arrayOrEmpty(itemTypes['sort']);
-    formData.rencontres = Misc.arrayOrEmpty(itemTypes['rencontre']);
-    formData.casestmr = Misc.arrayOrEmpty(itemTypes['casetmr']);
-    formData.signesdraconiques = Misc.arrayOrEmpty(itemTypes['signedraconique']);
-    formData.queues = Misc.arrayOrEmpty(itemTypes['queue']);
-    formData.souffles = Misc.arrayOrEmpty(itemTypes['souffle']);
-    formData.ombres = Misc.arrayOrEmpty(itemTypes['ombre']);
-    formData.tetes = Misc.arrayOrEmpty(itemTypes['tete']);
-    formData.taches = Misc.arrayOrEmpty(itemTypes['tache']);
-    formData.meditations = Misc.arrayOrEmpty(itemTypes['meditation']);
-    formData.chants = Misc.arrayOrEmpty(itemTypes['chant']);
-    formData.danses = Misc.arrayOrEmpty(itemTypes['danse']);
-    formData.musiques = Misc.arrayOrEmpty(itemTypes['musique']);
-    formData.oeuvres = Misc.arrayOrEmpty(itemTypes['oeuvre']);
-    formData.jeux = Misc.arrayOrEmpty(itemTypes['jeu']);
-
-    formData.services = Misc.arrayOrEmpty(itemTypes['service']);
-    formData.conteneurs = Misc.arrayOrEmpty(itemTypes['conteneur']);
-    formData.materiel = Misc.arrayOrEmpty(itemTypes['objet']);
-    formData.armes = Misc.arrayOrEmpty(itemTypes['arme']);
-    formData.armures = Misc.arrayOrEmpty(itemTypes['armure']);
-    formData.munitions = Misc.arrayOrEmpty(itemTypes['munition']);
-    formData.livres = Misc.arrayOrEmpty(itemTypes['livre']);
-    formData.potions = Misc.arrayOrEmpty(itemTypes['potion']);
-    formData.plantes = Misc.arrayOrEmpty(itemTypes['plante']);
-    formData.ingredients = Misc.arrayOrEmpty(itemTypes['ingredient']);
-    formData.faunes = Misc.arrayOrEmpty(itemTypes['faune']);
-    formData.herbes = Misc.arrayOrEmpty(itemTypes['herbe']);
-    formData.nourritureboissons = Misc.arrayOrEmpty(itemTypes['nourritureboisson']);
-    formData.gemmes = Misc.arrayOrEmpty(itemTypes['gemme']);
-    formData.monnaies = Misc.arrayOrEmpty(itemTypes['monnaie']).sort(Monnaie.triValeurEntiere());
-    formData.objets = Misc.arrayOrEmpty(itemTypes['objet'])
-
-    formData.inventaires = RdDItem.getItemTypesInventaire('all')
-      .map(t => Misc.arrayOrEmpty(itemTypes[t]))
-      .reduce((a, b) => a.concat(b), [])
-      .sort(Misc.ascending(it => it.name));
-  }
-
-  /* -------------------------------------------- */  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-
-    this.html.find('.conteneur-name a').click(async event => {
-      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('.recherche')
-      .each((index, field) => {
-        this._rechercheSelectArea(field);
-      })
-      .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);
-    });
-    this.html.find('.item-quantite-plus').click(async event => this.actor.itemQuantiteIncDec(this.getItemId(event), 1));
-    this.html.find('.item-quantite-moins').click(async event => this.actor.itemQuantiteIncDec(this.getItemId(event), -1));
-    this.html.find('.item-delete').click(async event => RdDUtility.confirmActorItemDelete(this, this.getItem(event)));
-    this.html.find('.item-vendre').click(async event => this.vendre(this.getItem(event)));
-
-    this.html.find('.creer-un-objet').click(async event => {
-      this.selectObjetTypeToCreate();
-    });
-    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) {
-    const currentTarget = event.currentTarget;
-    const nouvelleRecherche = this._optionRecherche(currentTarget);
-    if (this.options.recherche?.text != nouvelleRecherche?.text) {
-      this.options.recherche = nouvelleRecherche;
-      if (this.timerRecherche) {
-        clearTimeout(this.timerRecherche);
-      }
-      this.timerRecherche = setTimeout(() => {
-        this.timerRecherche = undefined;
-        this.render(true);
-      }, 500);
-    }
-  }
-
-  _rechercheSelectArea(field) {
-    if (this.options.recherche) {
-      field.focus();
-      field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
-    }
-  }
-
-  getItemId(event) {
-    return RdDSheetUtility.getItemId(event);
-  }
-
-  getItem(event) {
-    return RdDSheetUtility.getItem(event, this.actor);
-  }
-
-  _optionRecherche(target) {
-    if (!target.value?.length) {
-      return undefined;
-    }
-    return {
-      text: target.value,
-      start: target.selectionStart,
-      end: target.selectionEnd,
-    };
-  }
-  /* -------------------------------------------- */
-  _getHeaderButtons() {
-    let buttons = super._getHeaderButtons();
-    buttons.unshift({
-      class: "montrer",
-      icon: "fas fa-comment",
-      onclick: ev => this.actor.postActorToChat()
-    });
-    return buttons
-  }
-
-  /* -------------------------------------------- */
-  async _onDropItem(event, dragData) {
-    const destItemId = this.html.find(event.target)?.closest('.item').attr('data-item-id')
-    const dropParams = await RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor, dragData, this.objetVersConteneur)
-    if (dropParams) {
-      const callSuper = await this.actor.processDropItem(dropParams)
-      if (callSuper) {
-        await super._onDropItem(event, dragData)
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  async selectObjetTypeToCreate() {
-    let types = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
-    let content = `<span class="competence-label">Selectionnez le type d'équipement</span><select class="item-type">`;
-    for (let typeName of types) {
-      content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
-    }
-    content += '</select>';
-    let d = new Dialog({
-      title: "Créer un équipement",
-      content: content,
-      buttons: {
-        create: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Créer l'objet",
-          callback: () => this.actor.createItem($(".item-type").val())
-        }
-      }
-    });
-    d.render(true);
-  }
-
-  getTypesInventaire() {
-    return RdDItem.getItemTypesInventaire();
-  }
-
-  /** @override */
-  setPosition(options = {}) {
-    const position = super.setPosition(options);
-    const sheetHeader = this.element.find(".sheet-header");
-    const sheetTabs = this.element.find(".sheet-tabs");
-    const sheetBody = this.element.find(".sheet-body");
-    let bodyHeight = position.height - sheetHeader[0].clientHeight;
-    if (sheetTabs.length > 0) {
-      bodyHeight -= sheetTabs[0].clientHeight;
-    }
-    sheetBody.css("height", bodyHeight);
-    return position;
-  }
-
-
-  /* -------------------------------------------- */
-  /** @override */
-  _updateObject(event, formData) {
-    // Update the Actor
-    return this.actor.update(formData);
-  }
-
-  async splitItem(item) {
-    const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
-    dialog.render(true);
-  }
-
-  async _onSplitItem(item, split) {
-    if (split >= 1 && split < item.system.quantite) {
-      await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
-      splitItem.system.quantite = split;
-      await this.actor.createEmbeddedDocuments('Item', [splitItem])
-    }
-  }
-
-  vendre(item) {
-    item?.proposerVente(this.actor.getQuantiteDisponible(item));
-  }
-
-}

module/actor/base-actor.js

@@ -1,712 +0,0 @@
-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 { ITEM_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";
-
-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) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
-    Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
-    Hooks.on("deleteItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onDeleteItem(item, options, id))
-    Hooks.on("updateActor", (actor, change, options, actorId) => Misc.documentIfResponsible(actor)?.onUpdateActor(change, options, actorId))
-  }
-
-  static onSocketMessage(sockmsg) {
-    switch (sockmsg.msg) {
-      case "msg_remote_actor_call":
-        return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
-    }
-  }
-
-  static remoteActorCall(callData, userId = undefined) {
-    userId = userId ?? Misc.firstConnectedGMId();
-    if (userId == game.user.id) {
-      RdDBaseActor.onRemoteActorCall(callData, userId);
-      return false;
-    }
-    else {
-      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: callData, userId: userId });
-      return true;
-    }
-  }
-
-  static onRemoteActorCall(callData, userId) {
-    if (userId == game.user.id) {
-      const actor = RdDBaseActor.getRealActor(callData?.actorId, callData?.tokenId);
-      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, ')');
-        actor[callData.method](...args);
-      }
-    }
-  }
-
-  static getRealActor(actorId, tokenId) {
-    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 }; };
-
-  /**
-   * 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} options   optionspour customiser la création
-   */
-  static async create(actorData, options) {
-    // import depuis un compendium
-    if (actorData instanceof Array) {
-      return super.create(actorData, options);
-    }
-    // Création d'un acteur avec des items (uniquement en cas de duplication): pas besoin d'ajouter d'items
-    if (actorData.items) {
-      return await super.create(actorData, options);
-    }
-    actorData.items = [];
-    if (actorData.type == "personnage") {
-      const competences = await SystemCompendiums.getCompetences(actorData.type);
-      actorData.items = actorData.items.concat(competences.map(i => i.toObject()))
-        .concat(Monnaie.monnaiesStandard());
-    }
-    else if (actorData.type == "commerce") {
-      actorData.items = actorData.items.concat(Monnaie.monnaiesStandard());
-    }
-    return super.create(actorData, options);
-  }
-
-  constructor(docData, context = {}) {
-    if (!context.rdd?.ready) {
-      foundry.utils.mergeObject(context, { rdd: { ready: true } });
-      const ActorConstructor = game.system.rdd.actorClasses[docData.type];
-      if (ActorConstructor) {
-        if (!docData.img) {
-          docData.img = ActorConstructor.defaultIcon;
-        }
-        return new ActorConstructor(docData, context);
-      }
-    }
-    context.rdd = undefined
-    super(docData, context);
-  }
-
-  findCaracByName(name) {
-    name = Grammar.toLowerCaseNoAccent(name)
-    switch (name) {
-      case 'reve-actuel': case 'reve actuel':
-        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)) {
-      return item;
-    }
-    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) {
-    return this.getItem(idOrName, type)
-      ?? Misc.findFirstLike(idOrName, this.listItems(type), { description: Misc.typeName('Item', type) });
-  }
-
-  getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
-  getEncombrementMax() { return 0 }
-
-  /* -------------------------------------------- */
-  async onPreUpdateItem(item, change, options, id) { }
-
-  async onCreateItem(item, options, id) { }
-
-  async onDeleteItem(item, options, id) { }
-
-  async onUpdateActor(update, options, actorId) { }
-
-  async onTimeChanging(oldTimestamp, newTimestamp) {
-    this.items.filter(it => it.isFinPeriode(oldTimestamp, newTimestamp))
-      .forEach(async it => await it.onFinPeriodeTemporel(oldTimestamp, newTimestamp))
-  }
-
-  async creerObjetParMJ(object) {
-    if (!Misc.isUniqueConnectedGM()) {
-      RdDBaseActor.remoteActorCall({
-        tokenId: this.token?.id,
-        actorId: this.id,
-        method: 'creerObjetParMJ',
-        args: [object]
-      });
-      return;
-    }
-    await this.createEmbeddedDocuments('Item', [object])
-  }
-
-  /* -------------------------------------------- */
-  async cleanupConteneurs() {
-    if (Misc.isOwnerPlayerOrUniqueConnectedGM(this)) {
-      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']);
-  }
-
-  /* -------------------------------------------- */
-  async itemQuantiteIncDec(id, value) {
-    let item = this.getItem(id);
-    if (item && item.isInventaire()) {
-      const quantite = Math.max(0, item.system.quantite + value);
-      await item.update({ 'system.quantite': quantite });
-    }
-  }
-
-  computePrixTotalEquipement() {
-    return this.items.filter(it => it.isInventaire())
-      .filter(it => !it.isMonnaie())
-      .map(it => it.valeurTotale())
-      .reduce(Misc.sum(), 0);
-  }
-
-  async payerSols(depense) {
-    depense = Number(depense);
-    if (depense == 0) {
-      return;
-    }
-    let fortune = this.getFortune();
-    console.log("payer", game.user.character, depense, fortune);
-    // TODO: passer en handlebars
-    let msg = "";
-    if (fortune >= depense) {
-      await Monnaie.optimiserFortune(this, fortune - depense);
-      msg = `Vous avez payé <strong>${depense} Sols</strong>, qui ont été soustraits de votre argent.`;
-      RdDAudio.PlayContextAudio("argent"); // Petit son
-    } else {
-      msg = "Vous n'avez pas assez d'argent pour payer cette somme !";
-    }
-
-    ChatMessage.create({
-      whisper: ChatUtility.getOwners(this),
-      content: msg
-    })
-  }
-
-  async depenserSols(sols) {
-    let reste = this.getFortune() - Number(sols);
-    if (reste >= 0) {
-      await Monnaie.optimiserFortune(this, reste);
-    }
-    return reste;
-  }
-
-  async ajouterSols(sols, fromActorId = undefined) {
-    sols = Number(sols);
-    if (sols == 0) {
-      return;
-    }
-    if (sols < 0) {
-      ui.notifications.error(`Impossible d'ajouter un gain de ${sols} <0`);
-      return;
-    }
-    if (fromActorId && !game.user.isGM) {
-      RdDBaseActor.remoteActorCall({
-        userId: Misc.connectedGMOrUser(),
-        tokenId: this.token?.id,
-        actorId: this.id,
-        method: 'ajouterSols', args: [sols, fromActorId]
-      });
-    }
-    else {
-      const fromActor = game.actors.get(fromActorId)
-      await Monnaie.optimiserFortune(this, sols + this.getFortune());
-
-      RdDAudio.PlayContextAudio("argent"); // Petit son
-      ChatMessage.create({
-        whisper: ChatUtility.getOwners(this.name),
-        content: `Vous avez reçu <strong>${sols} Sols</strong> ${fromActor ? " de " + fromActor.name : ''}, qui ont été ajoutés à votre argent.`
-      });
-    }
-  }
-
-  /* -------------------------------------------- */
-
-  getQuantiteDisponible(item) {
-    return item?.isService() ? undefined : item?.getQuantite();
-  }
-
-  /* -------------------------------------------- */
-  async achatVente(achat) {
-    if (achat.vendeurId == achat.acheteurId) {
-      ui.notifications.info("Inutile de se vendre à soi-même");
-      return;
-    }
-    if (!Misc.isUniqueConnectedGM()) {
-      RdDBaseActor.remoteActorCall({
-        actorId: achat.vendeurId ?? achat.acheteurId,
-        method: 'achatVente',
-        args: [achat]
-      });
-      return;
-    }
-    const cout = Number(achat.prixTotal ?? 0);
-    const vendeur = achat.vendeurId ? game.actors.get(achat.vendeurId) : undefined;
-    const acheteur = achat.acheteurId ? game.actors.get(achat.acheteurId) : undefined;
-    const quantite = (achat.choix.nombreLots ?? 1) * (achat.vente.tailleLot);
-    const itemVendu = vendeur?.getItem(achat.vente.item._id) ?? game.items.get(achat.vente.item._id);
-    if (!itemVendu) {
-      ChatUtility.notifyUser(achat.userId, 'warn', vendeur ? `Le vendeur n'a pas plus de ${achat.vente.item.name} !` : `Impossible de retrouver: ${achat.vente.item.name} !`);
-      return;
-    }
-    if (vendeur && !vendeur.verifierQuantite(itemVendu, quantite)) {
-      ChatUtility.notifyUser(achat.userId, 'warn', `Le vendeur n'a pas assez de ${itemVendu.name} !`);
-      return
-    }
-    if (acheteur && !acheteur.verifierFortune(cout)) {
-      ChatUtility.notifyUser(achat.userId, 'warn', `Vous n'avez pas assez d'argent pour payer ${Math.ceil(cout / 100)} sols !`);
-      return;
-    }
-    await vendeur?.vendre(itemVendu, quantite, cout);
-    await acheteur?.acheter(itemVendu, quantite, cout, achat)
-
-    if (cout > 0) {
-      RdDAudio.PlayContextAudio("argent");
-    }
-    const chatAchatItem = foundry.utils.duplicate(achat.vente);
-    chatAchatItem.quantiteTotal = quantite;
-    ChatMessage.create({
-      user: achat.userId,
-      speaker: { alias: (acheteur ?? vendeur).name },
-      whisper: ChatUtility.getOwners(this),
-      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.html', chatAchatItem)
-    });
-
-    if (!achat.vente.quantiteIllimite) {
-      if (achat.vente.nbLots <= achat.choix.nombreLots) {
-        ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
-      }
-      else if (achat.chatMessageIdVente) {
-        await ChatVente.diminuerQuantiteAchatVente(achat.chatMessageIdVente, achat.choix.nombreLots)
-      }
-    }
-  }
-
-  async vendre(item, quantite, cout) {
-    await this.ajouterSols(cout);
-    await this.decrementerQuantiteItem(item, 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);
-    }
-  }
-
-  verifierFortune(cout) {
-    return this.getFortune() >= cout;
-  }
-
-  verifierQuantite(item, quantiteDemande) {
-    const disponible = this.getQuantiteDisponible(item);
-    return disponible == undefined || disponible >= quantiteDemande;
-  }
-
-  async consommerNourritureboisson(itemId, choix, userId) { }
-
-  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: 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 }]);
-    }
-  }
-
-  async creerQuantiteItem(item, quantite) {
-    if (this.canReceive(item)) {
-      const isItemEmpilable = "quantite" in item.system;
-      const baseItem = {
-        type: item.type,
-        img: item.img,
-        name: item.name,
-        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);
-      return items.length > 0 ? items[0].id : undefined;
-    }
-  }
-
-  /* -------------------------------------------- */
-  async computeEncTotal() {
-    if (!this.pack) {
-      this.encTotal = this.items.map(it => it.getEncTotal()).reduce(Misc.sum(), 0);
-      return this.encTotal;
-    }
-    return 0;
-  }
-
-  getEncTotal() {
-    return Math.floor(this.encTotal ?? 0);
-  }
-
-  async createItem(type, name = undefined) {
-    if (!name) {
-      name = 'Nouveau ' + Misc.typeName('Item', type);
-    }
-    await this.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
-  }
-
-  canReceive(item) {
-    return false;
-  }
-
-  async processDropItem(params) {
-    const targetActorId = this.id
-    const sourceActorId = params.sourceActorId
-    const sourceTokenId = params.sourceTokenId
-    const itemId = params.itemId
-    const destId = params.destId
-    const srcId = params.srcId
-    if (sourceActorId && sourceActorId != targetActorId) {
-      console.log("Moving objects", sourceActorId, sourceTokenId, targetActorId, itemId);
-      this.moveItemsBetweenActors(itemId, sourceActorId, sourceTokenId);
-      return false;
-    }
-    let result = true;
-    const item = this.getItem(itemId);
-    if (item?.isInventaire('all') && sourceActorId == targetActorId) {
-      // rangement
-      if (srcId != destId && itemId != destId) { // déplacement de l'objet
-        const src = this.getItem(srcId);
-        const dest = this.getItem(destId);
-        const cible = this.getContenantOrParent(dest);
-        const [empilable, message] = item.isInventaireEmpilable(dest);
-        if (empilable) {
-          await dest.empiler(item)
-          result = false;
-        }
-        // changer de conteneur
-        else if (!cible || this.conteneurPeutContenir(cible, item)) {
-          await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
-          await this.ajouterDansConteneur(item, cible, params.onAjouterDansConteneur);
-          if (message && !dest.isConteneur()) {
-            ui.notifications.info(cible
-              ? `${message}<br>${item.name} a été déplacé dans: ${cible.name}`
-              : `${message}<br>${item.name} a été sorti du conteneur`);
-          }
-        }
-      }
-    }
-    await this.computeEncTotal();
-    return result;
-  }
-
-  getContenantOrParent(dest) {
-    if (!dest || dest.isConteneur()) {
-      return dest;
-    }
-    return this.getContenant(dest);
-  }
-
-  getContenant(item) {
-    return this.itemTypes['conteneur'].find(it => it.system.contenu.includes(item.id));
-  }
-
-
-  /* -------------------------------------------- */
-  conteneurPeutContenir(dest, moved) {
-    if (!dest) {
-      return true;
-    }
-    if (!dest.isConteneur()) {
-      return false;
-    }
-    if (moved.isConteneurContenu(dest)) {
-      ui.notifications.warn(`Impossible de déplacer un conteneur parent (${moved.name}) dans un de ses contenus ${dest.name} !`);
-      return false;
-    }
-
-    // Calculer le total actuel des contenus
-    const encContenu = dest.getEncContenu();
-    const newEnc = moved.getEncTotal(); // Calculer le total actuel du nouvel objet
-    const placeDisponible = Misc.keepDecimals(dest.system.capacite - encContenu - newEnc, 4)
-
-    // Teste si le conteneur de destination a suffisament de capacité pour recevoir le nouvel objet
-    if (placeDisponible < 0) {
-      ui.notifications.warn(
-        `Le conteneur ${dest.name} a une capacité de ${dest.system.capacite}, et contient déjà ${encContenu}.
-        Impossible d'y ranger: ${moved.name} d'encombrement ${newEnc}!`);
-      return false;
-    }
-    return true;
-  }
-
-  /* -------------------------------------------- */
-  /** Ajoute un item dans un conteneur, sur la base de leurs ID */
-  async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
-    if (conteneur?.isConteneur()) {
-      item.estContenu = true;
-      const nouveauContenu = [...conteneur.system.contenu, item.id];
-      await conteneur.update({ 'system.contenu': nouveauContenu });
-      onAjouterDansConteneur(item.id, conteneur.id)
-    }
-    else {
-      item.estContenu = false;
-      await conteneur?.update({ 'system.-=contenu': undefined })
-    }
-  }
-
-  /* -------------------------------------------- */
-  /** Fonction de remise à plat de l'équipement (ie vide les champs 'contenu') */
-  async nettoyerConteneurs() {
-    RdDConfirm.confirmer({
-      settingConfirmer: "confirmation-vider",
-      content: `<p>Etes vous certain de vouloir vider tous les conteneurs ?</p>`,
-      title: 'Vider les conteneurs',
-      buttonLabel: 'Vider',
-      onAction: async () => {
-        const corrections = [];
-        for (let item of this.items) {
-          if (item.estContenu) {
-            item.estContenu = undefined;
-          }
-          if (item.system.contenu != undefined) {
-            if (item.type == 'conteneur') {
-              corrections.push({ _id: item.id, 'system.contenu': [] });
-            }
-            else {
-              corrections.push({ _id: item.id, 'system.-=contenu': undefined });
-            }
-          }
-        }
-        if (corrections.length > 0) {
-          await this.updateEmbeddedDocuments('Item', corrections);
-        }
-      }
-    });
-  }
-
-  /* -------------------------------------------- */
-  buildSubConteneurObjetList(conteneurId, deleteList) {
-    let conteneur = this.getItem(conteneurId);
-    if (conteneur?.type == 'conteneur') { // Si c'est un conteneur
-      for (let subId of conteneur.system.contenu) {
-        let subObj = this.getItem(subId);
-        if (subObj) {
-          if (subObj.type == 'conteneur') {
-            this.buildSubConteneurObjetList(subId, deleteList);
-          }
-          deleteList.push({ id: subId, conteneurId: conteneurId });
-        }
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  async deleteAllConteneur(itemId, options) {
-    let list = [];
-    list.push({ id: itemId, conteneurId: undefined }); // Init list
-    this.buildSubConteneurObjetList(itemId, list);
-    await this.deleteEmbeddedDocuments('Item', list.map(it => it.id), options);
-  }
-
-  /* -------------------------------------------- */
-  /**
-   * Supprime un item d'un conteneur, sur la base de leurs ID
-   */
-  async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
-    if (conteneur) {
-      if (conteneur.isConteneur()) {
-        const contenu = conteneur.system.contenu.filter(id => id != item.id);
-        await conteneur.update({ 'system.contenu': contenu });
-        onEnleverDeConteneur();
-      }
-      else {
-        await conteneur.update({ 'system.-=contenu': undefined })
-      }
-    }
-    item.estContenu = false;
-  }
-
-  /* -------------------------------------------- */
-  async moveItemsBetweenActors(itemId, sourceActorId, sourceTokenId) {
-    let sourceActor = RdDBaseActor.getRealActor(sourceActorId, sourceTokenId)
-    let itemsList = [{ id: itemId, conteneurId: undefined }]
-    sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list
-
-    const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
-      .map(it => foundry.utils.duplicate(it))
-      .map(it => { it.system.contenu = []; return it; });
-    let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);
-
-    let itemMap = this._buildMapOldNewId(itemsList, newItems);
-
-    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
-        const newConteneurId = itemMap[item.conteneurId];
-        const newConteneur = this.getItem(newConteneurId);
-        const newItemId = itemMap[item.id]; // Get newItem
-
-        console.log('New conteneur filling!', newConteneur, newItemId, item);
-        const nouveauContenu = [...newConteneur.system.contenu, newItemId]
-        await newConteneur.update({ 'system.contenu': nouveauContenu })
-      }
-    }
-    const deletedItemIds = itemsList.map(it => it.id)
-    await sourceActor.deleteEmbeddedDocuments('Item', deletedItemIds);
-  }
-
-  _buildMapOldNewId(itemsList, newItems) {
-    let itemMap = {};
-    for (let i = 0; i < itemsList.length; i++) {
-      itemMap[itemsList[i].id] = newItems[i].id; // Pour garder le lien ancien / nouveau
-    }
-    return itemMap;
-  }
-
-  /* -------------------------------------------- */
-  async postActorToChat(modeOverride) {
-    let chatData = {
-      doctype: 'Actor',
-      id: this.id,
-      type: this.type,
-      img: this.img,
-      pack: this.pack,
-      name: this.name,
-      system: { description: this.system.description }
-    }
-    renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.html', chatData)
-      .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 ITEM_TYPES.conteneur: return await item.sheet.render(true);
-    }
-    return undefined
-  }
-
-}

module/actor/commerce-sheet.js

@@ -1,90 +0,0 @@
-import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
-import { RdDItem } from "../item.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { RdDBaseActorSheet } from "./base-actor-sheet.js";
-
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-export class RdDCommerceSheet extends RdDBaseActorSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
-      width: 600, height: 720,
-      tabs: []
-    }, { inplace: false })
-  }
-  get title() {
-    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
-      return this.actor.token.name;
-    }
-    return super.title
-  }
-
-  async getData() {
-    const formData = await super.getData();
-    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
-      foundry.utils.mergeObject(formData,
-        {
-          title: this.actor.token.name,
-          token: {
-            img: this.actor.token.texture.src
-          }
-        },
-        { overwrite: true });
-
-    }
-    return formData;
-  }
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    this.html.find('a.item-acheter').click(async event => await this.vente(this.getItem(event)));
-
-    if (!this.options.editable) return;
-
-    this.html.find('a.item-quantite-moins').click(async event => await this.getItem(event)?.quantiteIncDec(-1, { supprimerSiZero: false }));
-    this.html.find('a.item-quantite-plus').click(async event => await this.getItem(event)?.quantiteIncDec(1));
-    this.html.find('input.item-quantite').change(async event => {
-      const newQuantite = Math.max(0, Number.parseInt(this.html.find(event.currentTarget).val()));
-      await this.getItem(event)?.update({ "system.quantite": newQuantite });
-    })
-    this.html.find('input.item-cout').change(async event => {
-      const newCout = Math.max(0, Number(this.html.find(event.currentTarget).val()));
-      await this.getItem(event)?.update({ "system.cout": newCout });
-    })
-  }
-
-  getTypesInventaire() {
-    return RdDItem.getItemTypesInventaire('all');
-  }
-
-
-  async vente(item) {
-    const acheteur = RdDUtility.getSelectedActor();
-    if (!acheteur) {
-      ui.notifications.warn(`Pas d'acheteur sélectionné`);
-      return;
-    }
-    const disponible = this.actor.getQuantiteDisponible(item)
-    if (disponible == 0) {
-      ui.notifications.warn(`${this.name} n'a plus de ${item.name} en vente`);
-      return;
-    }
-
-    await DialogItemAchat.onAcheter({
-      item,
-      vendeur: this.actor,
-      acheteur,
-      quantiteIllimite: disponible == undefined,
-      nbLots: disponible ?? 1,
-      tailleLot: 1,
-      prixLot: item.calculerPrixCommercant()
-    });
-  }
-}

module/actor/commerce.js

@@ -1,43 +0,0 @@
-import { Misc } from "../misc.js";
-import { RdDBaseActor } from "./base-actor.js";
-
-export class RdDCommerce extends RdDBaseActor {
-
-  static get defaultIcon() {
-    return "systems/foundryvtt-reve-de-dragon/icons/services/commerce.webp";
-  }
-
-  canReceive(item) {
-    return item.isInventaire('all');
-  }
-
-  getQuantiteDisponible(item) {
-    return (this.system.illimite || item?.isService()) ? undefined : item.getQuantite();
-  }
-
-  verifierFortune(cout) {
-    return this.system.illimite || super.verifierFortune(cout);
-  }
-
-  async depenserSols(cout) {
-    if (this.system.illimite) {
-      return
-    }
-    await super.depenserSols(cout)
-  }
-  async consommerNourritureboisson(itemId, choix, userId) { 
-    // ne pas consommer pour un commerce
-  }
-
-  async decrementerQuantiteItem(item, quantite) {
-    if (this.system.illimite) {
-      return;
-    }
-    await super.decrementerQuantiteItem(item, quantite, { supprimerSiZero: false });
-  }
-
-  calculerPrix(item) {
-    const pourcentage = this.system.pourcentage ?? 100;
-    return Misc.keepDecimals(Math.ceil(item.system.cout * pourcentage) / 100, 2);
-  }
-}

module/actor/creature-sheet.js

@@ -1,40 +0,0 @@
-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 RdDCreatureSheet extends RdDBaseActorSangSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
-      width: 640, height: 720
-    }, { inplace: false })
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    // On competence change
-    this.html.find('.creature-carac').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
-    });
-    this.html.find('.creature-niveau').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
-    });
-    this.html.find('.creature-dommages').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
-    });
-  }
-}

module/actor/creature.js

@@ -1,36 +0,0 @@
-import { ENTITE_INCARNE } from "../constants.js";
-import { ITEM_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 == ITEM_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);
-    }
-  }
-
-}

module/actor/entite-sheet.js

@@ -1,67 +0,0 @@
-import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
-import { RdDSheetUtility } from "../rdd-sheet-utility.js";
-import { RdDUtility } from "../rdd-utility.js";
-
-export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
-      width: 640, height: 720,
-    }, { inplace: false })
-  }
-
-  async getData() {
-    let formData = await super.getData();
-    formData.resonances = this.actor.system.sante.resonnance.actors.map(actorId => game.actors.get(actorId))
-      .map(actor => { return { id: actor.id, name: actor.name, img: actor.img } })
-    return formData
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    // On competence change
-    this.html.find('.creature-carac').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
-    });
-    this.html.find('.creature-niveau').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
-    });
-    this.html.find('.creature-dommages').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
-    });
-    this.html.find('.resonance-delete').click(async event => {
-      const li = RdDSheetUtility.getEventElement(event);
-      const actorId = li.data("actor-id");
-      if (actorId) {
-        const actorResonance = game.actors.get(actorId);
-        RdDUtility.confirmSubActeurDelete(this, actorResonance, li, () => {
-          console.log('Delete : ', actorId);
-          this.deleteSubActeur(actorId);
-          RdDUtility.slideOnDelete(this, li);
-        });
-      }
-    });
-  }
-
-  async _onDropActor(event, dragData) {
-    const dropActor = fromUuidSync(dragData.uuid)
-    await this.actor.setEntiteReveAccordee(dropActor)
-    super._onDropActor(event, dragData)
-  }
-
-  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

@@ -1,106 +0,0 @@
-import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
-import { ITEM_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 == ITEM_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[ITEM_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(actor) {
-    if (this.isEntite([ENTITE_INCARNE])) {
-      if (this.system.sante.resonnance.actors.find(it => it == actor.id)) {
-        // déjà accordé
-        return
-      }
-      await this.update({ "system.sante.resonnance.actors": [...this.system.sante.resonnance.actors, actor.id] })
-    }
-    else {
-      super.setEntiteReveAccordee(actor)
-    }
-  }
-}

module/actor/experience-log.js

@@ -1,39 +0,0 @@
-
-export const XP_TOPIC = {
-  XP: { code: 'xp', label: 'xp' },
-  XPSORT: { code: 'xpsort', label: 'xp sort' },
-  NIVEAU: { code: 'niveau', label: 'Niveau' },
-  XPCARAC: { code: 'xpcarac', label: 'xp carac' },
-  CARAC: { code: 'carac', label: 'Carac' },
-  STRESS: { code: 'stress', label: 'Stress' },
-  TRANSFORM: { code: 'xps', label: 'Transformé' },
-}
-
-export class ExperienceLog {
-
-  static async add(actor, topic, from, to, raison, manuel = false) {
-    if (!actor.isPersonnageJoueur()) {
-      return
-    }
-    if (from == to) {
-      return
-    }
-    const newXpLog = {
-      mode: topic?.code ?? topic,
-      raison: (manuel ? '(manuel) ' : '') + raison,
-      from: from,
-      to: to,
-      valeur: to - from,
-      daterdd: game.system.rdd.calendrier.dateCourante(),
-      datereel: game.system.rdd.calendrier.dateReel().replace('T', ' ')
-    };
-    console.log('ExperienceLog.add', newXpLog)
-    const newExperienceLog = (actor.system.experiencelog ?? []).concat([newXpLog]);
-    await actor.update({ [`system.experiencelog`]: newExperienceLog });
-  }
-
-  static labelTopic(topic) {
-    const xpt = Object.values(XP_TOPIC).find(it => it.code == topic);
-    return xpt?.label ?? xpt?.code ?? topic;
-  }
-}

module/actor/export-scriptarium/actor-encart-sheet.js

@@ -1,115 +0,0 @@
-import { RdDActorSheet } from "../../actor-sheet.js"
-import { SYSTEM_RDD } from "../../constants.js";
-import { Misc } from "../../misc.js";
-import { EXPORT_CSV_SCRIPTARIUM, OptionsAvancees } from "../../settings/options-avancees.js";
-import { ExportScriptarium } from "./export-scriptarium.js";
-import { CATEGORIES_COMPETENCES, CATEGORIES_DRACONIC, Mapping } from "./mapping.js";
-
-export class RdDActorExportSheet extends RdDActorSheet {
-  static async init() {
-    await loadTemplates([
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/blessure.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/blessures.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-compteur.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-derivee.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-derivee-compteur.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/esquive.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/fatigue.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/protection.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/sort.hbs",
-    ])
-    Actors.registerSheet(SYSTEM_RDD, RdDActorExportSheet, { types: ["personnage"], makeDefault: false, label: "Feuille simplifiée" })
-  }
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDActorSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/actor-encart-sheet.hbs",
-      width: 550,
-      showCompNiveauBase: false,
-      vueArchetype: false,
-    }, { inplace: false })
-  }
-
-  constructor(actor, options) {
-    super(actor, options)
-  }
-
-  async getData() {
-    const formData = await super.getData()
-    // Add any structured, precomputed list of data
-    formData.context = Mapping.prepareContext(this.actor)
-    formData.export = this.getMappingValues(formData.context, this.actor)
-    formData.competences = this.getCompetences(CATEGORIES_COMPETENCES)
-    formData.draconic = this.getCompetences(CATEGORIES_DRACONIC)
-    const legeres = this.actor.nbBlessuresLegeres()
-    const graves = this.actor.nbBlessuresGraves()
-    const critiques = this.actor.nbBlessuresCritiques()
-    formData.etat = {
-      surenc: this.actor.computeMalusSurEncombrement(),
-      fatigue: {
-        value: this.actor.getFatigueActuelle(),
-        max: this.actor.getFatigueMax(),
-        malus: this.actor.malusFatigue()
-      },
-      blessures: legeres + graves + critiques,
-      blessure: [legeres > 0, legeres > 1, legeres > 2, legeres > 3, legeres > 4, graves > 0, graves > 1, critiques > 0],
-    }
-    formData.options.exportScriptarium = OptionsAvancees.isUsing(EXPORT_CSV_SCRIPTARIUM)
-    return formData
-  }
-
-  getMappingValues(context, actor) {
-    return Object.fromEntries(Mapping.getMapping().map(it => [it.column, {
-      colName: it.colName ?? it.column,
-      column: it.column,
-      rollClass: it.rollClass,
-      value: String(it.getter(actor, context))
-    }]))
-  }
-
-  getCompetences(categories) {
-    const competences = Mapping.getCompetencesCategorie(this.actor, categories)
-    if (competences.length == 0) {
-      return ''
-    }
-    const byCategories = Mapping.competencesByCategoriesByNiveau(competences, categories)
-    const listByCategories = Object.values(byCategories)
-      .map(it => it.competencesParNiveau)
-      .map(byNiveau => {
-        const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())
-        if (niveaux.length == 0) {
-          return undefined
-        }
-        const listCategorieByNiveau = niveaux.map(niveau => {
-          const list = byNiveau[niveau].sort(Misc.ascending(it => it.name))
-          return { niveau, list }
-        })
-        return Misc.concat(listCategorieByNiveau)
-      }).filter(it => it != undefined)
-
-    return Misc.concat(listByCategories)
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    this.html.find('.click-blessure-remove').click(async event =>
-      await this.actor.supprimerBlessure({
-        gravite: this.html.find(event.currentTarget).data('gravite')
-      })
-    )
-    this.html.find('.click-blessure-add').click(async event =>
-      await this.actor.ajouterBlessure({
-        gravite: this.html.find(event.currentTarget).data('gravite')
-        // event.currentTarget.attributes['data-gravite'].value
-      })
-    )
-    this.html.find('.button-export').click(async event => {
-      ExportScriptarium.INSTANCE.exportActors([this.actor],
-        `${this.actor.uuid}-${this.actor.name}`
-      )
-    })
-  }
-}

module/actor/export-scriptarium/export-scriptarium.js

@@ -1,78 +0,0 @@
-import { ACTOR_TYPES } from "../../item.js"
-import { Misc } from "../../misc.js"
-import { EXPORT_CSV_SCRIPTARIUM, OptionsAvancees } from "../../settings/options-avancees.js"
-import { Mapping } from "./mapping.js"
-
-const IMG_SCRIPTARIUM = '<img class="context-menu-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/scriptarium.svg">'
-
-export class ExportScriptarium {
-
-  static init() {
-    ExportScriptarium.INSTANCE = new ExportScriptarium()
-  }
-
-  constructor() {
-    Hooks.on("getActorDirectoryFolderContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-    Hooks.on("getActorDirectoryEntryContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-  }
-
-  onActorDirectoryMenu(actorDirectory, menus) {
-    menus.push({
-      name: 'Export Personnages <i class="fa-regular fa-file-csv"></i>',
-      icon: IMG_SCRIPTARIUM,
-      condition: (target) => game.user.isGM &&
-        OptionsAvancees.isUsing(EXPORT_CSV_SCRIPTARIUM) &&
-        this.$getActors(actorDirectory, target).length > 0,
-      callback: target => this.exportActors(this.$getActors(actorDirectory, target), this.$getTargetName(actorDirectory, target))
-    })
-  }
-
-  $getTargetName(actorDirectory, target) {
-    const li = target.closest(".directory-item")
-    const folderId = li.data("folderId")
-    const actorId = li.data("documentId")
-    return actorId
-      ? game.actors.get(actorId).name
-      : actorDirectory.folders.find(it => it.id == folderId).name
-  }
-
-  $getActors(actorDirectory, target) {
-    const li = target.closest(".directory-item")
-    const folderId = li.data("folderId")
-    const actorId = li.data("documentId")
-    const actors = actorId
-      ? [game.actors.get(actorId)]
-      : folderId
-        ? actorDirectory.folders.find(it => it.id == folderId).contents
-        : []
-    return actors.filter(it => it.type == ACTOR_TYPES.personnage)
-  }
-
-  exportActors(actors, targetName) {
-    const eol = '\n\r'
-    const header = Misc.join(this.getHeaderLine(), ';')
-    const actorLines = actors.map(actor => Misc.join(this.getActorLine(actor), ';'))
-    const data = Misc.join([header, ...actorLines], eol)
-    const filename = `scriptarium-${targetName?.slugify()}.csv`;
-    saveDataToFile(data, "text/csv;charset=windows-1252", `${filename}`);
-  }
-
-  getHeaderLine() {
-    return Mapping.getColumns()
-  }
-
-  getActorLine(actor) {
-    const values = Mapping.getValues(actor)
-    return values
-      .map(it => this.$escapeQuotes(it))
-      .map(it => it.replaceAll("\n", " ").replaceAll("\r", ""))
-  }
-
-  $escapeQuotes(it) {
-    it = '' + it
-    if (it.includes('"') || it.includes(';')) {
-      return `"${it.replaceAll('"', '\\"')}"`
-    }
-    return it
-  }
-}

module/actor/export-scriptarium/mapping.js

@@ -1,376 +0,0 @@
-import { Grammar } from "../../grammar.js"
-import { RdDItemArme } from "../../item-arme.js"
-import { RdDItemCompetence } from "../../item-competence.js"
-import { RdDItemSort } from "../../item-sort.js"
-import { ITEM_TYPES } from "../../item.js"
-import { Misc } from "../../misc.js"
-import { RdDTimestamp } from "../../time/rdd-timestamp.js"
-import { RdDBonus } from "../../rdd-bonus.js"
-import { TMRType } from "../../tmr-utility.js"
-
-
-export const CATEGORIES_COMPETENCES = [
-  "generale",
-  "particuliere",
-  "specialisee",
-  "connaissance",
-]
-export const CATEGORIES_DRACONIC = [
-  "draconic",
-]
-
-const CATEGORIES_COMBAT = [
-  "melee",
-  "tir",
-  "lancer"
-]
-
-const NIVEAU_BASE = {
-  "generale": -4,
-  "particuliere": -8,
-  "specialisee": -11,
-  "connaissance": -11,
-  "draconic": -11,
-  "melee": -6,
-  "tir": -8,
-  "lancer": -8,
-}
-
-class ColumnMappingFactory {
-  static createMappingArme(part, i) {
-    return { column: `arme_${part}_${i}`, getter: (actor, context) => Mapping.getArme(actor, context, part, i) }
-  }
-
-  static createMappingSort(part, i) {
-    return { column: `sort_${part}_${i}`, getter: (actor, context) => Mapping.getSort(actor, context, part, i) }
-  }
-}
-
-const NB_ARMES = 10
-const NB_SORTS = 20
-const TABLEAU_ARMES = [...Array(NB_ARMES).keys()]
-const TABLEAU_SORTS = [...Array(NB_SORTS).keys()]
-
-const MAPPING_BASE = [
-  { column: "ID", colName: 'ID', getter: (actor, context) => actor.id },
-  { column: "name", getter: (actor, context) => actor.name },
-  { column: "metier", colName: 'Métier', getter: (actor, context) => actor.system.metier },
-  { column: "biographie", colName: 'Biographie', getter: (actor, context) => actor.system.biographie },
-  { column: "taille", getter: (actor, context) => actor.system.carac.taille.value },
-  { column: "apparence", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.apparence.value },
-  { column: "constitution", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.constitution.value },
-  { column: "force", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.force.value },
-  { column: "agilite", rollClass: 'roll-carac', colName: 'Agilité', getter: (actor, context) => actor.system.carac.agilite.value },
-  { column: "dexterite", rollClass: 'roll-carac', colName: 'Dextérité', getter: (actor, context) => actor.system.carac.dexterite.value },
-  { column: "vue", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.vue.value },
-  { column: "ouie", rollClass: 'roll-carac', colName: 'Ouïe', getter: (actor, context) => actor.system.carac.ouie.value },
-  { column: "odoratgout", rollClass: 'roll-carac', colName: 'Odo-goût', getter: (actor, context) => actor.system.carac.odoratgout.value },
-  { column: "volonte", rollClass: 'roll-carac', colName: 'Volonté', getter: (actor, context) => actor.system.carac.volonte.value },
-  { column: "intellect", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.intellect.value },
-  { column: "empathie", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.empathie.value },
-  { column: "reve", rollClass: 'roll-carac', colName: 'Rêve', getter: (actor, context) => actor.system.carac.reve.value },
-  { column: "chance", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.chance.value },
-  { column: "melee", rollClass: 'roll-carac', colName: 'Mêlée', getter: (actor, context) => actor.system.carac.melee.value },
-  { column: "tir", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.tir.value },
-  { column: "lancer", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.lancer.value },
-  { column: "derobee", rollClass: 'roll-carac', colName: 'Dérobée', getter: (actor, context) => actor.system.carac.derobee.value },
-  { column: "vie", getter: (actor, context) => actor.system.sante.vie.max },
-  { column: "endurance", getter: (actor, context) => actor.system.sante.endurance.max },
-  { column: "plusdom", colName: '+dom', getter: (actor, context) => actor.system.attributs.plusdom.value },
-  { column: "protectionnaturelle", colName: 'Protection naturelle', getter: (actor, context) => actor.system.attributs.protection.value > 0 ? actor.system.attributs.protection.value : '' },
-  { column: "description", getter: (actor, context) => Mapping.getDescription(actor) },
-  { column: "armure", getter: (actor, context) => Mapping.getArmure(actor, context) },
-  { column: "protectionarmure", colName: 'Protection', getter: (actor, context) => Mapping.getProtectionArmure(actor, context) },
-  { column: "malus_armure", getter: (actor, context) => Mapping.getMalusArmure(actor, context) },
-  { column: "reve_actuel", rollClass: 'roll-reve-actuel', colName: 'Rêve actuel', getter: (actor, context) => actor.system.reve.reve.value },
-  { column: "vie_actuel", rollClass: 'jet-vie', getter: (actor, context) => actor.system.sante.vie.value },
-  { column: "endurance_actuel", rollClass: 'jet-vie', getter: (actor, context) => actor.system.sante.endurance.value },
-  { column: "esquive", getter: (actor, context) => Mapping.getEsquive(context) },
-  { column: "esquive_armure", getter: (actor, context) => Mapping.getEsquiveArmure(context) },
-  { column: "competences", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_COMPETENCES) },
-  { column: "draconic", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_DRACONIC) },
-]
-
-const MAPPING_ARMES = TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('name', i))
-  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('niveau', i)))
-  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('init', i)))
-  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('dommages', i)))
-const MAPPING_SORTS = TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('voie', i))
-  .concat(TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('description', i)))
-  .concat(TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('bonus', i)))
-const MAPPING = MAPPING_BASE
-  .concat(MAPPING_ARMES)
-  .concat(MAPPING_SORTS)
-
-export class Mapping {
-
-  static getMapping() {
-    return MAPPING
-  }
-
-  static getColumns() {
-    return MAPPING.map(it => it.column)
-  }
-
-  static getValues(actor) {
-    const context = Mapping.prepareContext(actor)
-    return MAPPING.map(it => it.getter(actor, context))
-  }
-  static getAsObject(actor) {
-    const context = Mapping.prepareContext(actor)
-    return Object.fromEntries(MAPPING.map(it => [it.column, {
-      colName: it.colName ?? it.column,
-      value: it.getter(actor, context)
-    }]))
-  }
-
-  static getValues(actor) {
-    const context = Mapping.prepareContext(actor)
-    return MAPPING.map(it => it.getter(actor, context))
-  }
-
-  static prepareContext(actor) {
-    return {
-      armes: Mapping.prepareArmes(actor),
-      armure: Mapping.prepareArmure(actor),
-      esquive: Mapping.prepareEsquive(actor),
-      sorts: Mapping.prepareSorts(actor)
-    }
-  }
-
-  static prepareArmes(actor) {
-    const armes = actor.items.filter(it => it.type == ITEM_TYPES.arme)
-    return armes.map(arme =>
-      [
-        arme.system.unemain ? Mapping.prepareArme(actor, arme, 'unemain') : undefined,
-        arme.system.deuxmains ? Mapping.prepareArme(actor, arme, 'deuxmains') : undefined,
-        !(arme.system.unemain || arme.system.deuxmains) ? Mapping.prepareArme(actor, arme, 'competence') : undefined,
-        arme.system.lancer != "" ? Mapping.prepareArme(actor, arme, 'lancer') : undefined,
-        arme.system.tir != "" ? Mapping.prepareArme(actor, arme, 'tir') : undefined
-      ]
-        .filter(it => it != undefined)
-    ).reduce((a, b) => a.concat(b), [])
-  }
-
-  static prepareArme(actor, arme, maniement) {
-    const nameCompArme = RdDItemArme.getCompetenceArme(arme, maniement)
-    const competence = actor.getCompetence(nameCompArme)
-    if (RdDItemCompetence.isNiveauBase(competence)) {
-      return undefined
-    }
-    const dmgArme = RdDItemArme.dommagesReels(arme, maniement)
-    const dommages = dmgArme + RdDBonus.bonusDmg(actor, maniement, dmgArme)
-    const categorie = Mapping.complementCategorie(arme, maniement)
-    return {
-      name: arme.name + categorie,
-      niveau: Misc.toSignedString(competence.system.niveau),
-      init: Mapping.calculBaseInit(actor, competence.system.categorie) + competence.system.niveau,
-      dommages: Misc.toSignedString(dommages),
-      competence: competence,
-      arme: arme
-    }
-  }
-
-  static complementCategorie(arme, maniement) {
-    switch (maniement) {
-      case 'unemain': return (arme.system.deuxmains) ? ' 1 main' : (arme.system.lancer||arme.system.tir) ? ' mêlée': '' 
-      case 'deuxmains': return (arme.system.unemain) ? ' 2 mains' : (arme.system.lancer||arme.system.tir) ? ' mêlée': '' 
-      case 'lancer': return (arme.system.unemain || arme.system.deuxmains || arme.system.tir) ? ' jet' : ''
-      case 'tir': return (arme.system.unemain || arme.system.deuxmains || arme.system.lancer) ? ' tir' : ''
-    }
-    return '' 
-  }
-
-  static calculBaseInit(actor, categorie) {
-    const mapping = MAPPING_BASE.find(it => it.column == categorie)
-    if (mapping) {
-      switch (categorie) {
-        case 'melee':
-        case 'tir':
-        case 'lancer':
-          const caracteristique = Number(actor.system.carac[categorie].value)
-          return Math.floor(caracteristique / 2)
-      }
-    }
-    return 0
-  }
-
-  static prepareArmure(actor) {
-    const armures = actor.itemTypes[ITEM_TYPES.armure].filter(it => it.system.equipe)
-    if (armures.length > 1) {
-      console.warn(`${actor.name} a équipé ${armures.length} armures, seule la première sera considérée`)
-    }
-    if (armures.length > 0) {
-      const armure = armures[0]
-      return {
-        name: armure.name,
-        protection: armure.system.protection,
-        malus: armure.system.malus ?? 0
-      }
-    }
-    return {
-      name: '',
-      protection: actor.system.attributs.protection.value,
-      malus: 0
-    }
-  }
-
-  static prepareEsquive(actor) {
-    const esquives = actor.getCompetences("Esquive")
-    if (esquives.length > 0) {
-      const esquive = esquives[0]
-      return {
-        name: esquive.name,
-        niveau: esquive.system.niveau,
-        competence: esquive
-      }
-    }
-    return undefined
-  }
-
-  static prepareSorts(actor) {
-    const codeVoies = Mapping.getCompetencesCategorie(actor, CATEGORIES_DRACONIC)
-      .map(it => RdDItemSort.getVoieCode(it))
-
-    return actor.itemTypes[ITEM_TYPES.sort].map(it => Mapping.prepareSort(it, codeVoies))
-      .sort(Misc.ascending(it => `${it.voie} : ${it.description}`))
-  }
-
-  static prepareSort(sort, voies) {
-    return {
-      voie: RdDItemSort.getCodeDraconic(sort, voies),
-      description: Mapping.descriptionSort(sort),
-      bonus: Mapping.bonusCase(sort)
-    }
-  }
-
-  static descriptionSort(sort) {
-    const ptSeuil = Array(sort.system.coutseuil).map(it => '*')
-    const caseTMR = sort.system.caseTMRspeciale.length > 0 ? Mapping.toVar(sort.system.caseTMRspeciale) : Misc.upperFirst(TMRType[sort.system.caseTMR].name)
-    const ptreve = Mapping.addSpaceToNonNumeric(sort.system.ptreve)
-    const diff = Mapping.addSpaceToNonNumeric(sort.system.difficulte)
-    return `${sort.name}${ptSeuil} (${caseTMR}) R${diff} r${ptreve}`
-  }
-
-  static addSpaceToNonNumeric(value) {
-    return Number.isNumeric(value) ? value : ' ' + Mapping.toVar(value)
-  }
-
-  static toVar(value) {
-    return value.replace('variable', 'var')
-  }
-
-  static bonusCase(sort) {
-    const list = RdDItemSort.bonuscaseStringToList(sort.system.bonuscase).sort(Misc.descending(it => it.bonus))
-    if (list.length > 0) {
-      const bonus = list[0]
-      return `+${bonus.bonus}% en ${bonus.case}`
-    }
-    return ''
-  }
-
-  static getDescription(actor) {
-    const sexe = actor.system.sexe
-    const sexeFeminin = sexe.length > 0 && sexe.charAt(0).toLowerCase() == 'f' ? 'Née' : 'Né'
-    const race = ['', 'humain'].includes(Grammar.toLowerCaseNoAccent(actor.system.race)) ? '' : (actor.system.race + ' ')
-    const heure = actor.system.heure
-    const hn = `${sexeFeminin} à l'heure ${RdDTimestamp.definition(heure).avecArticle}`
-    const age = actor.system.age ? `${actor.system.age} ans` : undefined
-    const taille = actor.system.taille
-    const poids = actor.system.poids
-    const cheveux = actor.system.cheveux ? `cheveux ${actor.system.cheveux}` : undefined
-    const yeux = actor.system.yeux ? `yeux ${actor.system.yeux}` : undefined
-    const beaute = actor.system.beaute ? `beauté ${actor.system.beaute}` : undefined
-    const list = [race, hn, age, taille, poids, cheveux, yeux, beaute]
-    return Misc.join(list.filter(it => it), ', ')
-  }
-
-  static getArmure(actor, context) {
-    return context.armure?.name ?? ''
-  }
-
-  static getProtectionArmure(actor, context) {
-    const naturelle = Number(actor.system.attributs.protection.value)
-    if (context?.armure?.protection == undefined) {
-      return naturelle
-    }
-    if (Number.isNumeric(context?.armure?.protection)) {
-      return Number(context?.armure?.protection ?? 0) + naturelle
-    }
-    return context?.armure.protection + (naturelle > 0 ? `+${naturelle}` : '')
-  }
-
-  static getMalusArmure(actor, context) {
-    return context?.armure?.malus ?? 0
-  }
-
-  static getEsquive(context) {
-    if (context.esquive) {
-      return Misc.toSignedString(context.esquive.niveau)
-    }
-    return ''
-  }
-  static getEsquiveArmure(context) {
-    if (context.esquive) {
-      const niveau = context.esquive.niveau + context.armure.malus
-      return Misc.toSignedString(niveau)
-    }
-    return ''
-  }
-
-  static getCompetences(actor, categories) {
-    const competences = Mapping.getCompetencesCategorie(actor, categories)
-    if (competences.length == 0) {
-      return ''
-    }
-    const byCategories = Mapping.competencesByCategoriesByNiveau(competences, categories)
-    const txtByCategories = Object.values(byCategories)
-      .map(it => it.competencesParNiveau)
-      .map(byNiveau => {
-        const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())
-        if (niveaux.length == 0) {
-          return ''
-        }
-        const txtCategorieByNiveau = niveaux.map(niveau => {
-          const names = Misc.join(byNiveau[niveau].map(it => it.name).sort(Misc.ascending()), ', ')
-          return names + ' ' + Misc.toSignedString(niveau)
-        })
-        const txtCategorie = Misc.join(txtCategorieByNiveau, ' / ')
-        return txtCategorie
-      }).filter(it => it != '')
-
-    return Misc.join(txtByCategories, ' / ')
-  }
-
-  static competencesByCategoriesByNiveau(competences, categories) {
-    return categories.map(c => {
-      return {
-        categorie: c,
-        competencesParNiveau: Misc.classify(
-          competences.filter(comp => comp.system.categorie == c),
-          comp => comp.system.niveau)
-      }
-    })
-  }
-
-  static getArme(actor, context, part, numero) {
-    if (numero < context.armes.length) {
-      return context.armes[numero][part] ?? ''
-    }
-    return ''
-  }
-
-  static getCompetencesCategorie(actor, categories) {
-    return actor.itemTypes[ITEM_TYPES.competence]
-      .filter(it => categories.includes(it.system.categorie))
-      .filter(it => !RdDItemCompetence.isNiveauBase(it))
-  }
-
-  static getSort(actor, context, part, numero) {
-    if (numero < context.sorts.length) {
-      return context.sorts[numero][part]
-    }
-    return ''
-  }
-}
-

module/actor/random/app-personnage-aleatoire.js

@@ -1,188 +0,0 @@
-import { SHOW_DICE } from "../../constants.js";
-import { Misc } from "../../misc.js";
-import { RdDCarac } from "../../rdd-carac.js";
-import { RdDDice } from "../../rdd-dice.js";
-import { RdDNameGen } from "../../rdd-namegen.js";
-import { RdDTimestamp } from "../../time/rdd-timestamp.js";
-
-const PATHS = [
-  'name',
-  'system.sexe',
-  'system.age',
-  'system.taille',
-  'system.poids',
-  'system.main',
-  'system.heure',
-  'system.cheveux',
-  'system.yeux'
-]
-
-const RANDOM_VALUES = {
-  'system.sexe': { 'masculin': 1, 'féminin': 1 },
-  'system.main': { 'droitier': 51, 'gaucher': 15, 'ambidectre': 6 },
-  'system.cheveux': { 'noirs': 2, 'bruns': 5, 'châtains clair': 5, 'blonds': 4, 'blonds très clair': 1, 'roux carotte': 1, 'roux cuivré': 3 },
-  'system.yeux': { 'noirs': 2, 'noisettes': 3, 'bruns vert': 4, 'verts': 3, 'bleus clair': 3, 'bleus gris': 2, 'gris': 1, 'mauves': 1, 'indigos': 1 },
-}
-
-export class AppPersonnageAleatoire extends FormApplication {
-  static preloadHandlebars() {
-    loadTemplates([
-      'systems/foundryvtt-reve-de-dragon/templates/actor/random/champ-aleatoire.hbs',
-    ])
-  }
-
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor/random/app-personnage-aleatoire.hbs",
-      title: "Génération aléatoire",
-      width: 'fit-content',
-      height: 'fit-content',
-      classes: ['app-personnage-aleatoire'],
-      popOut: true,
-      resizable: true
-    }, { inplace: false })
-  }
-
-  constructor(actor) {
-    super({})
-    this.actor = actor
-    this.current = foundry.utils.duplicate(actor)
-    this.checked = {
-      'name': false,
-      'system.sexe': true,
-      'system.age': true,
-      'system.taille': true,
-      'system.poids': true,
-      'system.main': true,
-      'system.heure': true,
-      'system.cheveux': true,
-      'system.yeux': true
-    }
-  }
-
-  async getData(options) {
-    return foundry.utils.mergeObject(await super.getData(options), {
-      actor: this.actor,
-      current: this.current,
-      checked: this.checked,
-      options: { isGM: game.user.isGM }
-    })
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html)
-    this.html = html
-    this.html.find("button.button-cancel").click(async event => await this.close())
-    this.html.find("button.button-apply").click(async event => await this.onApply())
-    this.html.find("input.current-value").change(async event => await this.onChange(event))
-    this.html.find("div.random-field[data-path='system.heure'] select.current-value").change(async event => await this.onChange(event))
-    this.html.find("a.random").click(async event => await this.onRandom(event))
-    this.html.find("a.reset").click(async event => await this.onReset(event))
-    this.html.find("a.randomize-selected").click(async event => await this.onRandomizeSelected())
-    this.html.find("input.check-for-random").click(async event => await this.onCheckForRandom(event))
-  }
-  async _updateObject(event, formData) { }
-
-  async onApply() {
-    const updates = Object.fromEntries(
-      PATHS.filter(path => game.user.isGM || path != 'name')
-        .map(path => [path, this.current[path]])
-    )
-    await this.actor.update(updates)
-    await this.close()
-  }
-
-  getPath(selector) {
-    const fields = this.html.find(selector).parents("div.random-field:first")
-    return fields[0].attributes['data-path'].value
-  }
-
-  async onChange(event) {
-    const path = this.getPath(event.currentTarget)
-    this.current[path] = event.currentTarget.value
-  }
-
-  async onRandom(event) {
-    const path = this.getPath(event.currentTarget)
-    await this.setRandom(path);
-    this.render()
-  }
-
-  async onReset(event) {
-    const path = this.getPath(event.currentTarget)
-    this.current[path] = this.actor[path]
-    await this.render()
-  }
-
-  async onCheckForRandom(event) {
-    const path = this.getPath(event.currentTarget)
-    this.checked[path] = event.currentTarget.checked
-    this.render()
-  }
-
-  async onRandomizeSelected() {
-    const paths = this.html.find("input.check-for-random:checked")
-      .parents("div.random-field")
-      .toArray()
-      .map(it => it.attributes['data-path'].value)
-    await Promise.all(paths.map(path => this.setRandom(path)))
-    this.render()
-  }
-
-  async setRandom(path) {
-    this.current[path] = await this.random(path);
-  }
-
-  async random(path) {
-    switch (path) {
-      case 'name':
-        return await RdDNameGen.generate()
-      case 'system.sexe':
-      case 'system.main':
-      case 'system.cheveux':
-      case 'system.yeux':
-        return await this.randomFromMap(RANDOM_VALUES[path])
-      case 'system.poids':
-        return await this.randomPoids()
-      case 'system.taille':
-        return await this.randomTaille()
-      case 'system.age':
-        return await RdDDice.rollTotal('(2d4kl)*10 + 1d7xo + 2d20kl')
-      case 'system.heure':
-        return RdDTimestamp.defHeure(await RdDDice.rollHeure({ rollMode: "selfroll", showDice: SHOW_DICE })).key
-    }
-    return 'unknown'
-  }
-
-  async randomFromMap(valuesMap) {
-    const max = Object.values(valuesMap).reduce(Misc.sum(), 0)
-    const total = await RdDDice.rollTotal(`1d${max}`)
-    let sum = 0
-    for (let entry of Object.entries(valuesMap)) {
-      sum = sum + entry[1]
-      if (sum >= total) {
-        return entry[0]
-      }
-    }
-    return Object.keys(valuesMap)[0]
-  }
-
-  async randomPoids() {
-    const caracTaille = RdDCarac.getCaracDerivee(this.current.system.carac.taille.value)
-    const range = caracTaille.poidsMax - caracTaille.poidsMin + 1
-    const total = await RdDDice.rollTotal(`1d${range} + ${caracTaille.poidsMin}`)
-    return total + ' kg'
-  }
-
-  async randomTaille() {
-    const caracTaille = RdDCarac.getCaracDerivee(this.current.system.carac.taille.value)
-    const base = this.current.system.carac.taille.value * 2 + 60 + caracTaille.poidsMin
-    const variation = Math.floor((caracTaille.poidsMax - caracTaille.poidsMin + base / 5) / 2)
-    const total = await RdDDice.rollTotal(`2d${variation} + ${base}`)
-    const cm = total % 100
-    const m = (total - cm) / 100
-    return `${m}m${cm}`
-  }
-
-
-}

module/actor/vehicule-sheet.js

@@ -1,49 +0,0 @@
-import { RdDUtility } from "../rdd-utility.js";
-import { RdDBaseActorSheet } from "./base-actor-sheet.js";
-
-/* -------------------------------------------- */
-export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
-      width: 640, height: 720,
-    }, { inplace: false })
-  }
-
-  /* -------------------------------------------- */
-  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) {
-    super.activateListeners(html);
-    if (!this.options.editable) return;
-
-    this.html.find('.resistance-moins').click(async event => {
-      this.actor.vehicleIncDec("resistance", -1);
-    });
-    this.html.find('.resistance-plus').click(async event => {
-      this.actor.vehicleIncDec("resistance", 1);
-    });
-    this.html.find('.structure-moins').click(async event => {
-      this.actor.vehicleIncDec("structure", -1);
-    });
-    this.html.find('.structure-plus').click(async event => {
-      this.actor.vehicleIncDec("structure", 1);
-    });
-  }
-
-}