Utilisation du nom du Nom du token

suite (pour les encaissements)

.gitea/workflows/release.yaml

@@ -1,76 +0,0 @@
-name: Release Creation
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."
-
-    #- uses: actions/checkout@v3
-    - uses: RouxAntoine/checkout@v3.5.4
-      with:
-        ref: 'v13'
-
-    # get part of the tag after the `v`
-    - name: Extract tag version number
-      id: get_version
-      uses: battila7/get-version-action@v2
-
-    # Substitute the Manifest and Download URLs in the module.json
-    - name: Substitute Manifest and Download Links For Versioned Ones
-      id: sub_manifest_link_version
-      uses: microsoft/variable-substitution@v1
-      with:
-        files: 'system.json'
-      env:
-        version: ${{steps.get_version.outputs.version-without-v}}
-        url: https://www.uberwald.me/gitea/${{gitea.repository}}
-        manifest: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json
-        download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/rddsystem.zip
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '18'  # Use the node version your project requires
-
-    - name: Install dependencies
-      run: npm install
-
-    - name: Build the compendiums
-      run: node ./tools/packCompendiumsToDist.mjs
-
-    # Create a zip file with all files required by the module to add to the release
-    - run: |
-         apt update -y
-         apt install -y zip
-
-    - run: zip -r ./rddsystem.zip system.json template.json README.md LICENSE.txt assets/ css/ fonts/ icons lang/ module/ packs/ pic/ sounds/ styles/ templates/
-
-    - name: setup go
-      uses: actions/setup-go@v3
-      with:
-        go-version: '>=1.20.1'
-
-    - name: Use Go Action
-      id: use-go-action
-      uses: https://gitea.com/actions/release-action@main
-      with:
-        files: |-
-          ./rddsystem.zip
-          system.json
-        api_key: '${{secrets.ALLOW_PUSH_RELEASE}}'
-
-    - name: Publish to Foundry server
-      uses: djlechuck/foundryvtt-publish-package-action@v1
-      with:
-        token: ${{ secrets.FOUNDRYVTT_RELEASE_TOKEN }}
-        id: 'foundryvtt-reve-de-dragon'
-        version: ${{github.event.release.tag_name}}
-        manifest: 'https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json'
-        notes: 'https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v13/changelog.md'
-        compatibility-minimum: '13'
-        compatibility-verified: '13'

.gitlab/issue_templates/Bug.md

@@ -0,0 +1,14 @@
+Pour que le bug soit traité, merci de préciser quelques détails.
+
+### Environment
+
+> Indiquez quelques éléments de votre installation
+
+* Foundry VTT Version: (Example 0.5.4)
+* OS: [Windows, MacOS, Linux (which distro)]
+* Modules ?: Liste des modules utilisés
+
+### Description du problème
+
+
+/label ~Bug ~Nonrepro

.gitlab/issue_templates/Feature.md

@@ -0,0 +1,14 @@
+
+### Résumé de la fonctionnalité
+
+> Décrivez de manière simple et concise la fonction que vous voulez voir ajoutée.
+
+### Expérience Utilisateur
+
+> Indiquez ce que l'utilisateur aura comme bénéfice avec cette fonction.
+
+### Priority/Importance
+
+> Selon vous, quelle est l'importance de cette fonctionnalité.
+
+/label ~Feature

assets/ui/ajout-competence.svg

@@ -1,78 +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="svg8"
-   sodipodi:docname="add-skill.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2138"
-     inkscape:window-height="1465"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="1.0150849"
-     inkscape:cx="466.02267"
-     inkscape:cy="44.586362"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
-  <path
-     d="M0 0h512v512H0z"
-     fill="url(#pattern)"
-     fill-opacity="0.5"
-     id="path2" />
-  <g
-     class=""
-     transform="translate(-81.40366,-2.6174234)"
-     id="g6">
-    <path
-       d="m 119.1,25 v 0.1 c -25,3.2 -47.1,32 -47.1,68.8 0,20.4 7.1,38.4 17.5,50.9 L 99.7,157 84,159.9 c -13.7,2.6 -23.8,9.9 -32.2,21.5 -8.5,11.5 -14.9,27.5 -19.4,45.8 -8.2,33.6 -9.9,74.7 -10.1,110.5 h 44 l 11.9,158.4 h 96.3 L 185,337.7 h 41.9 c 0,-36.2 -0.3,-77.8 -7.8,-111.7 -4,-18.5 -10.2,-34.4 -18.7,-45.9 -8.6,-11.4 -19.2,-18.7 -34.5,-21 l -16,-2.5 L 160,144 c 10,-12.5 16.7,-30.2 16.7,-50.1 0,-39.2 -24.8,-68.8 -52.4,-68.8 -2.9,0 -4.7,-0.1 -5.2,-0.1 z M 311,55 v 48 H 208 v 18 h 103 v 158 h -55 v 18 h 55 V 407 H 208 v 18 h 103 v 32 h 80.8 c -0.5,-2.9 -0.8,-5.9 -0.8,-9 0,-3.1 0.3,-6.1 0.8,-9 H 329 V 297 h 62.8 c -0.5,-2.9 -0.8,-5.9 -0.8,-9 0,-3.1 0.3,-6.1 0.8,-9 H 329 V 73 h 62.8 c -0.5,-2.92 -0.8,-5.93 -0.8,-9 0,-3.07 0.3,-6.08 0.8,-9 z m 129,202 c -17.2,0 -31,13.8 -31,31 0,17.2 13.8,31 31,31 17.2,0 31,-13.8 31,-31 0,-17.2 -13.8,-31 -31,-31 z m 0,160 c -17.2,0 -31,13.8 -31,31 0,17.2 13.8,31 31,31 17.2,0 31,-13.8 31,-31 0,-17.2 -13.8,-31 -31,-31 z"
-       fill="#000000"
-       fill-opacity="0.8"
-       transform="matrix(0.6,0,0,0.6,102.4,102.4)"
-       id="path4"
-       sodipodi:nodetypes="ccsccccccccccccccccssccccccccccccccccsccccsccccsccssssssssss" />
-  </g>
-  <g
-     class=""
-     transform="translate(124.63542,-119.78046)"
-     id="g6-1">
-    <path
-       d="m 158.81777,136.77499 c -9.48,32.22 -28.656,28.8 -47.61,26.04 21.39,6.12 29.61,22.38 25.998,47.64 7.596,-27.6 25.572,-31.56 47.652,-26.04 -22.56,-7.26 -34.14,-21.24 -26.04,-47.64 z m -41.76,76.08 c 5.496,10.02 4.578,18.06 -3.366,24 7.476,-4.14 14.91,-8.58 23.946,3.36 -7.542,-9.72 -4.92,-17.4 3.366,-24 -8.352,5.82 -16.482,6.96 -23.946,-3.36 z m 82.32,0.18 c 6.84,16.08 -0.3,24.78 -13.02,30.54 13.62,-5.1 24.48,-2.7 30.54,13.02 -7.62,-19.08 2.88,-24.72 13.02,-30.54 -12.6,5.1 -22.68,0.54 -30.54,-13.02 z m -52.776,31.2 c 9.396,34.68 0.516,58.86 -28.392,71.1 26.076,-7.08 52.428,-15.12 71.208,28.44 -15.84,-35.58 -2.04,-57.24 28.38,-71.28 -30,11.52 -55.86,9 -71.196,-28.26 z"
-       fill="#000000"
-       fill-opacity="0.8"
-       id="path4-2"
-       sodipodi:nodetypes="cccccccccccccccccccc"
-       style="stroke-width:0.6" />
-  </g>
-</svg>

changelog.md

@@ -1,227 +1,4 @@
-# 13.0
-
-## 13.0.3 - La dernière auberge d'Illysis
-
-- On peut de nouveau acheter aux commerces
-- La description des Grizzal a des espaces
-- Corrections v13
-  - Affichage des images et noms d'objets en ligne
-  - affichage des compétences de créature sur une ligne
-  - Affichage des informations d'acteur sur une ligne dans l'astrologie
-  - Affichage des résultat de recherche
-
-## 13.0.0 - Le début de l'errance d'Illysis
-
-- Migration vers la version 13 de Foundry
-
 # 12.0
-## 12.0.50 - Le sommeil d'Astrobazzarh
-- Le don de double rêve n'interrompt plus le sommeil toutes les heures
-- la perte de fatigue à la descente des TMR est visible immédiatement
-
-## 12.0.49 - La deuxième lame d'Astrobazzarh
-- Corrections
-  - les défenses particulières sont correctement affichées
-  - les vieux boucliers (sans catégorie de parade car créés il y a longtemps) peuvent parer...
-  - Les attaques à distance n'ont pas de difficulté libre
-
-## 12.0.48 - La chèvre d'Astrobazzarh
-- le Bandersnatch a une protection de 10
-- la consistance chèvre est maintenant possible dans les recettes
-  alchimiques (et toutes les consistances avec accents)
-- un échec au lancement d'un sort pour le mettre en réserve brise
-  la concentration du haut-rêvant
-- Correction: les réussites particulières fonctionnent avec les caractéristiques dérivées
-
-## 12.0.47
-- Correction sur les mise à jour en cascade -
-- Correction sur le force rendering après un changement de competence
-
-## 12.0.46 - Le double demi d'Astrobazzarh
-- correction des raffraîchissement lors du sommeil qui empêchait de dormir
-  plusieurs heures
-- Si la fatigue n'est pas utilisée, les rounds dans les TMR font perdre de l'endurance (au lieu d'en gagner)
-- les TMRs se ferment correctement quand la fatigue maximale est dépassée
-- le message de lancement de sort en réserve donne la description du sort
-- suppression de double-messages lors de la fermeture des TMR
-
-## 12.0.45 - Les errements d'Astrobazzarh, encore
-
-- La difficulté des méditations n'augmente plus en cas de réussite et d'échec normal
-- Renommage du Bouton pour révéler/masquer le demi-rêve
-
-## 12.0.44 - Les errements d'Astrobazzarh, suite
-
-- on peut de nouveau dormir et se réveiller reposé
-- les possessions utilisent maintenant correctement le rêve actuel
-- les sorts variables ne causent plus de soucis de voie pour le lancement de sorts
-- les acteurs ayant un sort avec un coût de rêve entier ne sont plus considérés
-  comme pouvant avoir un rêve variable
-
-## 12.0.42 - Les errements d'Astrobazzarh
-
-- Correction de différentes automatisations de combat incorrectes
-- Correction des jets `@roll[vue/-2]` qui tentaient de chercher une compétence -2 (à cause des armes à 1/2 mains)
-
-## 12.0.41 - La loupe d'Astrobazzarh
-- On peut de nouveau effectuer des tirages cachés
-- Le stress transformé est bien diminué lorsqu'on met le stress dans une compétence
-
-## 12.0.40 - Les mains d'Astrobazzarh
-- correction des attaques particulières en combat
-- correction de message sur les min/max liés aux modificateurs de races (s'applique uniquement sur la taille)
-
-## 12.0.39 - Les mains d'Astrobazzarh
-- les armes à 1 ou 2 mains fonctionnent dans les liens de jets de dés
-- commande `/jet` pour poster une demande de jet de dés
-
-## 12.0.38 - Les prévisions d'Astrobazzarh
-- Correction de modifications de personnages qui ne s'affichaient pas:
-  - changements d'endurance/vie/fatigue, transformé, ...
-- Migration des compétences "Ecriture" en "Écriture" dans les tâches, livres, oeuvres et méditations
-- Correction des jets de compétences de créatures
-- Premières préparations techniques pour le passage à Founry v13
-  - liste des impacts d'un jet de dés (expérience, points de tâche, ...)
-  - utilisation de l'extension hbs pour tous les fichiers handlebars
-
-## 12.0.37 - Les enchantements d'Astrobazzarh
-- les potions ont un état, seules les potions liquides sont enchantables
-- les lancements de sorts du jour sont conservés jusqu'à chateau dormant
-- lorsqu'un joueur souhaite enchanter une potion, les sorts d'enchantements/purification/permanence doivent avoir été lancés auparavant
-- on peut enchanter des gemmes exactement comme des potions
-
-## 12.0.36 - L'alchimie d'Astrobazzarh
-- Nouveautés
-  - ajout d'un bouton pour enchanter les potions
-  - standardisation des boutons d'actions sur les items
-  - utilisations d'icones pour les actions de l'inventaire
-- Corrections:
-  - la commande /tmra sans paramètres fonctionne
-  - les jets d'encaissement depuis le tchat fonctionnent
-  - affichage de la vie/endurance en cas de blessures et remise à neuf
-  - les queues durant 12 heures ajoutées début Vaisseau ne durent plus 24 heures
-- Compendiums
-  - Corrections des remedes enchantables
-  - Corrections de descriptions pour proposer les jet de dés
-
-## 12.0.35 - La Solution d'Astrobazzarh
-- Fix problème d'initialisation des feuilles d'items
-
-## 12.0.34 - la tête d'Astrobazzarh
-- support de liens "jets de dés"
-  - on peut ajouter des liens "jet de dés" dans les journaux, descriptions, notes, maladresses, ...
-  - avec la syntaxe `@roll[...]` on peut ajouter le lien vers:
-    - un jet de caractéristique/compétence `@roll[carac/competence/difficulte]` / `@roll[carac/difficulte]` / `@roll[carac/competence]`
-    - une formule foundry `@roll[2d6]` pour lancer 2d6
-    - une manipulation alchimique `@roll[couleur vert-bleu]`
-  - les liens "jet avec caractéristiques" s'appliquent:
-    - à tous les tokens sélectionnés
-    - sinon, à l'acteur propriétaire (dans le cas d'un Item) ou à l'acteur courant
-    - sinon, au personnage du joueur
-  - on peut poster les liens dans le tchat pour proposer un jet aux joueurs
-- gestion des blocs secrets dans les descriptions
-
-## 12.0.33 - la vieillesse d'Astrobazzarh
-- retour de l'expérience pour les joueurs
-- suppression du message "Pas de caractéristique" sur les jets d'odorat-goût
-
-## 12.0.32 - les rêveries d'Astrobazzarh
-- Ajout des Items Race pour gérer les ajustements liés aux races
-
-## 12.0.31 - le mausolée d'Astrobazzarh
-- Correction: les automatisation de combat jouer-MJ fonctionnentde nouveau
-
-## 12.0.30 - le cauchemar d'Astrobazzarh
-- calcul automatique du niveau des entités selon leur rêve
-- la description des créatures venimeuses contient un lien vers leur venin
-- Correction: les messages de combats ne marchaient plus (Changement combiné Foundry + rêve de Dragon)
-
-## 12.0.29 - L'indexation d'Astrobazzarh
-- les liens dans la descriptions des sorts pointent vers les sorts du compendium
-- la description du chrasme contient le lien vers son venin plutôt qu'un tableau
-
-## 12.0.28 - Les réserves d'Astrobazzarh
-- possibilité de mettre en réserve depuis un sort connu
-
-## 12.0.27 - Les vêtements d'Astrobazzarh
-- Ajout de la liste des armures dans l'onglet caractéristiques
-- Ajout d'une option pour choisir une carte des TMR alternatives
-- Le Gardien peut créer des sorts en réserve parmi les sorts d'un personnage
-- Bouton pour ajouter des compétences aux créatures/entités
-- Bouton pour ajouter un personnage accordé aux entités de cauchemar
-- Correction du choix d'une cible parmi toutes les cibles pour les combats
-- Correction des ajouts de blessures (prise en compte de l'endurance et des contusions)
-- Correction des rituels de Détection et Lecture d'Aura des personnages prétirés
-- Correction des invocations
-  - support de "personnages" n'ayant pas toutes les compétences
-  - ajout de lien entre le sort et la créature
-  - correction des liens vers les journaux
-  - limitation aux compétences listées
-  - acteur non lié par défaut
-- Correction des compendiums
-  - l'import de personnages depuis un compendium respecte les acteurs liés/non-liés
-  - les modèles de voyageurs sont liés par défaut
-  - les modèles de personnages non joueurs sont non-liés par défaut
-
-## 12.0.26 - Astrobazzarh le Haut-rêvant
-- bouton pour le don de haut-rêve en un clic
-- les compétences de draconic ne sont plus précédées de "Voie de"
-  - migration des compétences & compendiums
-- Correction feuille simplifiée qui ne s'affichait pas en cas de sort variable
-
-## 12.0.24 - Les ajustements d'Astrobazzarh
-- amélioration
-  - meilleure gestion des noms des voies de draconic
-  - affichage du détail des sorts avec le nom de voie, 'court', la difficulté, le coût
-- corrections
-  - les tas dans les conteneurs peuvent être désempilés sans rendre le conteneur inutilisable
-  - les conteneurs ne peuvent plus être empilés (pour éviter que le contenu de Schroedinger quand on les sépare)
-  - on peut maintenant saisir et supprimer les bonus de cases de manière intuitive
-
-## 12.0.23 - La bibliothèque d'Astrobazzarh
-- corrections mineures
-  - meilleure gestion de la parade des armes naturelles
-  - cas de "User lacks permission to update" pour les blessures et les StatusEffects
-  - risque de message d'encaissement non affiché
-  - support de sorts à voies multiples
-- correction de compendiums
-  - résistance des armes mise à jour
-  - voies multiples pour las sorts de Lecture d'aura, Détection d'aura et Annulation de magie
-- améliorations "Scriptarium"
-  - recherche des compétences sans accents pour permettre les noms accentués (standard Scriptarium)
-  - affichage r1+ des sorts à coût variable dans la feuille simplifiée
-  - affichage de Corps à corps pour le combat à mains nues dans la feuille simplifiée
-  - dans les compendiums, les compétences Écriture et Épée ont une majuscule accentuée. Les Épée dans le compendium d'équipements référence le nom de compétence accentué.
-
-## 12.0.21 - La nomination d'Astrobazzarh
-- Les noms pour les messages dans le tchat sont maintenant ceux des tokens plutôt que ceux des acteurs
-- Fix: le choix des effets dans les options s'affiche correctement
-
-## 12.0.20 - Le tableau d'Astrobazzarh
-- Ecran d'accueil officiel Scriptarium
-
-## 12.0.19 - La témérité d'Astrobazzarh
-- Fix
-  - les défenses des créatures sont correctement filtrées
-  - le lancer d'initiative pour tous les personnages/PNJs fonctionne correctement
-  - les lieux et commerces n'ont pas d'initiative
-
-## 12.0.18 - A la barbe d'Astrobazzarh
-- Améliorations sur la feuille de PNJ simplifiée
-  - Ajout du portrait
-  - Ajout du corps à corps
-  - Affichage du niveau d'esquive
-  - Un clic sur l'initiative permet de lancer l'initiative
-  - les boutons +/- pour la vie, l'endurance et la fatigue changent si on est à la valeur normale
-  - un clic sur l'endurance effectue un jet d'endurance
-- Fix
-  - les achats des commerces sont de nouveau possibles
-  - la commande /astro fonctionne de nouveau
-  - le nombre d'utilisations d'items est réinitialisé à chaque round et fin de combat
-  - la difficulté de parade pour les armes à distances n'est plus indiquée
-  - les propositions d'armes de parade sont corrigées
-- Ajout d'un indicateur pour les armes de parade nécessitant une significative
-
 ## 12.0.16 - Le secret d'Astrobazzarh
 - Fix: les jets envoyés messages uniquement au MJ ne sont plus envoyés à tous les autres joueurs (et dupliqués)
 - Les noms affichés dans les automatisations de combat sont maintenant ceux des tokens plutôt que ceux des acteurs
@@ -259,9 +36,11 @@
   - encodage de l'export en windows-1252
   - export de l'esquive avec armure et sans armure
 
-## 12.0.9 - 12.0.10 - Le scriptorium d'Astrobazzarh
+## 12.0.10 - Le scriptorium d'Astrobazzarh
 - corrections de l'export scriptarium
-- ajout d'une fonction avancée pour un exporter "scriptarium" des personnages
+
+## 12.0.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/...
@@ -288,7 +67,7 @@
 
 ## 12.0.6 - Le bazar d'Astrobazzarh
 - Corrections de l'inventaire en bazar:
-  - un problème pouvait survenir en déplaçant les objets
+  - 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
@@ -296,7 +75,7 @@
     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"
+- Les messages pour les tirages dans le compendium utilisent le "roll mode" 
   courant pour leur visibilité
 - Fix: restaurer la compatibilité Foundry 11
 
@@ -391,7 +170,7 @@
 
 ## 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
+- 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
@@ -511,7 +290,7 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
   - 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
+  - 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
@@ -618,3 +397,4 @@ Vu qu'elles ne peuvent pas être utilisées, permet de savoir pourquoi
 - correction des achats par le MJ sans acteur sélectionné
 
 Cf branche v10 pour l'historique des versions 10
+

dev-notes.md

@@ -0,0 +1,61 @@
+# Actor notes
+
+> The Actor#getData default implementation gives you the following for use in sheet rendering:
+
+```
+  actor -> the Actor instance
+  data -> a cloned copy of Actor#data
+  items -> a cloned copy of Actor#data#items
+  effects -> a cloned copy of Actor#data#effects
+```
+
+> if all you need is a safe copy of `Actor#data`, you'll be much better off by simply defining your own function and avoiding all the wasted work that the parent class does which will slow down your sheet
+```js
+getData(options) {
+  return {
+    data: foundry.utils.deepClone(this.object.data)
+  }
+}
+```
+
+who knows, maybe you don't even need to copy your actor data, skip the copy and it's even faster:
+```js
+getData(options) {
+  return {
+    data: this.object.data
+  }
+}
+```
+
+
+Atropos19/02/2021
+There are two recommended ways to create owned items in 0.8.0:
+```js
+await Item.create(itemData, {parent: actor});
+await actor.createEmbeddedDocuments("Item", itemDataArray);
+```
+
+
+You can update an embedded item in one of two ways:
+```js
+//Method 1:
+
+const item = actor.items.get(itemId);
+item.update(data);
+
+//Method 2:
+actor.updateEmbeddedDocuments("Item", [{_id: itemId, ...}]);
+```
+
+
+I noticed adding an ActiveEffect to an actor in code using
+
+```js
+this.createEmbeddedDocuments('ActiveEffect', [effet], options);
+this.applyActiveEffects();
+```
+
+Atropos — Aujourd’hui à 14:42
+Two notes on this:
+1. You don't actually need to call this.applyActiveEffects() because this will happen automatically whenever an effect is created/updated/deleted
+2. If you want to suppress the automatic display of the sheet for the newly created document, you can pass options.renderSheet = false as part of your options object

gulpfile.js

@@ -1,37 +0,0 @@
-const gulp = require('gulp');
-const less = require('gulp-less');
-
-function onError(err) {
-  util.log(util.colors.red.bold('[ERROR LESS]:'),util.colors.bgRed(err.message));
-  this.emit('end');
-};
-
-/* ----------------------------------------- */
-/*  Compile LESS
-/* ----------------------------------------- */
-function compileLESS() {
-  return gulp.src("less/foundryvtt-reve-de-dragon.less")
-      .pipe(less()).on('error',console.log.bind(console))
-      .pipe(gulp.dest("./css"))
-}
-const css = gulp.series(compileLESS);
-
-/* ----------------------------------------- */
-/*  Watch Updates
-/* ----------------------------------------- */
-const SIMPLE_LESS = ["less/*.less", "less/item/*.less"];
-
-function watchUpdates() {
-  gulp.watch(SIMPLE_LESS, css);
-}
-
-/* ----------------------------------------- */
-/*  Export Tasks
-/* ----------------------------------------- */
-
-exports.default = gulp.series(
-    gulp.parallel(css),
-    watchUpdates
-);
-exports.css = css;
-exports.watchUpdates = watchUpdates;

icons/tmr/attache.svg

@@ -1,191 +1 @@
-<?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="attache.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="1769"
-     inkscape:window-height="1333"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     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"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1">
-    <path
-       d="m 90.53,23 c -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.5 l 53.69,53.688 c -21.425,19.696 -44,38.257 -67.44,55.937 l 30.126,30.125 c 18.734,-22.545 37.953,-44.474 57.844,-65.53 L 364.188,403.688 C 312.343,444.132 243.322,457.526 171.375,446.25 L 173,424.906 72.47,404.47 l 95.405,88.405 1.97,-26 c 86.593,36.97 177.603,34.61 241.343,-11.75 l 63.062,21.313 -21.47,-63.594 c 44.61,-63.62 46.408,-153.412 9.908,-238.875 l 26.03,-1.97 -88.406,-95.375 20.438,100.53 21.344,-1.624 c 11.278,71.983 -2.168,141.017 -42.656,192.876 L 229.656,198.656 c 21.075,-20.34 42.93,-39.665 65.78,-57.72 l -30.123,-30.124 c -17.015,24.154 -35.673,46.66 -55.688,67.813 l -53.97,-53.97 C 167.834,98.183 163.032,65.814 141.22,44 127.22,30.002 108.877,23 90.53,23 Z m 0,27.03 c 11.434,0.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.186 C 67.69,54.37 79.097,50.03 90.53,50.03 Z"
-       fill="#8eff09"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1" />
-  </g>
-</svg>
+<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,159 +1 @@
-<?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="svg41"
-   sodipodi:docname="conquete.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <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="2077"
-     inkscape:window-height="1321"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="1573"
-     inkscape:window-y="459"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <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-6"
-       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>
-    <filter
-       id="shadow-7"
-       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>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 27.084,18.248 c -44.987,128.23 116.066,259.672 287.412,362.826 -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.654 l -17.865,-5.488 c -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.24 l -18.622,1.552 c 0.74,8.89 -4.35,22.76 -16.684,37.486 C 222.057,230.8 73.838,128.622 27.084,18.248 Z m 458.05,0 C 451.34,98.03 364.527,173.53 270.93,247.166 c 19.492,15.878 39.56,31.622 59.195,45.012 110.756,-84.836 187.878,-180.243 155.01,-273.93 z M 127.58,292.146 c -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.14 l -17.865,5.488 c 14.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.803 l -56.967,-39.387 c -6.55,5.103 -13.063,10.2 -19.52,15.293 C 150.55,316.46 145.46,302.59 146.2,293.7 l -18.622,-1.554 z m 18.1,73.614 c -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.207 z m 220.863,0 c -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.325 z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:8.88888889;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
+<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,191 +1 @@
-<?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="svg52"
-   sodipodi:docname="debordement.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="2673"
-     inkscape:window-height="1516"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     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(255, 255, 255, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="10"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="10"
-         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"
-     style="stroke:#5959b2;stroke-width:7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-       d="m 400.9,104.8 c -12,30 -41,47.9 -99.7,43.9 -13.7,-1.8 -27.6,-4.1 -41.6,-6.7 C 140.5,104.8 23.36,104.8 23.36,179.2 56.84,142 141.1,148.4 248.4,175.2 c 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,-49 z M 147,187.5 c -70.75,-0.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.3 z m -23.9,69.6 C 64.66,256.9 23.36,272.7 23.36,328 56.84,290.8 145.7,283.7 248.4,309.4 c 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.1 z m 0,74.3 c -58.44,-0.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.2 z"
-       fill="#48baff"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#5959b2;stroke-width:7.77777778;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
+<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

@@ -33,8 +33,8 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2513"
-     inkscape:window-height="1633"
+     inkscape:window-width="2014"
+     inkscape:window-height="1404"
      id="namedview32"
      showgrid="false"
      inkscape:zoom="2.2094112"
@@ -43,8 +43,7 @@
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg30"
-     inkscape:document-rotation="0" />
+     inkscape:current-layer="svg30" />
   <defs
      id="defs24">
     <filter
@@ -115,13 +114,11 @@
   <g
      class=""
      transform="translate(-2.1627108,-0.3)"
-     id="g28"
-     style="stroke:#000080;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
+     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"
-       style="stroke:#000080;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
+       id="path26" />
   </g>
 </svg>

icons/tmr/fermeture.svg

@@ -33,8 +33,8 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2665"
-     inkscape:window-height="1441"
+     inkscape:window-width="1680"
+     inkscape:window-height="1083"
      id="namedview54"
      showgrid="false"
      inkscape:zoom="1.5990661"
@@ -43,8 +43,7 @@
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg52"
-     inkscape:document-rotation="0" />
+     inkscape:current-layer="svg52" />
   <defs
      id="defs46">
     <filter
@@ -179,15 +178,13 @@
   <g
      class=""
      id="g50"
-     transform="matrix(1.1287777,0,0,1.1287777,-32.967091,-40.026839)"
-     style="stroke:#000000;stroke-width:4.42957014;stroke-miterlimit:4;stroke-dasharray:none">
+     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"
-       style="stroke:#000000;stroke-width:4.92174461;stroke-miterlimit:4;stroke-dasharray:none" />
+       id="path48" />
   </g>
 </svg>

icons/tmr/maitrisee.svg

@@ -1,187 +1 @@
-<?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="svg56"
-   sodipodi:docname="maitrisee.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata60">
-    <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="2352"
-     inkscape:window-height="1016"
-     id="namedview58"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg56" />
-  <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>
-  <path
-     d="m 16,256 v 240 h 48 c 64,-160 320,-160 384,0 h 48 V 256 h -48 v 64 h -60 v -64 h -48 v 64 h -60 v -64 h -48 v 64 h -60 v -64 h -48 v 64 H 64 v -64 z"
-     class="selected"
-     fill="#087505"
-     fill-opacity="1"
-     filter="url(#shadow-3)"
-     id="path50"
-     style="fill:#7db27d;fill-opacity:1;stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none"
-     transform="matrix(0.9,0,0,0.9,25.6,25.6)" />
-</svg>
+<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,159 +1 @@
-<?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="svg41"
-   sodipodi:docname="pelerinage.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <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="2530"
-     inkscape:window-height="1154"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <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-6"
-       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>
-    <filter
-       id="shadow-7"
-       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>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 259.844,73.406 1.625,214.47 -18.69,0.155 -1.655,-214.342 C 206.358,75.24 172.012,82.588 141,95.78 c 36.116,61.6 59.493,126.474 75.813,196.5 l -18.22,4.25 C 182.46,227.29 159.504,163.924 124,103.78 86.984,122.97 56.014,151.27 36.844,188.75 94.728,213.41 141.97,256.61 177.781,307.438 l -15.28,10.75 C 128.217,269.528 83.409,228.86 29.221,205.844 c -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.31 l 15.625,-10.255 c 9.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,0.094 31.592,-12.316 53.723,-42.776 l 15.12,10.984 c -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.188 l -15.28,-10.75 c 37.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.467 l -18.186,-4.25 C 303.274,221.387 327.029,155.78 363.907,93.5 331.487,80.665 295.741,73.95 259.845,73.406 Z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:8.88888889;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
+<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,191 +1 @@
-<?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="periple.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="2760"
-     inkscape:window-height="1358"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     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"
-     style="stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="M 149.9,27.2 34.25,56.74 V 133.5 L 157.8,93.85 204.5,49.18 Z m 132.8,57 c -7.4,0.18 -10.1,1.88 0.9,7.13 C 346.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.8 h 432.6 c 0,0 -139,-21.1 -147.8,-75.7 C 287.9,326.9 497.3,316.4 499.3,219.2 500.2,176 411,94.21 314.9,86.68 309.3,86.24 292.2,83.97 282.7,84.2 Z m -163.5,40.9 -32.69,10.5 v 122.2 l 35.99,-10 z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#000000;stroke-width:8.88888889;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
+<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,132 +1 @@
-<?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="present.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="2323"
-     inkscape:window-height="1657"
-     id="namedview34"
-     showgrid="false"
-     inkscape:zoom="2.0301699"
-     inkscape:cx="290.19906"
-     inkscape:cy="295.26229"
-     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:none" />
-  <g
-     class=""
-     transform="translate(1,-1)"
-     id="g30"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1">
-    <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"
-       id="path28"
-       style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1" />
-  </g>
-</svg>
+<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,159 +1 @@
-<?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="svg41"
-   sodipodi:docname="rencontre.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <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="1683"
-     inkscape:window-height="1292"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <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-6"
-       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>
-    <filter
-       id="shadow-7"
-       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>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 324.97,17.54 c 0.03,0.034 0.057,0.07 0.087,0.106 l -34.924,32.428 36.904,-3.752 -15.396,30.12 38.048,-16.075 c 26.147,69.965 0.623,154.277 -52.555,166.262 -6.554,-25.37 -34.13,-37.945 -36.055,-57.382 0.303,0.093 0.604,0.187 0.912,0.27 4.833,1.295 9.736,1.183 14.274,-0.07 l 25.138,22.89 20.653,-16.377 c -7.363,2.836 -28.588,-1.402 -33.25,-13.923 3.154,-3.24 5.55,-7.284 6.793,-11.922 0.485,-1.813 0.757,-3.635 0.86,-5.445 l 11.524,22.777 5.22,-16.94 c 7.625,5.575 12.474,13.605 11.49,21.136 l 16.673,-29.4 -72.14,-29.56 -58.057,-48.03 17.1,31.25 -48.206,-19.753 35.14,31.237 c -40.602,28.158 -22.085,85.04 -1.796,119.29 -57.5,-9.685 -103.128,-77.435 -95.763,-145.03 l 49.21,-21.366 -31.08,-5.14 29.207,-33.417 -32.015,11.54 c 0.037,-0.067 0.07,-0.135 0.107,-0.202 -168.36,66.33 -116.413,367 -63.728,417.99 -0.19,-1.317 -0.364,-2.58 -0.54,-3.855 C 53.883,390.953 48.43,321.573 51.305,256.667 54.325,188.43 66.139,125.507 88.099,87.145 l 16.22,9.283 c -18.894,33.008 -31.4,94.563 -34.345,161.064 -1.942,43.86 0.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.475 l 7.31,15.418 c -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.685 l -32.07,-34.297 c 5.918,-5.55 11.24,-11.6 15.947,-18.066 l 39.28,15.776 c -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 -0.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.52 l -71.135,-9.892 c 12.757,-22.982 18.676,-49.823 17.015,-77.475 14.188,-34.708 50.058,-11.816 54.523,49.16 27.425,-80.347 67.081,-38.617 58.825,24.513 11.808,-23.38 21.835,-35.013 29.862,-36.247 -10.772,-91.925 -40.458,-191.57 -77.637,-250.748 l 15.823,-9.942 c 50.328,80.106 85.112,220.65 84.88,331.547 C 521.655,285.828 476.905,45.13 324.97,17.54 Z m -29.458,476.913 -0.026,0.016 -0.015,0.05 c 0.015,-0.02 0.027,-0.044 0.042,-0.067 z m 26.543,-318.492 h 0.01 v -0.007 l -0.01,0.008 z m -53.348,-41.716 c 0.866,-0.027 1.757,0.073 2.652,0.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 0.96,-3.584 3.823,-5.993 7.21,-6.435 0.282,-0.036 0.568,-0.06 0.857,-0.068 z M 204.904,297.13 c 11.878,-0.2 22.637,6.756 26.172,22.487 -0.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.83 z"
-       fill="#003fb2"
-       fill-opacity="1"
-       filter="url(#shadow-1)"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       id="path37"
-       style="stroke:#000000;stroke-width:5.55555556;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
+<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,160 +1 @@
-<?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="svg41"
-   sodipodi:docname="reserve.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <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="1963"
-     inkscape:window-height="1393"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="257.8922"
-     inkscape:cy="255.21477"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <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-6"
-       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>
-    <filter
-       id="shadow-7"
-       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>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#7db27d;fill-opacity:1"
-     transform="translate(0,0)">
-    <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)"
-       id="path37"
-       style="stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#7db27d;fill-opacity:1" />
-  </g>
-</svg>
+<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

@@ -11,7 +11,7 @@
    style="height: 256px; width: 256px;"
    version="1.1"
    id="svg24"
-   sodipodi:docname="sort-reserve-humide.svg"
+   sodipodi:docname="sort-reserve-humide3.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <metadata
      id="metadata30">
@@ -35,70 +35,68 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2660"
-     inkscape:window-height="1472"
+     inkscape:window-width="2794"
+     inkscape:window-height="1756"
      id="namedview26"
      showgrid="false"
-     inkscape:zoom="1.4393497"
-     inkscape:cx="557.39157"
-     inkscape:cy="411.60399"
+     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"
-     inkscape:document-rotation="0" />
+     inkscape:current-layer="svg24" />
   <g
      id="g881"
-     transform="translate(2.1482304,2.80716)"
-     style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal">
+     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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       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="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="stroke-width:1.10232" />
   </g>
 </svg>

icons/tmr/sort-reserve.svg

@@ -37,14 +37,13 @@
      inkscape:window-height="1268"
      id="namedview34"
      showgrid="false"
-     inkscape:zoom="0.7031648"
-     inkscape:cx="1044.9871"
-     inkscape:cy="610.71305"
-     inkscape:window-x="518"
-     inkscape:window-y="680"
+     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"
-     inkscape:document-rotation="0" />
+     inkscape:current-layer="svg32" />
   <defs
      id="defs24">
     <filter
@@ -122,12 +121,12 @@
      class=""
      transform="translate(1,-1)"
      id="g30"
-     style="fill:#ffffff;fill-opacity:1;stroke:#7d7db2;stroke-width:13;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+     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:#ffffff;fill-opacity:1;stroke:#7d7db2;stroke-width:13;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#f4e3d7" />
   </g>
 </svg>

icons/tmr/trounoir.svg

@@ -33,18 +33,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1879"
-     inkscape:window-height="1569"
+     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="460"
-     inkscape:window-y="170"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg32"
-     inkscape:document-rotation="0" />
+     inkscape:current-layer="svg32" />
   <defs
      id="defs24">
     <filter
@@ -117,11 +116,11 @@
      fill="#4a4a4a"
      fill-opacity="0.5"
      id="path26"
-     style="fill:#3a174d;fill-opacity:0.69999999" />
+     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:#380f4d;fill-opacity:1" />
+     style="fill:#401060;fill-opacity:1" />
 </svg>

icons/tmr/urgence.svg

@@ -1,159 +1 @@
-<?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="svg41"
-   sodipodi:docname="urgence.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <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="2038"
-     inkscape:window-height="1243"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <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-6"
-       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>
-    <filter
-       id="shadow-7"
-       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>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 103.432,17.844 c -1.118,0.005 -2.234,0.032 -3.348,0.08 -2.547,0.11 -5.083,0.334 -7.604,0.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 0.536,0 1.058,-0.012 1.583,-0.022 v 0.704 h 60.565 c -10.758,31.994 -30.298,66.596 -52.448,101.43 -2.162,3.4 -4.254,6.878 -6.29,10.406 l 34.878,35.733 -56.263,9.423 c -32.728,85.966 -27.42,182.074 48.277,182.074 v -0.002 l 9.31,0.066 c 23.83,-0.57 46.732,-4.298 61.325,-12.887 4.174,-2.458 7.63,-5.237 10.467,-8.42 h -32.446 c -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.834 v -0.406 h 178.33 c -0.57,-44.403 16.35,-90.125 49.184,-126 23.955,-26.176 42.03,-60.624 51.3,-94.846 l -41.225,-24.932 38.272,-6.906 -43.37,-25.807 h -0.005 l 0.002,-0.002 0.002,0.002 52.127,-8.85 C 457.16,52.713 433.552,23.734 385.022,23.734 341.14,32.26 222.11,35.29 149.34,28.496 134.452,21.733 118.793,17.773 103.432,17.844 Z m 0.464,18.703 c 13.137,0.043 27.407,3.804 41.247,10.63 l 0.033,-0.07 c 4.667,4.735 8.542,9.737 11.68,14.985 H 82.92 l 10.574,14.78 c 10.608,14.83 19.803,31.99 21.09,42.024 0.643,5.017 -0.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.06 C 66.238,46.64 79.582,39.22 95.002,37.12 c 2.89,-0.395 5.863,-0.583 8.894,-0.573 z M 118.5,80.78 h 46.28 c 4.275,15.734 3.656,33.07 -0.544,51.51 H 131.52 c 1.9,-5.027 2.268,-10.574 1.6,-15.77 -1.527,-11.913 -7.405,-24.065 -14.62,-35.74 z m 101.553,317.095 c 6.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,26 h 237.19 c 14.448,0 24.887,-5.678 32.2,-14.318 7.312,-8.64 11.2,-20.514 10.705,-32.352 -0.186,-4.473 -0.978,-8.913 -2.407,-13.18 l -69.91,-8.205 42.017,-20.528 c -8.32,-3.442 -18.64,-5.537 -31.375,-5.537 H 220.053 Z m -42.668,0.506 c -1.152,-0.003 -2.306,0.048 -3.457,0.153 -2.633,0.242 -5.256,0.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.938 l 1.555,-0.57 h 43.354 c 0.946,-6.36 0.754,-13.882 -1.358,-23.192 -3.71,-16.358 -20.543,-28.483 -37.815,-28.54 z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
+<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

@@ -40,7 +40,6 @@
       "possession": "Possession",
       "potion": "Potion",
       "queue": "Queue de Dragon",
-      "race": "Race",
       "recettealchimique": "Recette alchimique",
       "recettecuisine": "Recette de cuisine",
       "rencontre": "Rencontre TMR",

less/colors.less

@@ -1,50 +0,0 @@
-:root {
-
-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
-    // --debug-background-color-red: #ff000054;
-    // --debug-background-color-blue: #1d00ff54;
-    // --debug-background-color-green: #54ff0054;
-
-    // --debug-box-shadow-red: inset 0 0 2px red;
-    // --debug-box-shadow-blue: inset 0 0 2px blue;
-    // --debug-box-shadow-green: inset 0 0 2px green;
-
-
-  /* =================== 3. some constants ============ */
-    --fieldset-background: url(/ui/parchment.jpg);
-    --rdd-color-text-primary: rgba(10, 10, 10, 0.9);
-    --rdd-input-background:rgba(0, 0, 0, 0.05);
-    --rdd-color-border-input: rgba(0, 0, 0, 0.2);
-    --rdd-bg-input: rgba(255, 255, 255, 0.1);
-    --color-controls:rgba(0, 0, 0, 0.9);
-    --color-controls-light:hsla(0, 0%, 20%, 0.8);
-    --color-controls-hover:hsla(60, 100%, 75%, 0.7);
-    --color-control-border-hover:rgba(255, 128, 0, 0.8);
-    --color-gold: rgba(191, 149, 63, 0.8);
-    --gradient-gold: linear-gradient(30deg, rgba(191, 149, 63, 0.3), rgba(252, 246, 186, 0.3), rgba(179, 135, 40, 0.3), rgba(251, 245, 183, 0.3), rgba(170, 119, 28, 0.3));
-    --gradient-silver: linear-gradient(30deg, rgba(61, 55, 93, 0.3), rgba(178, 179, 196, 0.3), rgba(59, 62, 63, 0.6), rgba(206, 204, 199, 0.3), rgba(61, 46, 49, 0.3));
-    --gradient-green: linear-gradient(30deg, rgba(7, 76, 0, 0.3), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.1), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.3));
-    --gradient-red: linear-gradient(150deg, rgba(255, 0, 0, 0.3), rgba(255, 200, 128, 0.05),rgba(255, 200, 128, 0.1), rgba(255,10,0,0.3));
-    --gradient-violet: linear-gradient(150deg, rgba(100, 45, 124, 0.6), rgba(216, 157, 192, 0.3), rgba(177, 157, 216, 0.5), rgba(107, 62, 121, 0.3), rgba(100, 45, 124, 0.6));
-    --gradient-purple-black: linear-gradient(150deg,  rgba(0, 0, 0, 0.7), rgba(100, 45, 124, 0.4), rgba(82, 17, 131, 0.3),rgba(100, 45, 124, 0.4), rgba(0, 0, 0, 0.7));
-    --gradient-silver-light: linear-gradient(30deg, rgba(61, 55, 93, 0.2), rgba(178, 179, 196, 0.1), rgba(59, 62, 63, 0.2), rgba(206, 204, 199, 0.1), rgba(61, 46, 49, 0.2));
-    --gradient-daylight: conic-gradient(
-      from 0deg,
-      hsla(50, 100%, 80%, 0.7),
-      hsla(30, 30%, 40%, 0.1) 25%,
-      hsla(250, 50%, 40%, 0.1) 25%,
-      hsla(250, 30%, 30%, 0.7) 50%,
-      hsla(250, 50%, 40%, 0.1) 75%,
-      hsla(30, 30%, 40%, 0.1) 75%,
-      hsla(50, 100%, 80%, 0.7)
-    );
-
-    --background-custom-button: linear-gradient(to bottom, rgba(33, 55, 74, 0.988) 5%, rgba(21, 40, 51, 0.671) 100%);
-    --background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%);
-    --background-control-selected: linear-gradient(to bottom, hsla(0, 100%, 25%, 0.5) 5%, hsla(0, 100%, 12%, 0.5) 100%);
-    --background-tooltip: hsla(60, 12%, 85%, 0.95);
-    --color-tooltip:hsla(282, 47%, 33%, 0.9);
-    --color-tooltip-faint:hsla(282, 47%, 66%, 0.5);
-    --background-error:hsla(16, 100%, 50%, 0.8);
-    --color-profile-border: hsla(0, 0%, 80%, 0.05);
-  }

less/fonts.less

@@ -1,84 +0,0 @@
-/* ==================== (A) Fonts ==================== */
-@font-face {
-  font-family: "GoudyAcc";
-  src: url('../fonts/goudyacc.ttf') format("truetype");
-}
-@font-face {
-  font-family: "MedievalSharp";
-  src: url('../fonts/MedievalSharp.ttf') format("truetype");
-}
-@font-face {
-  font-family: "GrenzeGotisch";
-  src: url('../fonts/GrenzeGotisch-Regular.ttf') format("truetype");
-}
-@font-face {
-  font-family: "Fondamento";
-  src: url('../fonts/Fondamento.ttf') format("truetype");
-}
-@font-face {
-  font-family: "CaslonAntique";
-  src: url('../fonts/CaslonAntique.ttf') format("truetype");
-}
-@font-face {
-  font-family: 'HeuresDraconiques';
-  src:
-      url('../fonts/heuresdraconiques2.woff') format('woff'),
-      url('../fonts/heuresdraconiques2.woff2') format('woff2'),
-      url('../fonts/heuresdraconiques2.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-:root {
-  /* =================== 1. ACTOR SHEET FONT STYLES =========== */
-    --window-header-title-font-family: CaslonAntique;
-    --window-header-title-font-size: 1.6rem;
-    --window-header-title-font-weight: normal;
-    --window-header-title-color: #f5f5f5;
-
-    --major-button-font-family: CaslonAntique;
-    --major-button-font-size: 1.4rem;
-    --major-button-font-weight: normal;
-    --major-button-color: #dadada;
-
-    --tab-header-font-family: CaslonAntique;
-    --tab-header-font-size: 1.2rem;
-    --tab-header-font-weight: 700;
-    --tab-header-color: #403f3e;
-    --tab-header-color-active: #4a0404;
-
-    --actor-input-font-family: CaslonAntique;
-    --actor-input-font-size: 1.2rem;
-    --actor-input-font-weight: 500;
-    --actor-input-color: black;
-
-    --actor-label-font-family: CaslonAntique;
-    --actor-label-font-size: 1.2rem;
-    --actor-label-font-weight: 700;
-    --actor-label-color: #464331c4;
-}
-
-/* Global styles & Font */
-.window-app {
-  font-family: CaslonAntique;
-  text-align: justify;
-  font-size: 1rem;
-  letter-spacing: 1px;
-}
-
-/* Fonts */
-.sheet header.sheet-header h1 input,
-.window-app .window-header,
-#actors .directory-list,
-#navigation #scene-list .scene.nav-item {
-  font-family: "GoudyAcc"
-}
-
-/* For title, sidebar character and scene */
-.sheet nav.sheet-tabs,
-.window-app input,
-.sheet header.sheet-header .header-compteurs,
-.sheet header.sheet-header .flex-group-center.flex-fatigue,
-select,  .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
-    font-family: "CaslonAntique"; /* For sheet parts; For nav and title */
-}

less/item/monnaie.less

@@ -1,7 +0,0 @@
-// Styles pour la feuille d'objet Monnaie
-.monnaie-content {
-
-  .item-sheet-common();
-  .item-sheet-header();
-
-}

less/item/munition.less

@@ -1,7 +0,0 @@
-// Styles pour la feuille d'objet Monnaie
-.munition-content {
-
-  .item-sheet-common();
-  .item-sheet-header();
-
-}

less/item/tarot.less

@@ -1,7 +0,0 @@
-// Styles pour la feuille d'objet Monnaie
-.tarot-content {
-
-  .item-sheet-common();
-  .item-sheet-header();
-
-}

less/sheets.less

@@ -1,108 +0,0 @@
-.item-sheet-common() {
-  padding: 0px;
-
-  // Styles pour la section de description, si le partiel utilise une structure standard
-  .editor,
-  .editor-content {
-    height: auto; // Ajuster selon le besoin
-    min-height: 100px; // Hauteur minimale pour la description
-    background: var(--rdd-bg-input-alt); // Une couleur de fond alternative
-    padding: 5px;
-    border-radius: 3px;
-    color: var(--rdd-color-text-primary);
-  }
-
-  .window-content {
-    font-family: CaslonAntique;
-    text-align: justify;
-    font-size: 1rem;
-    letter-spacing: 1px;
-    padding: 0% 0 0 0;
-
-    font-size: calc(var(--font-size-standard) * 1);
-    color: var(--color-dark-1);
-    background-size: 100% 100%;
-  }
-
-  fieldset {
-    background: var(--fieldset-background);
-    color: var(--rdd-color-text-primary);
-    margin-bottom: 4px;
-    border-radius: 6px;
-    border-color: var(--rdd-color-text-primary);
-    border-width: 2px;
-  }
-
-  .form-group {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    align-items: center;
-    padding: 2px 0;
-    border-bottom: 1px solid var(--rdd-color-shadow-primary);
-    font-size: 0.9rem;
-
-    label {
-      font-weight: normal;
-      flex: 2;
-      padding-left: 5px;
-      margin: 0;
-      color: var(
-        --rdd-color-text-primary
-      ); // Assurez-vous que cette variable existe dans colors.less
-    }
-
-    .attribute-value,
-    input[type="text"],
-    input[type="number"],
-    select {
-      flex: 3;
-      background: var(--rdd-input-background);
-      border: 1px solid var(--rdd-color-border-input); // Assurez-vous que cette variable existe
-      color: var(
-        --rdd-color-text-input
-      ); // Assurez-vous que cette variable existe
-      padding: 2px 2px; // Augmentation du padding vertical
-      border-radius: 3px;
-    }
-
-    input[type="checkbox"] {
-      flex: 0 0 20px; // Taille fixe pour les cases à cocher
-      margin-left: 5px;
-    }
-  }
-}
-
-.item-sheet-header() {
-  background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
-  color: rgba(255, 255, 255, 1);
-  .sheet-header-row {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    h1,
-    input {
-      font-family: CaslonAntique;
-      font-size: 2.5rem;
-      font-weight: normal;
-      color: var(--window-header-title-color);
-      margin: 4px;
-      height: 3rem;
-    }
-  }
-
-  :is(
-    input[type="text"],
-    input[type="number"],
-    input[type="password"],
-    input[type="datetime-local"],
-    input[type="date"],
-    input[type="time"]
-  ) {
-    color: rgba(255, 255, 255, 0.75);
-    background: rgba(255, 255, 255, 0.1);
-    border: 0 none;
-    margin-bottom: 0.2rem;
-  }
-}

module/achat-vente/chat-vente.js

@@ -44,13 +44,13 @@ export class ChatVente {
     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.hbs', vente);
+    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.hbs', 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, {

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

@@ -29,7 +29,7 @@ export class DialogItemAchat extends Dialog {
     }
 
     DialogItemAchat.changeNombreLots(venteData, 1)
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.hbs`, venteData)
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData)
     new DialogItemAchat(html, venteData).render(true)
   }
 

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

@@ -20,7 +20,7 @@ export class DialogItemVente extends Dialog {
       quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !item.parent,
       isOwned:  item.parent,
     }
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.hbs`, venteData);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
     return new DialogItemVente(venteData, html).render(true);
   }
 

module/actor-sheet.js

@@ -12,25 +12,24 @@ import { RdDSheetUtility } from "./rdd-sheet-utility.js";
 import { STATUSES } from "./settings/status-effects.js";
 import { MAINS_DIRECTRICES } from "./actor.js";
 import { RdDBaseActorReveSheet } from "./actor/base-actor-reve-sheet.js";
-import { ITEM_TYPES } from "./constants.js";
 import { RdDItem } from "./item.js";
 import { 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";
-import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";
 
 /* -------------------------------------------- */
 /**
  * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
  */
 export class RdDActorSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
     return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.hbs",
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
       width: 550,
       showCompNiveauBase: false,
       vueArchetype: false,
@@ -45,8 +44,8 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       limited: this.actor.limited,
       owner: this.actor.isOwner,
-      biographie: await RdDTextEditor.enrichHTML(this.actor.system.biographie, this.actor),
-      notes: await RdDTextEditor.enrichHTML(this.actor.system.notes, this.actor),
+      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(),
@@ -81,10 +80,10 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
       const actor = this.actor;
       formData.combat = foundry.utils.duplicate(formData.armes);
       RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
-      formData.combat.push(RdDItemArme.corpsACorps(actor));
+      formData.combat.push(RdDItemArme.mainsNues(actor));
       formData.combat.push(RdDItemArme.empoignade(actor));
 
-      formData.esquives = this.actor.getCompetencesEsquive()
+      formData.esquives = this.actor.getCompetences("Esquive");
       formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
       formData.empoignades = this.actor.getEmpoignades();
 
@@ -99,7 +98,6 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
         cacheTMR: this.actor.isTMRCache()
       }
 
-      formData.race = actor.itemTypes[ITEM_TYPES.race].find(it => true)
       formData.subacteurs = {
         vehicules: this.actor.listeVehicules(),
         montures: this.actor.listeMontures(),
@@ -126,73 +124,80 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
     })
 
     this.html.find('.show-hide-competences').click(async event => {
-      this.options.showCompNiveauBase = !this.options.showCompNiveauBase
-      this.render(true)
+      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
+      this.render(true);
     });
 
-    this.html.find('.button-tmr-visu').click(async event => await this.actor.displayTMR("visu"))
+    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)
-      await this.actor.conjurerPossession(poss)
+      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')
-      await RdDCoeur.toggleSubActeurCoeur(this.actor.id, subActorIdactorId, coeurNombre)
+      RdDCoeur.toggleSubActeurCoeur(this.actor.id, subActorIdactorId, coeurNombre)
     })
     this.html.find('.subacteur-tendre-moment').click(async event => {
       const subActorId = RdDSheetUtility.getEventItemData(event, 'subactor-id')
-      await RdDCoeur.startSubActeurTendreMoment(this.actor.id, subActorId)
+      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 =>
-      await this.actor.updateCompteurValue("stress", parseInt(event.target.value))
-    );
-    this.html.find("input.derivee-value[name='system.compteurs.experience.value']").change(async event =>
-      await this.actor.updateCompteurValue("experience", parseInt(event.target.value))
-    );
+    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 => await this.createEmptyTache());
-    this.html.find('.creer-une-oeuvre').click(async event => await this.selectTypeOeuvreToCreate());
-    this.html.find('.creer-tache-blessure-legere').click(async event => await RdDItemBlessure.createTacheSoinBlessure(this.actor, 2));
-    this.html.find('.creer-tache-blessure-grave').click(async event => await RdDItemBlessure.createTacheSoinBlessure(this.actor, 4));
-    this.html.find('.creer-tache-blessure-critique').click(async event => await RdDItemBlessure.createTacheSoinBlessure(this.actor, 6));
+    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 => {
-      await this.getBlessure(event)?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
     });
     this.html.find('.blessure-soinscomplets-done').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
     });
     this.html.find('.blessure-premierssoins-bonus').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ premierssoins: { bonus: Number(event.currentTarget.value) } })
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ premierssoins: { bonus: Number(event.currentTarget.value) } })
     });
     this.html.find('.blessure-soinscomplets-bonus').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
     });
 
-    this.html.find('.roll-chance-actuelle').click(async event => await this.actor.rollCarac('chance-actuelle'))
-    this.html.find('.button-appel-chance').click(async event => await this.actor.rollAppelChance())
+    // 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('[name="jet-astrologie"]').click(async event => await this.actor.astrologieNombresAstraux())
-    this.html.find('.action-tache').click(async event => await this.actor.rollTache(RdDSheetUtility.getItemId(event)))
-    this.html.find('.meditation-label a').click(async event => await this.actor.rollMeditation(RdDSheetUtility.getItemId(event)))
+    this.html.find('.button-appel-chance').click(async event => this.actor.rollAppelChance())
 
-    this.html.find('.action-chant').click(async event => await this.actor.rollChant(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-danse').click(async event => await this.actor.rollDanse(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-musique').click(async event => await this.actor.rollMusique(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-oeuvre').click(async event => await this.actor.rollOeuvre(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-jeu').click(async event => await this.actor.rollJeu(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-recettecuisine').click(async event => await this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event)))
+    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) {
@@ -208,19 +213,18 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
         await this.actor.deleteExperienceLog(0, key + 1);
       });
       // Boutons spéciaux MJs
-      this.html.find('.forcer-tmr-aleatoire').click(async event => await this.actor.reinsertionAleatoire("Action MJ"))
-      this.html.find('.don-de-haut-reve').click(async event => await this.actor.addDonDeHautReve())
-      this.html.find('.afficher-tmr').click(async event => await this.actor.changeTMRVisible())
+      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 => await this.actor.rollCarac('reve-actuel', { resistance: true }))
-    this.html.find('.action-empoignade').click(async event => await RdDEmpoignade.onAttaqueEmpoignadeFromItem(RdDSheetUtility.getItem(event, this.actor)))
+    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 => await this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event)), 'competence'))
+    this.html.find('.roll-arme').click(async event => this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event)), 'competence'))
 
     // Initiative pour l'arme
-    this.html.find('.roll-init-arme').click(async event => {
+    this.html.find('.arme-initiative a').click(async event => {
       let combatant = game.combat.combatants.find(c => c.actor.id == this.actor.id)
       if (combatant) {
         RdDCombatManager.rollInitiativeAction(combatant._id, this._getEventArmeCombat(event));
@@ -230,34 +234,30 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
     })
     // Display TMR
 
-    this.html.find('.button-tmr').click(async event => await this.actor.displayTMR("normal"))
-    this.html.find('.button-tmr-rapide').click(async event => await this.actor.displayTMR("rapide"))
+    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 => await this.actor.updateCaracXPAuto(event.currentTarget.name.replace("augmenter.", "")))
-    this.html.find('.competence-xp-augmenter').click(async event => await this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event)))
-    this.html.find('.competence-stress-augmenter').click(async event =>{
-      await this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event))
-      this.render(true)
-    } 
-  )
+    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.", "")
-        await this.actor.updateCaracXP(caracName, parseInt(event.target.value))
-      })
+        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
-        await this.actor.updateCompetenceXP(compName, parseInt(event.target.value))
-      })
+        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
-        await this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value))
-      })
+        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;
@@ -266,27 +266,25 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
       // On competence archetype change
       this.html.find('.competence-archetype').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
-        await this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
+        this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
       });
-      this.html.find('.nouvelle-incarnation').click(async event => await this.actor.nouvelleIncarnation())
+      this.html.find('.nouvelle-incarnation').click(async event => this.actor.nouvelleIncarnation())
     }
 
     // On pts de reve change
-    this.html.find('.pointsreve-value').change(async event => await this.actor.update({ "system.reve.reve.value": event.currentTarget.value }))
-    this.html.find('.seuil-reve-value').change(async event => await this.actor.setPointsDeSeuil(event.currentTarget.value))
+    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 => await this.actor.transformerStress())
-    this.html.find('.moral-malheureux').click(async event => await this.actor.jetDeMoral('malheureuse'))
-    this.html.find('.moral-neutre').click(async event => await this.actor.jetDeMoral('neutre'))
-    this.html.find('.moral-heureux').click(async event => await this.actor.jetDeMoral('heureuse'))
-    this.html.find('.button-ethylisme').click(async event => await this.actor.jetEthylisme())
+    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 => await this.actor.reveActuelIncDec(1))
-    this.html.find('.ptreve-actuel-moins').click(async event => await this.actor.reveActuelIncDec(-1))
-    this.html.find('.chance-actuelle-plus').click(async event => await this.actor.chanceActuelleIncDec(1))
-    this.html.find('.chance-actuelle-moins').click(async event => await this.actor.chanceActuelleIncDec(-1))
-    this.html.find('.fatigue-plus').click(async event => await this.actor.santeIncDec("fatigue", 1))
-    this.html.find('.fatigue-moins').click(async event => await this.actor.santeIncDec("fatigue", -1))
+    this.html.find('.ptreve-actuel-plus').click(async event => this.actor.reveActuelIncDec(1))
+    this.html.find('.ptreve-actuel-moins').click(async event => this.actor.reveActuelIncDec(-1))
+    this.html.find('.fatigue-plus').click(async event => this.actor.santeIncDec("fatigue", 1))
+    this.html.find('.fatigue-moins').click(async event => this.actor.santeIncDec("fatigue", -1))
   }
 
   getBlessure(event) {
@@ -323,7 +321,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
   /* -------------------------------------------- */
   async selectTypeOeuvreToCreate() {
     let types = RdDItem.getTypesOeuvres();
-    let content = `<span class="generic-label">Selectionnez le type d'oeuvre</span><select class="item-type">`;
+    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>`
     }

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

@@ -1,6 +1,4 @@
-import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
 import { Grammar } from "../grammar.js";
-import { ITEM_TYPES } from "../constants.js";
 import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { RdDBaseActorSheet } from "./base-actor-sheet.js";
 
@@ -26,45 +24,19 @@ export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
-    this.html.find('.button-encaissement').click(async event => await this.actor.encaisser())
+    this.html.find('.button-encaissement').click(async event => this.actor.encaisser())
     this.html.find('.roll-carac').click(async event => {
-      await this.actor.rollCarac(Grammar.toLowerCaseNoAccent(event.currentTarget.attributes['data-carac-name'].value))
-    })
-    this.html.find('.roll-competence').click(async event => await this.actor.rollCompetence(RdDSheetUtility.getItemId(event)));
-    this.html.find('.endurance-plus').click(async event => await this.actor.santeIncDec("endurance", 1));
-    this.html.find('.endurance-moins').click(async event => await this.actor.santeIncDec("endurance", -1));
+      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 => await this.actor.remiseANeuf())
-      this.html.find('.delete-active-effect').click(async event => await this.actor.removeEffect(this.html.find(event.currentTarget).parents(".active-effect").data('effect')));
+      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());
     }
-    this.html.find('.competence-add').click(async event =>
-      await this.actor.createEmbeddedDocuments("Item", [{
-        type: ITEM_TYPES.competencecreature,
-        name: 'Nouvelle competence',
-        img: 'systems/foundryvtt-reve-de-dragon/icons/compcreature-serres.webp',
-        system: {
-          carac_value: this.actor.getForce(),
-        }
-      }], { renderSheet: true })
-    )
-    this.html.find('.roll-text').click(async event => await RdDTextEditor.rollText(event, this.actor))
-    this.html.find('.chat-roll-text').click(async event => await RdDTextEditor.chatRollText(event))
 
-
-    if (this.options.vueDetaillee) {
-      // On carac change
-      this.html.find('.carac-value').change(async event => {
-        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "")
-        await 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
-        await this.actor.updateCompetence(compName, parseInt(event.target.value))
-      });
-    }
   }
 
 }

module/actor/base-actor-reve.js

@@ -1,29 +1,33 @@
-import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
+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 { ITEM_TYPES } from "../constants.js";
-import { RdDItemCompetence } from "../item-competence.js";
 import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
-import { RdDItemArme } from "../item-arme.js";
 import { StatusEffects } from "../settings/status-effects.js";
+import { ITEM_TYPES } from "../item.js";
 import { Targets } from "../targets.js";
-import { RdDConfirm } from "../rdd-confirm.js";
-import { RdDCarac } from "../rdd-carac.js";
-import { RdDRollResult } from "../rdd-roll-result.js";
-
-import { ChatUtility } from "../chat-utility.js";
-import { DialogValidationEncaissement } from "../dialog-validation-encaissement.js";
-import { RdDCombat } from "../rdd-combat.js";
-import { RdDEmpoignade } from "../rdd-empoignade.js";
 import { RdDPossession } from "../rdd-possession.js";
-import { BASE_CORPS_A_CORPS, BASE_ESQUIVE, POSSESSION_SANS_DRACONIC } from "../item/base-items.js";
-import { RollDataAjustements } from "../rolldata-ajustements.js";
+import { 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)
@@ -32,22 +36,6 @@ import { RollDataAjustements } from "../rolldata-ajustements.js";
  */
 export class RdDBaseActorReve extends RdDBaseActor {
 
-  prepareActorData() {
-    super.prepareActorData()
-    this.system.attributs.plusdom.value = this.getBonusDegat()
-    this.system.sante.endurance.max = this.getEnduranceMax()
-    this.system.sante.endurance.value = Math.min(this.system.sante.endurance.value, this.system.sante.endurance.max)
-  }
-
-  getCarac() {
-    return foundry.utils.mergeObject(this.system.carac,
-      {
-        'reve-actuel': this.getCaracReveActuel(),
-        'chance-actuelle': this.getCaracChanceActuelle()
-      },
-      { inplace: false })
-  }
-
   getCaracChanceActuelle() {
     return {
       label: 'Chance actuelle',
@@ -64,25 +52,21 @@ export class RdDBaseActorReve extends RdDBaseActor {
     };
   }
 
-  getTaille() { return Misc.toInt(this.system.carac.taille?.value) }
-  getConstitution() { return this.getReve() }
-  getForce() { return this.getReve() }
-  getAgilite() { return this.getForce() }
-  getReve() { return Misc.toInt(this.system.carac.reve?.value) }
-  getChance() { return this.getReve() }
-
   getReveActuel() { return this.getReve() }
   getChanceActuel() { return this.getChance() }
 
-  getEnduranceMax() { return Math.max(1, this.getTaille() + this.getConstitution()) }
-  getEncombrementMax() { return (this.getForce() + this.getTaille()) / 2 }
-  getBonusDegat() { return RdDCarac.getCaracDerivee(this.getEncombrementMax()).plusdom }
-
+  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 }
 
@@ -94,27 +78,8 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
   async jetEndurance(resteEndurance = undefined) { return { jetEndurance: 0, sonne: false } }
   isDead() { return false }
-  isSonne() { return false }
   blessuresASoigner() { return [] }
   getEtatGeneral(options = { ethylisme: false }) { return 0 }
-  isActorCombat() { return true }
-
-  getCaracInit(competence) {
-    if (!competence) {
-      return 0
-    }
-    if (competence.type == ITEM_TYPES.competencecreature) {
-      return competence.system.carac_value
-    }
-    return this.system.carac[competence.system.defaut_carac].value;
-  }
-  listActionsCombat() {
-    return this.itemTypes[ITEM_TYPES.competencecreature]
-      .filter(it => RdDItemCompetenceCreature.isAttaque(it))
-      .map(it => RdDItemCompetenceCreature.armeCreature(it))
-      .filter(it => it != undefined);
-  }
-
 
   async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
   async remiseANeuf() { }
@@ -133,7 +98,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
     for (let effect of this.getEffects()) {
       if (effect.duration.type !== 'none' && (effect.duration.remaining <= 0 || options.terminer)) {
         await effect.delete();
-        ChatMessage.create({ content: `${this.getAlias()} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
+        ChatMessage.create({ content: `${this.name} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
       }
     }
   }
@@ -166,28 +131,31 @@ export class RdDBaseActorReve extends RdDBaseActor {
     }
     return RdDItemCompetence.findCompetence(this.items, idOrName, options)
   }
-
-  getCompetences(name, options = { onMessage: message => { } }) {
-    return RdDItemCompetence.findCompetences(this.items, name, options)
+  getCompetences(name) {
+    return RdDItemCompetence.findCompetences(this.items, name)
   }
-
-  getCompetenceCorpsACorps(options = { onMessage: message => { } }) {
-    return this.getCompetence(BASE_CORPS_A_CORPS.name, options) ?? BASE_CORPS_A_CORPS
+  getCompetenceCorpsACorps(options = {}) {
+    return this.getCompetence("Corps à corps", options)
   }
-
-  getCompetencesEsquive(options = { onMessage: message => { } }) {
-    return this.getCompetences(BASE_ESQUIVE.name, options) ?? [BASE_ESQUIVE]
+  getCompetencesEsquive() {
+    return this.getCompetences("esquive")
   }
 
   getArmeParade(armeParadeId) {
-    return RdDItemArme.getArme(armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined)
+    const item = armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined;
+    return RdDItemArme.getArme(item);
   }
 
-  getDraconicOuPossession() { return POSSESSION_SANS_DRACONIC }
+  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];
   }
@@ -269,70 +237,32 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   /* -------------------------------------------- */
-  async openRollDialog({ name, label, template, rollData, callbacks }) {
+  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()].concat(callbacks) })
-    dialog.render(true)
+      {
+        name: name,
+        label: label,
+        callbacks: [
+          this.createCallbackExperience(),
+          this.createCallbackAppelAuMoral(),
+          { action: callbackAction }
+        ]
+      });
+    dialog.render(true);
     return dialog
   }
 
-  createCallbackExperience() { return { action: r => { } } }
-  createCallbackAppelAuMoral() { return { action: r => { } } }
-
+  createEmptyCallback() {
+    return {
+      condition: r => false,
+      action: r => { }
+    };
+  }
+  createCallbackExperience() { return this.createEmptyCallback(); }
+  createCallbackAppelAuMoral() { return this.createEmptyCallback(); }
   async _onCloseRollDialog(html) { }
 
-  async rollCaracCompetence(caracName, compName, diff, options = { title: "" }) {
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-    const competence = this.getCompetence(compName);
-    await this.openRollDialog({
-      name: 'jet-competence',
-      label: competence ? 'Jet ' + Grammar.apostrophe('de', competence.name) : `Jet sans compétence (${compName})`,
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.hbs',
-      rollData: {
-        alias: this.getAlias(),
-        carac: this.system.carac,
-        selectedCarac: this.getCaracByName(caracName),
-        selectedCaracName: caracName,
-        diffLibre: diff,
-        competence: competence,
-        show: { title: options?.title ?? '' }
-      },
-      callbacks: [async r => this.$onRollCompetence(r, options)]
-    });
-  }
-  /**
-   * Méthode pour faire un jet prédéterminer sans ouvrir la fenêtre de dialogue
-   * @param {*} caracName code ou label de la caractéristique. On peut utiliser 'intel' pour Intellect.
-   * @param {*} compName nom de compétence ou nom abrégé.
-   * @param {*} diff difficulté (0 si undefined)
-   * @param {*} options
-   * @returns le jet effectué
-   */
-  async doRollCaracCompetence(caracName, compName, diff, options = { title: "" }) {
-    const carac = this.getCaracByName(caracName);
-    if (!carac) {
-      ui.notifications.warn(`${this.name} n'a pas de caractéristique correspondant à ${caracName}`)
-      return
-    }
-    const competence = this.getCompetence(compName);
-    let rollData = {
-      alias: this.getAlias(),
-      caracValue: Number(carac.value),
-      selectedCarac: carac,
-      competence: competence,
-      diffLibre: diff ?? 0,
-      show: { title: options?.title ?? '' }
-    }
-    RollDataAjustements.calcul(rollData, this);
-    await RdDResolutionTable.rollData(rollData);
-    this.gererExperience(rollData);
-    await RdDResolutionTable.displayRollData(rollData, this)
-    return rollData.rolled;
-  }
-
-  gererExperience(rollData) { }
-
   /* -------------------------------------------- */
   async roll() {
     RdDEmpoignade.checkEmpoignadeEnCours(this)
@@ -341,56 +271,61 @@ export class RdDBaseActorReve extends RdDBaseActor {
     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: {
-        alias: this.getAlias(),
         carac: carac,
         selectedCarac: carac[selectedCaracName],
         selectedCaracName: selectedCaracName,
         competences: this.itemTypes['competence']
       },
-      callbacks: [{ action: r => this.$onRollCaracResult(r) }]
-    })
+      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, options = {}) {
+  async rollCarac(caracName, jetResistance = undefined) {
     if (Grammar.equalsInsensitive(caracName, 'taille')) {
       return
     }
-    foundry.utils.mergeObject(options, { resistance: false, diff: 0 }, { overwrite: false })
     RdDEmpoignade.checkEmpoignadeEnCours(this)
     let selectedCarac = this.getCaracByName(caracName)
-    const title = 'Jet ' + Grammar.apostrophe('de', selectedCarac.label);
-    const jetResistance = options.resistance ? caracName : undefined;
+    console.log("selectedCarac", selectedCarac)
     await this.openRollDialog({
       name: 'jet-' + caracName,
-      label: title,
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.hbs',
+      label: 'Jet ' + Grammar.apostrophe('de', selectedCarac.label),
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html',
       rollData: {
-        alias: this.getAlias(),
         selectedCarac: selectedCarac,
         competences: this.itemTypes['competence'],
-        diffLibre: options.diff ?? 0,
-        jetResistance: jetResistance
+        jetResistance: jetResistance ? caracName : undefined
       },
-      callbacks: [{ action: r => this.$onRollCaracResult(r) }]
+      callbackAction: r => this.$onRollCaracResult(r)
     });
   }
 
   /* -------------------------------------------- */
   async $onRollCaracResult(rollData) {
     // Final chat message
-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-general.hbs');
+    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
-    }
+    let rollData = { carac: this.system.carac, competence: competence, arme: options.arme }
     if (competence.type == ITEM_TYPES.competencecreature) {
       const token = RdDUtility.getSelectedToken(this)
       const arme = RdDItemCompetenceCreature.armeCreature(competence)
@@ -408,18 +343,18 @@ export class RdDBaseActorReve extends RdDBaseActor {
       // Transformer la competence de créature
       RdDItemCompetenceCreature.setRollDataCreature(rollData)
     }
-    const dialogLabel = 'Jet ' + Grammar.apostrophe('de', competence.name);
+
     await this.openRollDialog({
       name: 'jet-competence',
-      label: dialogLabel,
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.hbs',
+      label: 'Jet ' + Grammar.apostrophe('de', competence.name),
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
       rollData: rollData,
-      callbacks: [{ action: r => this.$onRollCompetence(r, options) }]
+      callbackAction: r => this.$onRollCompetence(r, options)
     });
   }
 
   async $onRollCompetence(rollData, options) {
-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-competence.hbs')
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
     if (options?.onRollAutomate) {
       options.onRollAutomate(rollData);
     }
@@ -433,7 +368,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   rollArme(arme, categorieArme, token) {
     token = token ?? RdDUtility.getSelectedToken(this)
     const compToUse = this.$getCompetenceArme(arme, categorieArme)
-    if (!RdDItemArme.isUtilisable(arme)) {
+    if (!RdDItemArme.isArmeUtilisable(arme)) {
       ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
       return
     }
@@ -470,7 +405,12 @@ export class RdDBaseActorReve extends RdDBaseActor {
     return RdDItemArme.getCompetenceArme(arme, competenceName)
   }
 
-  verifierForceMin(item) { }
+  verifierForceMin(item) {
+  }
+  /* -------------------------------------------- */
+  async resetItemUse() { }
+  async incDecItemUse(itemId, inc = 1) { }
+  getItemUse(itemId) { return 0; }
 
   /* -------------------------------------------- */
   async encaisser() { await RdDEncaisser.encaisser(this) }
@@ -494,7 +434,8 @@ export class RdDBaseActorReve extends RdDBaseActor {
       RdDBaseActor.remoteActorCall({
         tokenId: this.token?.id,
         actorId: this.id,
-        method: 'encaisserDommagesValidationGR', args: [rollData, armure, show, attackerToken, defenderToken]
+        method: 'encaisserDommagesValidationGR',
+        args: [rollData, armure, show, attackerToken, defenderToken]
       })
     } else {
       DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
@@ -511,15 +452,15 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   async $afficherEncaissement(encaissement, show, defenderToken) {
     foundry.utils.mergeObject(encaissement, {
-      alias: defenderToken?.name ?? this.getAlias(),
+      alias: defenderToken?.name ?? this.name,
       hasPlayerOwner: this.hasPlayerOwner,
       show: show ?? {}
-    }, { overwrite: false });
+    }, {overwrite: false});
 
     await ChatUtility.createChatWithRollMode(
       {
         roll: encaissement.roll,
-        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.hbs', encaissement)
+        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
       },
       this
     )
@@ -529,7 +470,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
       encaissement.isGM = true
       ChatMessage.create({
         whisper: ChatUtility.getGMs(),
-        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.hbs', encaissement)
+        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
       });
     }
   }
@@ -542,9 +483,9 @@ export class RdDBaseActorReve extends RdDBaseActor {
       || entite.isEntiteAccordee(this)) {
       return true;
     }
-    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.getNiveau()));
+    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.system.carac.niveau.value));
     const rollData = {
-      alias: this.getAlias(),
+      alias: this.name,
       rolled: rolled,
       entite: entite.name,
       selectedCarac: this.system.carac.reve
@@ -554,15 +495,17 @@ export class RdDBaseActorReve extends RdDBaseActor {
       await entite.setEntiteReveAccordee(this);
     }
 
-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-accorder-cauchemar.hbs');
-    await this.appliquerAjoutExperience(rollData, true);
+    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.getAlias() + ": ce n'est pas une entité incarnée");
+    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entité incarnée");
   }
 
 }

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

@@ -17,20 +17,20 @@ export class RdDBaseActorSangSheet extends RdDBaseActorReveSheet {
     // 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 => await RdDItemBlessure.createBlessure(this.actor, 2));
-    this.html.find('.creer-blessure-grave').click(async event => await RdDItemBlessure.createBlessure(this.actor, 4));
-    this.html.find('.creer-blessure-critique').click(async event => await RdDItemBlessure.createBlessure(this.actor, 6));
+    this.html.find('.creer-blessure-legere').click(async event => RdDItemBlessure.createBlessure(this.actor, 2));
+    this.html.find('.creer-blessure-grave').click(async event => RdDItemBlessure.createBlessure(this.actor, 4));
+    this.html.find('.creer-blessure-critique').click(async event => RdDItemBlessure.createBlessure(this.actor, 6));
 
-    this.html.find('.subir-blessure-contusion').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 0));
-    this.html.find('.subir-blessure-legere').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 2));
-    this.html.find('.subir-blessure-grave').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 4));
-    this.html.find('.subir-blessure-critique').click(async event => await RdDItemBlessure.applyFullBlessure(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 => await this.actor.jetDeVie())
+    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 => await this.actor.santeIncDec("vie", 1))
-    this.html.find('.vie-moins').click(async event => await this.actor.santeIncDec("vie", -1))
+    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() {

module/actor/base-actor-sang.js

@@ -1,12 +1,11 @@
-import { RdDUtility } from "../rdd-utility.js";
+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 "../constants.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";
-import { Misc } from "../misc.js";
 
 /**
  * Classe de base pour les acteurs qui peuvent subir des blessures
@@ -15,37 +14,25 @@ import { Misc } from "../misc.js";
  */
 export class RdDBaseActorSang extends RdDBaseActorReve {
 
-  prepareActorData() {
-    this.system.sante.vie.max = Math.ceil((this.getTaille() + this.getConstitution()) / 2)
-    this.system.sante.vie.value = Math.min(this.system.sante.vie.value, this.system.sante.vie.max)
-    super.prepareActorData()
-    this.system.attributs.encombrement.value = this.getEncombrementMax()
-  }
 
-  getForce() { return Misc.toInt(this.system.carac.force?.value) }
-  getConstitution() { return Misc.toInt(this.system.carac.constitution?.value) }
-  getVolonte() { return Misc.toInt(this.system.carac.volonte?.value) }
+  getForce() { return Number(this.system.carac.force?.value ?? 0) }
 
-  getVieMax() { return Misc.toInt(this.system.sante.vie?.max) }
-  getEnduranceMax() { return Math.max(1, this.getTaille() + this.getConstitution()) }
-  getFatigueMax() { return this.getEnduranceMax() * 2 }
+  getBonusDegat() { return Number(this.system.attributs?.plusdom?.value ?? 0) }
+  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
+  getSConst() { return 0 }
 
-  getProtectionNaturelle() { return Misc.toInt(this.system.attributs?.protection?.value) }
+  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(),  Misc.toInt(this.system.sante.fatigue?.value)))
+      return Math.max(0, Math.min(this.getFatigueMax(), this.system.sante.fatigue?.value ?? 0));
     }
     return 0;
   }
 
-  isCumulFatigueCauseSommeil(cumulFatigue){
-    return ReglesOptionnelles.isUsing("appliquer-fatigue")
-    ? (this.getFatigueRestante() <= cumulFatigue)
-    : (this.getEnduranceActuelle() <= cumulFatigue)
-  }
-  getFatigueRestante() {return this.getFatigueMax() - this.getFatigueActuelle() }
+  getFatigueRestante() { return this.getFatigueMax() - this.getFatigueActuelle() }
   getFatigueMin() { return this.system.sante.endurance.max - this.system.sante.endurance.value }
+  getFatigueMax() { return this.getEnduranceMax() * 2 }
 
   malusFatigue() {
     if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
@@ -55,6 +42,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   }
 
   /* -------------------------------------------- */
+  getEncombrementMax() { return Number(this.system.attributs?.encombrement?.value ?? 0) }
   isSurenc() { return this.computeMalusSurEncombrement() < 0 }
 
   computeMalusSurEncombrement() {
@@ -203,7 +191,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
       encaissement.mort = true;
       ChatMessage.create({
         content: `<img class="chat-icon" src="icons/svg/skull.svg" data-tooltip="charge" />
-        <strong>${this.getAlias()} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
+        <strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
       });
     }
     return blessure;
@@ -230,7 +218,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   async jetDeVie() {
     if (this.isDead()) {
       ChatMessage.create({
-        content: `Jet de Vie: ${this.getAlias()} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`,
+        content: `Jet de Vie: ${this.name} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`,
         whisper: ChatUtility.getOwners(this)
       })
       return
@@ -254,7 +242,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
       await this.santeIncDec("vie", -perte);
     }
     if (this.isDead()) {
-      msgText += `<br><strong>${this.getAlias()} est mort !!!!</strong>`;
+      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)'}`
@@ -285,14 +273,14 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
 
   async setSonne(sonne = true) {
     if (!game.combat && sonne) {
-      ui.notifications.info(`${this.getAlias()} est hors combat, il ne reste donc pas sonné`);
+      ui.notifications.info(`${this.name} est hors combat, il ne reste donc pas sonné`);
       return;
     }
-    await this.setEffect(STATUSES.StatusStunned, sonne)
+    await this.setEffect(STATUSES.StatusStunned, sonne);
   }
 
-  isSonne() {
-    return this.getEffect(STATUSES.StatusStunned)
+  getSonne() {
+    return this.getEffect(STATUSES.StatusStunned);
   }
 
   isEffectAllowed(effectId) { return true }

module/actor/base-actor-sheet.js

@@ -3,23 +3,19 @@ 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 { ITEM_TYPES } from "../constants.js";
-import { RdDItem } from "../item.js";
+import { RdDItem, ITEM_TYPES } from "../item.js";
 import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
-import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
-import { ItemAction } from "../item/item-actions.js";
 
 /* -------------------------------------------- */
 /**
  * Extend the basic ActorSheet with some very simple modifications
  * @extends {ActorSheet}
  */
-export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
-  static _warnedAppV1 = true
+export class RdDBaseActorSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(foundry.appv1.sheets.ActorSheet.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 }],
@@ -29,7 +25,7 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    Monnaie.validerMonnaies(this.actor)
+    Monnaie.validerMonnaies(this.actor.itemTypes['monnaie']);
 
     this.actor.computeEtatGeneral();
     let formData = {
@@ -39,13 +35,13 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
       img: this.actor.img,
       name: this.actor.name,
       system: this.actor.system,
-      description: await RdDTextEditor.enrichHTML(this.actor.system.description, this.actor),
-      notesmj: await RdDTextEditor.enrichHTML(this.actor.system.notesmj, this.actor),
+      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
     }
 
-    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
+    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
     formData.calc = {
       fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
       prixTotalEquipement: this.actor.computePrixTotalEquipement(),
@@ -57,7 +53,6 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
     formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
       .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
-
     return formData;
   }
 
@@ -81,49 +76,122 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
     }
   }
 
+  /* -------------------------------------------- */
+  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('.actionItem').click(async event => await ItemAction.onActionItem(event, this.actor, this.options))
-    this.html.find('.item-edit').click(async event => await this.itemActionEdit(event))
     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 => await this.actor.postActorToChat());
+      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)
+      .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-equip-armure').click(async event => await this.actor.equiperObjet(this.getItem(event)))
-    this.html.find('.item-delete').click(async event => await RdDUtility.confirmActorItemDelete(this.getItem(event), this.actor));
-    this.html.find('.item-quantite-plus').click(async event => await this.actor.itemQuantiteIncDec(this.getItemId(event), 1));
-    this.html.find('.item-quantite-moins').click(async event => await this.actor.itemQuantiteIncDec(this.getItemId(event), -1));
+    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('.creer-un-objet').click(async event => await this.selectObjetTypeToCreate())
-    this.html.find('.nettoyer-conteneurs').click(async event => await this.actor.nettoyerConteneurs())
+
+    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)
+      this.options.vueDetaillee = !this.options.vueDetaillee;
+      this.render(true);
     });
-  }
 
-  itemActionEdit(event) {
-    const item = this.getItem(event);
-    return item?.sheet.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) {
@@ -192,7 +260,7 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
   /* -------------------------------------------- */
   async selectObjetTypeToCreate() {
     let types = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
-    let content = `<span class="generic-label">Selectionnez le type d'équipement</span><select class="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>`
     }

module/actor/base-actor.js

@@ -3,7 +3,7 @@ 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 "../constants.js";
+import { ITEM_TYPES } from "../item.js";
 import { Misc } from "../misc.js";
 import { RdDAudio } from "../rdd-audio.js";
 import { RdDConfirm } from "../rdd-confirm.js";
@@ -18,25 +18,14 @@ export class RdDBaseActor extends Actor {
       .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', onMessage: m => { } });
+    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 getDefaultValue(actorType, path) {
-    if (path.includes('.')) {
-      path = path.split('.')
-    }
-    let obj = game.model.Actor[actorType]
-    for (let p of path) {
-      obj = obj ? obj[p] : undefined
-    }
-    return obj
-  }
 
   static getDefaultImg(itemType) {
     return game.system.rdd.actorClasses[itemType]?.defaultIcon ?? defaultItemImg[itemType];
@@ -56,28 +45,26 @@ export class RdDBaseActor extends Actor {
     }
   }
 
-  static remoteActorCall(callData) {
-    if (game.user.isGM) {
-      RdDBaseActor.onRemoteActorCall(callData, game.user.id)
-      return false
+  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: Misc.firstConnectedGMId()
-      })
-      return true
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: callData, userId: userId });
+      return true;
     }
   }
 
   static onRemoteActorCall(callData, userId) {
-    const actor = RdDBaseActor.getRealActor(callData?.actorId, callData?.tokenId);
     if (userId == game.user.id) {
-      // 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);
+      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);
+      }
     }
   }
 
@@ -91,13 +78,6 @@ export class RdDBaseActor extends Actor {
     return game.actors.get(actorId)
   }
 
-  getAlias() {
-    if (this.token?.name != null && this.token != this.prototypeToken) {
-      return this.token.name
-    }
-    return this.name
-  }
-
   isPersonnageJoueur() { return false }
 
   static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
@@ -160,11 +140,8 @@ export class RdDBaseActor extends Actor {
     return RdDBaseActor.$findCaracByName(carac, name);
   }
 
-  mapCarac(caracCode) { return caracCode }
-
   getCaracByName(name) {
-    name = this.mapCarac(Grammar.toLowerCaseNoAccent(name))
-    switch (name) {
+    switch (Grammar.toLowerCaseNoAccent(name)) {
       case 'reve-actuel': case 'reve actuel':
         return this.getCaracReveActuel();
       case 'chance-actuelle': case 'chance-actuelle':
@@ -178,19 +155,11 @@ export class RdDBaseActor extends Actor {
     await super._preCreate(data, options, user);
 
     // Configure prototype token settings
-    if (this.type === "personnage") {
-      this.updateSource({
-        sight: { enabled: true },
-        actorLink: options.fromCompendium ? data.prototypeToken.actorLink : true,
-        disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
-      })
-    } else {
-      const prototypeToken = {
-        sight: { enabled: true },
-        disposition: CONST.TOKEN_DISPOSITIONS.NEUTRAL
-      }
-      this.updateSource({ prototypeToken });
-    }
+    const prototypeToken = {};
+    if (this.type === "personnage") Object.assign(prototypeToken, {
+      sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+    });
+    this.updateSource({ prototypeToken });
   }
 
   /* -------------------------------------------- */
@@ -202,8 +171,7 @@ export class RdDBaseActor extends Actor {
     this.computeEncTotal()
   }
 
-  prepareActorData() { }
-
+  async prepareActorData() { }
   async computeEtatGeneral() { }
   /* -------------------------------------------- */
   findPlayer() {
@@ -235,29 +203,14 @@ export class RdDBaseActor extends Actor {
   getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
   getEncombrementMax() { return 0 }
 
-  /* -------------------------------------------- */
-  async updateCarac(caracName, to) {
-  }
   /* -------------------------------------------- */
   async onPreUpdateItem(item, change, options, id) { }
-  async onCreateItem(item, options, id) { }
-  async onUpdateActor(update, options, actorId) { }
-  async onDeleteItem(item, options, id) {
-    if (item.isInventaire()) {
-      await this._removeItemFromConteneur(item)
-    }
-  }
 
-  async _removeItemFromConteneur(item) {
-    const updates = this.items.filter(it => it.isConteneur() && it.system.contenu.includes(item.id))
-      .map(conteneur => {
-        const nouveauContenu = conteneur.system.contenu.filter(id => id != item.id)
-        return { _id: conteneur.id, 'system.contenu': nouveauContenu }
-      })
-    if (updates.length > 0) {
-      await this.updateEmbeddedDocuments('Item', updates)
-    }
-  }
+  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))
@@ -265,20 +218,21 @@ export class RdDBaseActor extends Actor {
   }
 
   async creerObjetParMJ(object) {
-    if (this.isOwner) {
-      await this.createEmbeddedDocuments('Item', [object])
-      return
+    if (!Misc.isFirstConnectedGM()) {
+      RdDBaseActor.remoteActorCall({
+        tokenId: this.token?.id,
+        actorId: this.id,
+        method: 'creerObjetParMJ',
+        args: [object]
+      });
+      return;
     }
-    RdDBaseActor.remoteActorCall({
-      tokenId: this.token?.id,
-      actorId: this.id,
-      method: 'creerObjetParMJ', args: [object]
-    })
+    await this.createEmbeddedDocuments('Item', [object])
   }
 
   /* -------------------------------------------- */
   async cleanupConteneurs() {
-    if (Misc.isOwnerPlayer(this)) {
+    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) } });
@@ -349,7 +303,7 @@ export class RdDBaseActor extends Actor {
       ui.notifications.error(`Impossible d'ajouter un gain de ${sols} <0`);
       return;
     }
-    if (fromActorId && !this.isOwner) {
+    if (fromActorId && !game.user.isGM) {
       RdDBaseActor.remoteActorCall({
         userId: Misc.connectedGMOrUser(),
         tokenId: this.token?.id,
@@ -363,7 +317,7 @@ export class RdDBaseActor extends Actor {
 
       RdDAudio.PlayContextAudio("argent"); // Petit son
       ChatMessage.create({
-        whisper: ChatUtility.getOwners(this),
+        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.`
       });
     }
@@ -384,9 +338,10 @@ export class RdDBaseActor extends Actor {
     if (!Misc.isFirstConnectedGM()) {
       RdDBaseActor.remoteActorCall({
         actorId: achat.vendeurId ?? achat.acheteurId,
-        method: 'achatVente', args: [achat]
+        method: 'achatVente',
+        args: [achat]
       });
-      return
+      return;
     }
     const cout = Number(achat.prixTotal ?? 0);
     const vendeur = achat.vendeurId ? game.actors.get(achat.vendeurId) : undefined;
@@ -415,9 +370,9 @@ export class RdDBaseActor extends Actor {
     chatAchatItem.quantiteTotal = quantite;
     ChatMessage.create({
       user: achat.userId,
-      speaker: { alias: (acheteur ?? vendeur).getAlias() },
+      speaker: { alias: (acheteur ?? vendeur).name },
       whisper: ChatUtility.getOwners(this),
-      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.hbs', chatAchatItem)
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.html', chatAchatItem)
     });
 
     if (!achat.vente.quantiteIllimite) {
@@ -731,41 +686,27 @@ export class RdDBaseActor extends Actor {
       type: this.type,
       img: this.img,
       pack: this.pack,
-      name: this.getAlias(),
+      name: this.name,
       system: { description: this.system.description }
     }
-    foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.hbs', chatData)
+    renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.html', chatData)
       .then(html => ChatMessage.create(RdDUtility.chatDataSetup(html, modeOverride)));
   }
 
   actionImpossible(action) {
-    ui.notifications.info(`${this.getAlias()} ne peut pas faire cette action: ${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 resetItemUse() { }
-  async incDecItemUse(itemId, shouldIncrease = true) { }
-  getItemUse(itemId) { return 0; }
-
-  async finDeRound(options = { terminer: false }) { }
-  isActorCombat() { return false }
-  getCaracInit(competence) { return 0 }
-
-  listActionsCombat() { return [] }
-  listActionsPossessions() {
-    return this.itemTypes[ITEM_TYPES.possession]
-      .map(p => {
-        return {
-          name: p.name,
-          action: 'possession',
-          system: {
-            competence: p.name,
-            possessionid: p.system.possessionid,
-          }
-        }
-      })
+  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,4 +1,6 @@
+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";
 
 /**
@@ -10,7 +12,7 @@ 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.hbs",
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
       width: 600, height: 720,
       tabs: []
     }, { inplace: false })
@@ -42,8 +44,12 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   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 });
@@ -57,4 +63,28 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   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,6 +1,4 @@
-import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
 import { Misc } from "../misc.js";
-import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActor } from "./base-actor.js";
 
 export class RdDCommerce extends RdDBaseActor {
@@ -27,6 +25,9 @@ export class RdDCommerce extends RdDBaseActor {
     }
     await super.depenserSols(cout)
   }
+  async consommerNourritureboisson(itemId, choix, userId) { 
+    // ne pas consommer pour un commerce
+  }
 
   async decrementerQuantiteItem(item, quantite) {
     if (this.system.illimite) {
@@ -39,27 +40,4 @@ export class RdDCommerce extends RdDBaseActor {
     const pourcentage = this.system.pourcentage ?? 100;
     return Misc.keepDecimals(Math.ceil(item.system.cout * pourcentage) / 100, 2);
   }
-  async vente(item) {
-    const acheteur = RdDUtility.getSelectedActor();
-    if (!acheteur) {
-      ui.notifications.warn(`Pas d'acheteur sélectionné`);
-      return;
-    }
-    const disponible = this.getQuantiteDisponible(item)
-    if (disponible == 0) {
-      ui.notifications.warn(`${this.getAlias()} n'a plus de ${item.name} en vente`);
-      return;
-    }
-
-    await DialogItemAchat.onAcheter({
-      item,
-      vendeur: this,
-      acheteur,
-      quantiteIllimite: disponible == undefined,
-      nbLots: disponible ?? 1,
-      tailleLot: 1,
-      prixLot: item.calculerPrixCommercant()
-    });
-  }
-  
 }

module/actor/creature-sheet.js

@@ -10,7 +10,7 @@ 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.hbs",
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
       width: 640, height: 720
     }, { inplace: false })
   }
@@ -26,15 +26,15 @@ export class RdDCreatureSheet extends RdDBaseActorSangSheet {
     // On competence change
     this.html.find('.creature-carac').change(async event => {
       let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.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;
-      await this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.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;
-      await this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
+      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
     });
   }
 }

module/actor/creature.js

@@ -1,6 +1,6 @@
-import { Grammar } from "../grammar.js";
-import { ITEM_TYPES } from "../constants.js";
-import { LIST_CARAC_AUTRES } from "../rdd-carac.js";
+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 {
@@ -9,7 +9,6 @@ export class RdDCreature extends RdDBaseActorSang {
     return "systems/foundryvtt-reve-de-dragon/icons/creatures/bramart.svg";
   }
 
-  getEnduranceMax() { return Math.max(1, this.getVieMax() + this.getConstitution()) }
   isCreature() { return true }
 
   canReceive(item) {
@@ -34,16 +33,4 @@ export class RdDCreature extends RdDBaseActorSang {
     }
   }
 
-  mapCarac(caracCode) {
-    switch (caracCode) {
-      case 'vue': case 'ouie': case 'odoratgout': case 'empathie': case 'perception':
-        return 'perception'
-      case 'agilite':
-        return 'force'
-      case 'force': case 'constitution': case 'taille': case 'reve': case 'volonte':
-        return caracCode
-    }
-    return undefined
-  }
-
 }

module/actor/entite-sheet.js

@@ -1,22 +1,19 @@
 import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
 import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { RdDUtility } from "../rdd-utility.js";
-import { DialogSelect } from "../dialog-select.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.hbs",
+      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.niveau = this.actor.getNiveau()
-    delete formData.system.carac.niveau
     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
@@ -33,32 +30,28 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
     // On competence change
     this.html.find('.creature-carac').change(async event => {
       let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.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;
-      await this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
-    })
-
-    this.html.find('.resonance-add').click(async event =>
-      await DialogSelect.select({
-        label: "Choisir un acteur à accorder",
-        list: game.actors.filter(it => it.isPersonnage() && it.prototypeToken.actorLink)
-      },
-        it => this.resonanceAdd(it.id))
-    )
-
+      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, () => {
-          this.resonanceDelete(actorId);
+          console.log('Delete : ', actorId);
+          this.deleteSubActeur(actorId);
           RdDUtility.slideOnDelete(this, li);
-        })
+        });
       }
-    })
+    });
   }
 
   async _onDropActor(event, dragData) {
@@ -67,13 +60,7 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
     super._onDropActor(event, dragData)
   }
 
-  async resonanceAdd(actorId) {
-    let newResonances = [...this.actor.system.sante.resonnance.actors, actorId]
-    await this.actor.update({ 'system.sante.resonnance.actors': newResonances });
-  }
-
-  async resonanceDelete(actorId) {
-    console.log('Delete : ', actorId);
+  async deleteSubActeur(actorId) {
     let newResonances = this.actor.system.sante.resonnance.actors.filter(id => id != actorId);
     await this.actor.update({ 'system.sante.resonnance.actors': newResonances }, { renderSheet: false });
   }

module/actor/entite.js

@@ -1,7 +1,6 @@
 import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
-import { ITEM_TYPES } from "../constants.js";
+import { ITEM_TYPES } from "../item.js";
 import { Misc } from "../misc.js";
-import { RdDCarac } from "../rdd-carac.js";
 import { RdDEncaisser } from "../rdd-roll-encaisser.js";
 import { STATUSES } from "../settings/status-effects.js";
 import { RdDBaseActorReve } from "./base-actor-reve.js";
@@ -19,27 +18,15 @@ export class RdDEntite extends RdDBaseActorReve {
   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)
   }
 
-  getCarac() {
-    const carac = super.getCarac()
-    delete carac.niveau
-    return carac
-  }
-
-  getNiveau() {
-    const reve = this.getReve()
-    return RdDCarac.getCaracDerivee(reve).niveau
-  }
   getForce() { return this.getReve() }
   getAgilite() { return this.getReve() }
   getChance() { return this.getReve() }
-  getEnduranceMax() { return Math.max(1, this.getTaille() + this.getReve()) }
 
   getDraconicOuPossession() {
     return this.itemTypes[ITEM_TYPES.competencecreature]
@@ -76,7 +63,6 @@ export class RdDEntite extends RdDBaseActorReve {
     }
     return {}
   }
-
   async encaisser() {
     if (this.isNonIncarnee()) {
       return
@@ -117,14 +103,4 @@ export class RdDEntite extends RdDBaseActorReve {
       super.setEntiteReveAccordee(actor)
     }
   }
-
-  mapCarac(caracCode) {
-    switch (caracCode) {
-      case 'taille':
-      case 'reve':
-        return caracCode
-    }
-    return 'reve'
-  }
-
 }

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

@@ -6,8 +6,8 @@ import { ExportScriptarium } from "./export-scriptarium.js";
 import { CATEGORIES_COMPETENCES, CATEGORIES_DRACONIC, Mapping } from "./mapping.js";
 
 export class RdDActorExportSheet extends RdDActorSheet {
-  static init() {
-    foundry.applications.handlebars.loadTemplates([
+  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",
@@ -21,9 +21,8 @@ export class RdDActorExportSheet extends RdDActorSheet {
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/protection.hbs",
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/sort.hbs",
     ])
-    foundry.documents.collections.Actors.registerSheet(SYSTEM_RDD, RdDActorExportSheet, { types: ["personnage"], makeDefault: false, label: "Feuille simplifiée" })
+    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",
@@ -104,12 +103,13 @@ export class RdDActorExportSheet extends RdDActorSheet {
     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 => await
+    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,9 +1,9 @@
-import { ACTOR_TYPES } from "../../constants.js"
+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/assets/ui/scriptarium.svg">'
+const IMG_SCRIPTARIUM = '<img class="context-menu-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/scriptarium.svg">'
 
 export class ExportScriptarium {
 

module/actor/export-scriptarium/mapping.js

@@ -2,7 +2,7 @@ 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 "../../constants.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"
@@ -76,16 +76,15 @@ const MAPPING_BASE = [
   { 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.getBonusDegat() },
+  { 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: "chance_actuel", rollClass: 'roll-chance-actuelle', colName: 'Chance actuelle', getter: (actor, context) => actor.system.compteurs.chance.value },
   { column: "vie_actuel", rollClass: 'jet-vie', getter: (actor, context) => actor.system.sante.vie.value },
-  { column: "endurance_actuel", rollClass: 'jet-endurance', getter: (actor, context) => actor.system.sante.endurance.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) },
@@ -141,53 +140,45 @@ export class Mapping {
 
   static prepareArmes(actor) {
     const armes = actor.items.filter(it => it.type == ITEM_TYPES.arme)
-    armes.push(RdDItemArme.corpsACorps(actor));
-    armes.push(RdDItemArme.empoignade(actor));
-    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), [])
+    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 nameCompetenceArme = RdDItemArme.getCompetenceArme(arme, maniement)
-    const competence = actor.getCompetence(nameCompetenceArme)
+    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)
-    const dommages = Mapping.dommagesArme(actor, arme, maniement)
     return {
       name: arme.name + categorie,
       niveau: Misc.toSignedString(competence.system.niveau),
       init: Mapping.calculBaseInit(actor, competence.system.categorie) + competence.system.niveau,
-      dommages: dommages,
+      dommages: Misc.toSignedString(dommages),
       competence: competence,
       arme: arme
     }
   }
-  static dommagesArme(actor, arme, maniement) {
-    const dmgArme = RdDItemArme.dommagesReels(arme, maniement)
-    const dommages = Misc.toSignedString(dmgArme + RdDBonus.bonusDmg(actor, maniement, dmgArme))
-    switch (arme.system.mortalite) {
-      case 'non-mortel': return `(${dommages})`
-      case 'empoignade': return '-'
-    }
-    return dommages
-  }
 
   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 '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 ''
+    return '' 
   }
 
   static calculBaseInit(actor, categorie) {
@@ -239,7 +230,7 @@ export class Mapping {
 
   static prepareSorts(actor) {
     const codeVoies = Mapping.getCompetencesCategorie(actor, CATEGORIES_DRACONIC)
-      .map(it => RdDItemSort.getCodeVoie(it.name))
+      .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}`))
@@ -247,7 +238,7 @@ export class Mapping {
 
   static prepareSort(sort, voies) {
     return {
-      voie: RdDItemSort.getCode(sort, voies),
+      voie: RdDItemSort.getCodeDraconic(sort, voies),
       description: Mapping.descriptionSort(sort),
       bonus: Mapping.bonusCase(sort)
     }
@@ -256,16 +247,21 @@ export class Mapping {
   static descriptionSort(sort) {
     const ptSeuil = Array(sort.system.coutseuil).map(it => '*')
     const caseTMR = sort.system.caseTMRspeciale.length > 0 ? Mapping.toVar(sort.system.caseTMRspeciale) : Misc.upperFirst(TMRType[sort.system.caseTMR].name)
-    const coutReve = 'r' + RdDItemSort.addSpaceToNonNumeric(sort.system.ptreve)
-    const diff = 'R' + RdDItemSort.addSpaceToNonNumeric(sort.system.difficulte)
-    return `${sort.name}${ptSeuil} (${caseTMR}) ${diff} ${coutReve}`
+    const ptreve = Mapping.addSpaceToNonNumeric(sort.system.ptreve)
+    const diff = Mapping.addSpaceToNonNumeric(sort.system.difficulte)
+    return `${sort.name}${ptSeuil} (${caseTMR}) R${diff} r${ptreve}`
   }
-  static toVar(caseSpeciale) {
-    return Grammar.toLowerCaseNoAccent(caseSpeciale).startsWith('var') ? 'var' : caseSpeciale
+
+  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.stringToBonuscases(sort.system.bonuscase).sort(Misc.descending(it => it.bonus))
+    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}`
@@ -279,7 +275,7 @@ export class Mapping {
     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 >0) ? `${actor.system.age} ans` : undefined
+    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
@@ -331,8 +327,7 @@ export class Mapping {
     const txtByCategories = Object.values(byCategories)
       .map(it => it.competencesParNiveau)
       .map(byNiveau => {
-        const niveaux = Object.keys(byNiveau)
-          .map(it => Number(it)).sort(Misc.ascending())
+        const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())
         if (niveaux.length == 0) {
           return ''
         }

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

@@ -19,14 +19,14 @@ const PATHS = [
 
 const RANDOM_VALUES = {
   'system.sexe': { 'masculin': 1, 'féminin': 1 },
-  'system.main': { 'droitier': 51, 'gaucher': 15, 'ambidextre': 6 },
+  '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() {
-    foundry.applications.handlebars.loadTemplates([
+    loadTemplates([
       'systems/foundryvtt-reve-de-dragon/templates/actor/random/champ-aleatoire.hbs',
     ])
   }

module/actor/vehicule-sheet.js

@@ -7,7 +7,7 @@ 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.hbs",
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
       width: 640, height: 720,
     }, { inplace: false })
   }
@@ -32,10 +32,18 @@ export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
     super.activateListeners(html);
     if (!this.options.editable) return;
 
-    this.html.find('.resistance-moins').click(async event => await this.actor.vehicleIncDec("resistance", -1))
-    this.html.find('.resistance-plus').click(async event => await this.actor.vehicleIncDec("resistance", 1))
-    this.html.find('.structure-moins').click(async event => await this.actor.vehicleIncDec("structure", -1))
-    this.html.find('.structure-plus').click(async event => await this.actor.vehicleIncDec("structure", 1))
+    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);
+    });
   }
 
 }

module/applications/sheets/_module.mjs

@@ -1,5 +0,0 @@
-export { default as RdDItemBaseSheet} from "./common-item-sheet.mjs"
-export { default as RdDMonnaieSheet } from "./monnaie-sheet.mjs"
-export { default as RdDMunitionSheet } from "./munition-sheet.mjs"
-export { default as RdDTarotSheet } from "./tarot-sheet.mjs"
-

module/applications/sheets/common-item-sheet.mjs

@@ -1,111 +0,0 @@
-const { HandlebarsApplicationMixin } = foundry.applications.api
-import { SYSTEM_RDD } from "../../constants.js"
-import { Misc } from "../../misc.js"
-import { RdDSheetUtility } from "../../rdd-sheet-utility.js";
-
-
-export default class RdDItemBaseSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
-
-  static preloadHandlebars(...templatesList) {
-    const handlebars = ["systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"]
-    templatesList.forEach(templates =>
-      templates.forEach(t =>
-        t.handlebars().forEach(h => handlebars.push(h))
-      )
-    )
-    loadTemplates(Misc.distinct(handlebars))
-  }
-
-  static register(sheetClass) {
-    const itemType = sheetClass.ITEM_TYPE
-    Items.registerSheet(SYSTEM_RDD, sheetClass, {
-      label: Misc.typeName('Item', itemType),
-      types: [itemType],
-      makeDefault: true
-    })
-  }
-
-  static registerAll(...sheetClasses) {
-    const handlebars = ["systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"]
-    sheetClasses.forEach(sheetClass => {
-      sheetClass.TEMPLATES.forEach(t =>
-        t.handlebars().forEach(h => handlebars.push(h))
-      )
-      const itemType = sheetClass.ITEM_TYPE
-      foundry.documents.collections.Items.registerSheet(SYSTEM_RDD, sheetClass, {
-        label: Misc.typeName('Item', itemType),
-        types: [itemType],
-        makeDefault: true
-      })
-    })
-    foundry.applications.handlebars.loadTemplates(Misc.distinct(handlebars))
-  }
-
-  static get ITEM_TYPE() { return undefined }
-
-  constructor(options = {}) {
-    super(options)
-  }
-
-  static get TEMPLATES() { return [] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = {
-    classes: ["fvtt-rdd", "item"],
-    position: {
-      width: 448,
-      height: "auto",
-    },
-    form: {
-      submitOnChange: true,
-    },
-    window: {
-      resizable: true,
-    },
-    actions: {
-      editImage: RdDItemBaseSheet.#onEditImage,
-    }
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return {
-      item: this.document,
-      options: RdDSheetUtility.getOptions(this.document, this.isEditable),
-      fields: this.document.schema.fields,
-      systemFields: this.document.system.schema.fields,
-      system: this.document.system,
-      source: this.document.toObject(),
-      isEditable: this.isEditable,
-    }
-  }
-
-  // #region Actions
-
-  /**
-   * Handle changing a Document's image.
-   *
-   * @this RdDItemBaseSheet
-   * @param {PointerEvent} event   The originating click event
-   * @param {HTMLElement} target   The capturing HTML element which defined a [data-action]
-   * @returns {Promise}
-   * @private
-   */
-  static async #onEditImage(event, target) {
-    const attr = target.dataset.edit
-    const current = foundry.utils.getProperty(this.document, attr)
-    const { img } = this.document.constructor.getDefaultArtwork?.(this.document.toObject()) ?? {}
-    const fp = new FilePicker({
-      current,
-      type: "image",
-      redirectToRoot: img ? [img] : [],
-      callback: (path) => {
-        this.document.update({ [attr]: path })
-      },
-      top: this.position.top + 40,
-      left: this.position.left + 10,
-    })
-    return fp.browse()
-  }
-  // #endregion
-}

module/applications/sheets/monnaie-sheet.mjs

@@ -1,35 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemBaseSheet from "./common-item-sheet.mjs";
-
-export default class RdDMonnaieSheet extends RdDItemBaseSheet {
-
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.monnaie }
-  static get TEMPLATES() { return [TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = Object.assign({},
-    RdDItemBaseSheet.DEFAULT_OPTIONS,
-    {
-      classes: ["fvtt-rdd", "item", "monnaie"],
-      position: { width: 448 },
-      window: { contentClasses: ["monnaie-content"] }
-    })
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/sheets/item/monnaie.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return Object.assign(
-      await super._prepareContext(),
-      await TEMPLATE_DESCRIPTION.prepareContext(this.document),
-      await TEMPLATE_INVENTAIRE.prepareContext(this.document)
-    )
-  }
-}

module/applications/sheets/munition-sheet.mjs

@@ -1,34 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemBaseSheet from "./common-item-sheet.mjs";
-
-export default class RdDMunitionSheet extends RdDItemBaseSheet {
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.munition }
-  static get TEMPLATES() { return [TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = Object.assign({},
-    RdDItemBaseSheet.DEFAULT_OPTIONS,
-    {
-      classes: ["fvtt-rdd", "item", "munition"],
-      position: { width: 448 },
-      window: { contentClasses: ["munition-content"] }
-    })
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/sheets/item/munition.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return Object.assign(
-      await super._prepareContext(),
-      await TEMPLATE_DESCRIPTION.prepareContext(this.document),
-      await TEMPLATE_INVENTAIRE.prepareContext(this.document)
-    )
-  }
-}

module/applications/sheets/tarot-sheet.mjs

@@ -1,33 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemBaseSheet from "./common-item-sheet.mjs";
-
-export default class RdDTarotSheet extends RdDItemBaseSheet {
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.tarot }
-  static get TEMPLATES() { return [TEMPLATE_DESCRIPTION] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = Object.assign({},
-    RdDItemBaseSheet.DEFAULT_OPTIONS,
-    {
-      classes: ["fvtt-rdd", "item", "tarot"],
-      position: { width: 448 },
-      window: { contentClasses: ["tarot-content"] }
-    })
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/sheets/item/tarot.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return Object.assign(
-      await super._prepareContext(),
-      await TEMPLATE_DESCRIPTION.prepareContext(this.document)
-    )
-  }
-}

module/apps/rdd-import-stats.js

@@ -1,706 +0,0 @@
-/************************************************************************************/
-import "./xregexp-all.js";
-import { SystemCompendiums } from "../settings/system-compendiums.js";
-import { RdDBaseActorReve } from "../actor/base-actor-reve.js";
-import { Grammar } from "../grammar.js";
-import { Misc } from "../misc.js";
-import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
-import { RdDItemTete } from "../item/tete.js";
-import { ITEM_TYPES } from "../constants.js";
-
-const WHITESPACES = "\\s+"
-const NUMERIC = "[\\+\\-]?\\d+"
-const NUMERIC_VALUE = "(?<value>" + NUMERIC + ")"
-
-const XREGEXP_COMP_CREATURE = WHITESPACES + "(?<carac>\\d+)"
-  + WHITESPACES + NUMERIC_VALUE
-  + "(" + WHITESPACES + "(?<init>\\d+)?\\s+?(?<dommages>[\\+\\-]?\\d+)?" + ")?"
-
-// Skill parser depending on the type of actor
-const compParser = {
-  personnage: "(\\s+\\((?<special>[^\\)]+)\\))?(,\\s*\\p{Letter}+)*(\\s+(?<malus>avec armure))?" + WHITESPACES + NUMERIC_VALUE,
-  creature: XREGEXP_COMP_CREATURE,
-  entite: XREGEXP_COMP_CREATURE
-}
-
-const MANIEMENTS = {
-  'de lancer': (weapon) => { return { name: weapon.system.lancer, categorie: 'lancer' } },
-  'de jet': (weapon) => { return { name: weapon.system.lancer, categorie: 'lancer' } },
-  'à une main': (weapon) => { return { name: weapon.system.competence, categorie: 'melee' } },
-  'à deux mains': (weapon) => { return { name: weapon.system.competence.replace("à 1 main", "à 2 mains"), categorie: 'melee' } },
-  'mêlée': (weapon) => { return { name: weapon.system.competence, categorie: 'melee' } },
-}
-const XREGEXP_WEAPON_MANIEMENT = "(?<maniement>(" + Misc.join(Object.keys(MANIEMENTS), '|') + "))"
-
-const XREGEXP_SORT_VOIE = "(?<voies>[OHNT](\\/[OHNT])*)"
-const XREGEXP_SORT_NAME = "(?<name>[^\\(]+)"
-const XREGEXP_SORT_CASE = "(?<coord>([A-Za-zÀ-ÖØ-öø-ÿ\\s\\-]+|[A-M]\\d{1,2}))"
-
-const XREGEXP_SORT = "(" + XREGEXP_SORT_VOIE
-  + WHITESPACES + XREGEXP_SORT_NAME
-  + WHITESPACES + "\\(" + XREGEXP_SORT_CASE + "\\)"
-  + WHITESPACES + "R(?<diff>([\\-\\d]+|(\\w|\\s)+))"
-  + WHITESPACES + "r(?<reve>(\\d+(\\+)?|\\s\\w+))"
-  + "(" + WHITESPACES + "\\+(?<bonus>\\d+)\\s?%" + WHITESPACES + "en" + WHITESPACES + "(?<bonuscase>[A-M]\\d{1,2})" + ")?"
-  + ")"
-
-const XREGEXP_SORTRESERVE_CASE = "(?<coord>[A-M]\\d{1,2})";
-
-const XREGEXP_SORT_RESERVE = XREGEXP_SORTRESERVE_CASE
-  + WHITESPACES + XREGEXP_SORT_NAME
-  + WHITESPACES + "(\\((?<description>[^\\)]+)\\))?"
-
-// Main class for parsing a stat block
-export class RdDStatBlockParser {
-
-  static openInputDialog() {
-    let dialog = new Dialog({
-      title: "Import de stats de PNJ/Créatures",
-      content: `
-        <div>
-          <p>Coller le texte de la stat ici</p>
-          <textarea id="statBlock" style="width: 100%; height: 200px;"></textarea>
-        </div>
-      `,
-      buttons: {
-        ok: {
-          label: "OK",
-          callback: async (html) => {
-            let statBlock = html.find("#statBlock")[0].value;
-            await RdDStatBlockParser.parseStatBlock(statBlock);
-            dialog.close();
-          }
-        },
-        cancel: {
-          label: "Cancel"
-        }
-      }
-    });
-    dialog.render(true);
-  }
-
-  static fixWeirdPDF(statString) {
-    // Split the statString into lines
-    let lines = statString.split("\n");
-    let newLines = [];
-    let index = 0;
-    let nextType = "string";
-    // Loop through each line
-    for (let i = 0; i < lines.length; i++) {
-      // remove trailing spaces
-      lines[i] = lines[i].trim();
-      // Is it text ?      
-      if (lines[i].match(/^[a-zA-Zéêè\s]+/)) {
-        if (nextType == "string") {
-          newLines[index] = lines[i];
-          nextType = "number";
-        } else {
-          console.log("Wrong sequence string detected...", lines[i], nextType);
-        }
-      }
-      // Is it a number ?
-      if (lines[i].match(/^[\d\s]+/)) {
-        if (nextType == "number") {
-          newLines[index] = newLines[index] + lines[i];
-          nextType = "string";
-          index++;
-        } else {
-          console.log("Wrong sequence number detected...", lines[i], nextType);
-        }
-      }
-    }
-  }
-
-  static getHeureKey(heure) {
-    for (let h of game.system.rdd.config.heuresRdD) {
-      if (h.label.toLowerCase() == heure.toLowerCase()) {
-        return h.value;
-      }
-    }
-    return "vaisseau";
-  }
-
-  static fixCompName(name) {
-    name = name.replace("Voie d'", "");
-    name = name.replace("Voie de ", "");
-    return name
-  }
-
-  static async parseStatBlock(statString) {
-
-    //statString = statBlock03;
-    if (!statString) {
-      return;
-    }
-
-    // Special function to fix strange/weird copy/paste from PDF readers
-    // Unused up to now : this.fixWeirdPDF(statString);
-
-    // Replace all endline by space in the statString
-    statString = statString.replace(/\n/g, " ");
-    // Remove all multiple spaces
-    statString = statString.replace(/\s{2,}/g, " ");
-    // Remove all leading and trailing spaces
-    statString = statString.trim();
-
-    // TODO: check for entite
-    let type = RdDStatBlockParser.parseActorType(statString);
-
-    // Now start carac 
-    let actorData = foundry.utils.deepClone(game.model.Actor[type]);
-    let items = [];
-
-    actorData.flags = { hautRevant: false, malusArmure: 0, type }
-    for (let key in actorData.carac) {
-      let caracDef = actorData.carac[key];
-      // Parse the stat string for each caracteristic
-      let carac = XRegExp.exec(statString, XRegExp(caracDef.label + "\\s+(?<value>\\d+)", 'giu'));
-      if (carac?.value) {
-        actorData.carac[key].value = Number(carac.value);
-      }
-    }
-
-    // If creature we need to setup additionnal fields 
-    switch (type) {
-      case "creature":
-        RdDStatBlockParser.parseCreature(statString, actorData)
-        await RdDStatBlockParser.parseCompetences(statString, actorData, items)
-        break
-      case "entite":
-        RdDStatBlockParser.parseEntite(statString, actorData)
-        await RdDStatBlockParser.parseCompetences(statString, actorData, items)
-        break
-      case "personnage":
-        await RdDStatBlockParser.parseArmors(statString, actorData, items);
-        await RdDStatBlockParser.parseCompetences(statString, actorData, items);
-        await RdDStatBlockParser.parseWeapons(statString, items);
-        await RdDStatBlockParser.parseHautReve(statString, actorData, items);
-        RdDStatBlockParser.parsePersonnage(statString, actorData);
-    }
-
-    const name = RdDStatBlockParser.extractName(type, statString);
-
-    actorData.flags = undefined
-    console.log(actorData);
-
-    let newActor = await RdDBaseActorReve.create({ name, type, system: actorData, items });
-    await newActor.remiseANeuf()
-    await RdDStatBlockParser.adjustAttacks(newActor)
-    await RdDStatBlockParser.setValeursActuelles(newActor, statString)
-    await newActor?.sheet.render(true)
-  }
-
-  static async parseCompetences(statString, actorData, items) {
-    const competences = await SystemCompendiums.getCompetences(actorData.flags.type);
-    //console.log("Competences : ", competences);
-    for (let competence of competences) {
-      let pushed = actorData.flags.type != "personnage"
-      let compNameToSearch = RdDStatBlockParser.fixCompName(competence.name)
-      XRegExp.forEach(statString, XRegExp("\\s" + compNameToSearch + compParser[actorData.flags.type], 'giu'),
-        function (compMatch, i) {
-          items.push(RdDStatBlockParser.prepareCompetence(actorData, competence, compMatch))
-          if (!compMatch.special) {
-            pushed = true
-          }
-        })
-      if (!pushed) {
-        // ajout niveau de base
-        items.push(competence.toObject())
-      }
-
-    }
-  }
-
-  static prepareCompetence(actorData, competence, compMatch) {
-    const comp = competence.toObject();
-    if (compMatch.special) {
-      comp._id = undefined
-      comp.name = `${comp.name} (${compMatch.special})`
-    }
-    comp.system.niveau = Number(compMatch.value);
-    if (compMatch.malus) {
-      comp.system.niveau = Number(compMatch.value) - actorData.flags.malusArmure
-    }
-    if (comp.system.categorie == 'draconic' && comp.system.niveau > -11) {
-      actorData.flags.hautRevant = true
-    }
-    if (["creature", "entite"].includes(actorData.flags.type)) {
-      comp.system.carac_value = Number(compMatch.carac);
-      if (compMatch.dommages != undefined) {
-        comp.system.dommages = Number(compMatch.dommages)
-        comp.system.iscombat = true
-      }
-    }
-    return comp
-  }
-
-  static async parseArmors(statString, actorData, items) {
-    const armors = await SystemCompendiums.getWorldOrCompendiumItems("armure", "equipement");
-    for (let armor of armors) {
-      let matchArmor = XRegExp.exec(statString, XRegExp(armor.name, 'giu'));
-      if (matchArmor) {
-        armor = armor.toObject()
-        armor.system.equipe = true
-        actorData.flags.malusArmure = armor.system.malus
-        items.push(armor)
-        break
-      }
-    }
-  }
-
-  static async parseWeapons(statString, items) {
-    const weapons = await SystemCompendiums.getWorldOrCompendiumItems("arme", "equipement");
-    //console.log("Equipement : ", equipment);
-    // TODO: les noms d'armes peuvent avoir un suffixe (à une main, lancée) qui détermine la compétence correspondante
-    // TODO: une arme peut être spécifique ("fourche"), ajouter une compétence dans ces cas là?
-    for (let weapon of weapons) {
-      let nomArmeManiement = XRegExp.exec(weapon.name, XRegExp(".*" + XREGEXP_WEAPON_MANIEMENT));
-      if (nomArmeManiement) {
-        continue // ignore les objets 'Dague de jet" ou "dague mêlée"
-      }
-      let weapMatch = XRegExp.exec(statString, XRegExp(weapon.name
-        + "(\\s*" + XREGEXP_WEAPON_MANIEMENT + ")?"
-        + "\\s+(?<value>[\\+\\-]?\\d+)", 'giu'));
-      if (weapMatch) {
-        weapon = weapon.toObject();
-        weapon.system.equipe = 'true';
-        items.push(weapon);
-
-        const niveau = Number(weapMatch.value);
-        // now process the skill
-        if (weapMatch?.maniement) {
-          RdDStatBlockParser.setNiveauCompetenceArme(items, MANIEMENTS[weapMatch.maniement](weapon), niveau)
-        }
-        else {
-          RdDStatBlockParser.setNiveauCompetenceArme(items, { name: weapon.system.competence, categorie: 'melee' }, niveau)
-          RdDStatBlockParser.setNiveauCompetenceArme(items, { name: weapon.system.tir, categorie: 'tir' }, niveau)
-          RdDStatBlockParser.setNiveauCompetenceArme(items, { name: weapon.system.lancer, categorie: 'lancer' }, niveau)
-        }
-      }
-    }
-  }
-
-  static setNiveauCompetenceArme(items, competence, niveau) {
-    if (competence != "") {
-      const item = items.find(i => i.system.categorie == competence.categorie && Grammar.equalsInsensitive(i.name, competence.name))
-      if (item) {
-        item.system.niveau = niveau
-      }
-    }
-  }
-
-  static async adjustAttacks(newActor) {
-    if (["creature", "entite"].includes(newActor.type)) {
-      const bonusDommages = newActor.getBonusDegat()
-      const ajustementAttaques = newActor.itemTypes[ITEM_TYPES.competencecreature].filter(it => it.system.iscombat)
-        .map(it => {
-          return {
-            _id: it.id,
-            'system.categorie': 'melee',
-            'system.dommages': it.system.dommages - bonusDommages
-          }
-        })
-      await newActor.updateEmbeddedDocuments('Item', ajustementAttaques)
-    }
-  }
-
-  static async setValeursActuelles(newActor, statString) {
-    const updates = {
-    }
-    const endurance = XRegExp.exec(statString, XRegExp("endurance\\s+(?<value>\\d+)\\s+(\\(actuelle\\s*:\\s+(?<actuelle>\\d+)\\))?", 'giu'));
-    if (endurance?.value) {
-      if (newActor.getEnduranceMax() != endurance.value) {
-        ui.notifications.warn(`Vérifier le calcul de l'endurance, calcul: ${newActor.getEnduranceMax()} / import: ${endurance.value}`)
-      }
-    }
-    if (endurance?.actuelle) {
-      updates['system.sante.endurance.value'] = Number(endurance?.actuelle)
-    }
-
-    const vie = XRegExp.exec(statString, XRegExp("vie\\s+(?<value>\\d+)\\s+(\\(actuelle\\s*:\\s+(?<actuelle>\\d+)\\))?", 'giu'));
-    if (vie?.value) {
-      if (newActor.getVieMax() != vie.value) {
-        ui.notifications.warn(`Vérifier le calcul de la vie, calcul: ${newActor.getVieMax()} / import: ${vie.value}`)
-      }
-    }
-    if (vie?.actuelle) {
-      updates['system.sante.vie.value'] = Number(vie?.actuelle)
-    }
-    await newActor.update(updates)
-  }
-
-  static async parseHautReve(statString, actorData, items) {
-    // Attemp to detect spell
-    let sorts = await SystemCompendiums.getWorldOrCompendiumItems("sort", "sorts-oniros");
-    sorts = sorts.concat(await SystemCompendiums.getWorldOrCompendiumItems("sort", "sorts-hypnos"));
-    sorts = sorts.concat(await SystemCompendiums.getWorldOrCompendiumItems("sort", "sorts-narcos"));
-    sorts = sorts.concat(await SystemCompendiums.getWorldOrCompendiumItems("sort", "sorts-thanatos"));
-
-    XRegExp.forEach(statString, XRegExp(XREGEXP_SORT, 'gu' /* keep case sensitive to match the spell draconic skill */),
-      function (matchSort, i) {
-        actorData.flags.hautRevant = true
-        const sortName = Grammar.toLowerCaseNoAccent(matchSort.name).trim().replace("’", "'");
-        let sort = sorts.find(s => Grammar.toLowerCaseNoAccent(s.name) == sortName)
-        if (sort) {
-          sort = sort.toObject();
-          if (matchSort.bonus && matchSort.bonuscase) {
-            sort.system.bonuscase = `${matchSort.bonuscase}:${matchSort.bonus}`;
-          }
-          items.push(sort);
-        }
-        else {
-          ui.notifications.warn(`Impossible de trouver le sort ${matchSort.name} / ${sortName}`)
-        }
-      })
-    const sortsReserve = XRegExp.exec(statString, XRegExp('En réserve\\s+(?<reserve>.*)', 'gu' /* keep case sensitive to match the spell draconic skill */))
-    if (sortsReserve?.reserve) {
-      actorData.flags.hautRevant = true
-      XRegExp.forEach(sortsReserve.reserve, XRegExp(XREGEXP_SORT_RESERVE, 'giu'),
-        function (matchSortReserve, i) {
-          const name = Grammar.toLowerCaseNoAccent(matchSortReserve.name).trim().replace("’", "'");
-          const sort = sorts.find(s => Grammar.toLowerCaseNoAccent(s.name) == name)
-          if (sort) {
-            if (!items.find(it => it._id == sort.id)) {
-              const nouveauSort = sort.toObject()
-              nouveauSort.system.bonuscase = `${matchSortReserve.coord}:1`;
-              items.push(sort.toObject())
-            }
-            items.push({
-              name: sort.name,
-              type: 'sortreserve',
-              img: sort.img,
-              system: {
-                sortid: sort.id,
-                draconic: sort.system.draconic,
-                coord: matchSortReserve.coord,
-                ptreve: Number(sort.system.ptreve.match(/\d+/)),
-              },
-              description: matchSortReserve.description
-            })
-          }
-          else {
-            ui.notifications.warn(`Impossible de mettre ${matchSortReserve.name} en réserve en ${matchSortReserve.coord}`)
-          }
-        })
-    }
-
-    if (actorData.flags.hautRevant) {
-      const donHR = await RdDItemTete.teteDonDeHautReve();
-      if (donHR) {
-        items.push(donHR.toObject());
-      }
-
-      const demiReve = XRegExp.exec(statString, XRegExp("Demi-rêve\\s+(?<value>[A-M]\\d{1,2})", 'giu'))
-      actorData.reve.tmrpos.coord = demiReve?.value ?? 'A1'
-    }
-  }
-
-  static parsePersonnage(statString, actorData) {
-    actorData.reve.seuil.value = actorData.carac.reve.value
-    actorData.compteurs.chance.value = actorData.carac.chance.value
-
-    const reveActuel = XRegExp.exec(statString, XRegExp("Rêve actuel\\s+(?<value>\\d+)", 'giu'))
-    actorData.reve.reve.value = reveActuel?.value ? Number(reveActuel.value) : actorData.reve.seuil.value
-
-    const feminin = XRegExp.exec(statString, XRegExp("né(?<value>e?) à", 'giu'));
-    actorData.sexe = (feminin?.value == 'e') ? 'féminin' : 'masculin';
-
-    // Get hour name : heure du XXXXX
-    const heure = XRegExp.exec(statString, XRegExp("heure (du|de la|des|de l\')\\s*(?<value>[A-Za-zÀ-ÖØ-öø-ÿ\\s]+),", 'giu'));
-    actorData.heure = this.getHeureKey(heure?.value || "Vaisseau");
-
-    // Get age
-    const age = XRegExp.exec(statString, XRegExp("(?<value>\\d+) ans", 'giu'));
-    if (age?.value) {
-      actorData.age = Number(age.value);
-    }
-    // Get height
-    const taille = XRegExp.exec(statString, XRegExp("(?<value>\\d+m\\d+)", 'giu'));
-    if (taille?.value) {
-      actorData.taille = taille.value;
-    }
-    // Get weight
-    const poids = XRegExp.exec(statString, XRegExp(",\\s+(?<value>\\d+)\\s+kg", 'giu'));
-    if (poids?.value) {
-      actorData.poids = poids.value + ' kg';
-    }
-    // Get cheveux
-    const cheveux = XRegExp.exec(statString, XRegExp("kg,\\s+(?<value>[A-Za-zÀ-ÖØ-öø-ÿ\\s\\-]+),\\s+yeux", 'giu'));
-    if (cheveux?.value) {
-      actorData.cheveux = cheveux.value;
-    }
-    // Get yeux
-    const yeux = XRegExp.exec(statString, XRegExp("yeux\\s+(?<value>[A-Za-zÀ-ÖØ-öø-ÿ\\s\\-]+), Beau", 'giu'));
-    if (yeux?.value) {
-      actorData.yeux = yeux.value;
-    }
-
-    // Get beauty
-    const beaute = XRegExp.exec(statString, XRegExp("beauté\\s+(?<value>\\d+)", 'giu'));
-    if (beaute?.value) {
-      actorData.beaute = Number(beaute.value);
-    }
-  }
-
-  static parseCreature(statString, actorData) {
-    let protection = XRegExp.exec(statString, XRegExp("protection(\\s+naturelle)?\\s+(?<value>[\\-]?\\d+)", 'giu'));
-    if (protection?.value) {
-      actorData.attributs.protection.value = Number(protection.value);
-    }
-    let vitesse = XRegExp.exec(statString, XRegExp("vitesse\\s+(?<value>[\\d\\/]+)", 'giu'));
-    if (vitesse?.value) {
-      actorData.attributs.vitesse.value = vitesse.value;
-    }
-  }
-
-  static parseEntite(statString, actorData) {
-    actorData.definition.categorieentite = 'cauchemar'
-    actorData.definition.typeentite = ENTITE_NONINCARNE
-    let endurance = XRegExp.exec(statString, XRegExp("endurance\\s+(?<value>\\d+)", 'giu'));
-    if (endurance?.value) {
-      actorData.sante.endurance.value = Number(endurance.value);
-      actorData.sante.endurance.max = Number(endurance.value);
-      actorData.definition.typeentite = ENTITE_INCARNE
-    }
-    let vitesse = XRegExp.exec(statString, XRegExp("vitesse\\s+(?<value>[\\d\\/]+)", 'giu'));
-    if (vitesse?.value) {
-      actorData.attributs.vitesse.value = vitesse.value;
-    }
-  }
-
-  static parseActorType(statString) {
-    let force = XRegExp.exec(statString, XRegExp("Force\\s+(?<value>[\\+\\-]?\\d+)", 'giu'))
-    let vue = XRegExp.exec(statString, XRegExp("Vue\\s+(?<value>[\\+\\-]?\\d+)", 'giu'))
-    let perception = XRegExp.exec(statString, XRegExp("perception\\s+(?<value>\\d+)", 'giu'))
-    if (!force) {
-      return "entite"
-    }
-    if (!vue || perception) {
-      return "creature"
-    }
-    return "personnage"
-  }
-
-  static extractName(actorType, statString) {
-    if (actorType == "personnage") {
-      // Check if ',né le' is present 
-      let namePersonnage = "Importé"
-      if (statString.includes(", né")) {
-        // Name is all string before first comma ','
-        namePersonnage = XRegExp.exec(statString, XRegExp("(?<value>[\\p{Letter}\'\\-\\s\\d]+),", 'giu'));
-      } else {
-        namePersonnage = XRegExp.exec(statString, XRegExp("(?<value>[\\p{Letter}\'\\-\\s\\d]+)\\s+TAILLE", 'giu'));
-      }
-      if (namePersonnage?.value) {
-        return Misc.upperFirst(namePersonnage?.value.toLowerCase());
-      }
-    }
-
-    const name = XRegExp.exec(statString, XRegExp("(?<value>.+)\\s+taille", 'giu'));
-    if (actorType == "entite") {
-      if (!(name?.value)) {
-        const nameEntiteReve = XRegExp.exec(statString, XRegExp("(?<value>.+)\\s+rêve", 'giu'));
-        return Misc.upperFirst(nameEntiteReve?.value || "Importé");
-      }
-    }
-    return Misc.upperFirst(name?.value || "Importé");
-  }
-
-  static warning(message) {
-    ui.notifications.warn(message);
-  }
-
-}
-
-/************************************************************************************/
-// Some internal test strings
-let statBlock01 = `+$16(/, baron de Sylvedire, né à l’heure du
-Roseau, 40 ans, 1m78, 65 kg, Beauté 13.
-TAILLE
- 10
- Mêlée
- 14
-APPARENCE
- 13
- Tir
- 11
-CONSTITUTION
- 12
- Lancer
- 11
-FORCE
- 12
- Dérobée
- 13
-AGILITÉ
- 16
- Vie
- 11
-DEXTÉRITÉ
- 13
- Endurance
- 25
-VUE
- 10
- +dom
- 0
-OUÏE
- 11
- Protection
- 2 ou 4
-ODO-GOÛT
- 9
- cuir souple
-VOLONTÉ
- 14
- ou cuir / métal
-INTELLECT
- 9
-EMPATHIE
- 11
-RÊVE
- 13
-CHANCE
- 10
-niv
- init
- +dom
-Épée dragonne
- +5
- 12
- +3
-Hache de bataille
- +6
- 13
- +3
-Bouclier moyen
- +5
-Dague mêlée
- +4
- 11
- +1
-Corps à corps
- +4
- 11
- (0)
-Esquive
- +8
-Escalade, Saut +4 / Commerce +3 / Équitation
-+6 / Chirurgie 0 / Survie en extérieur +4 / Survie fo-
-rêt +6 / Acrobatie -2 / Métallurgie +2 / Natation +3 /
-Légendes -1 / Écriture -4 
-`;
-
-let statBlock02 = `/HVJDUGHV
-TAILLE
- 11
- Mêlée
- 12
-CONSTITUTION
- 11
- Tir
- 11
-FORCE
- 12
- Lancer
- 11
-AGILITÉ
- 12
- Dérobée
- 11
-DEXTERITÉ
- 11
- Vie
- 11
-VUE
- 11
- Endurance
- 22
-OUÏE
- 11
- Vitesse
- 12
-VOLONTÉ
- 10
- +dom
- 0
-Protection
- 4
-cuir / métal
-niv
- init
- +dom
-Hache de bataille
- +4
- 10
- +3
-Bouclier moyen
- +4
-Dague mêlée
- +3
- 9
- +1
-Arc
- +5
- 10
- +2
-Corps à corps
- +3
- 9
- (0)
-Esquive avec armure
- +2
-Course +1/ Vigilance +4
-`;
-
-let statBlock03 = `rencontres sont laissées à /HVFKLHQVORXSVGXEDURQ
- chaque gardien des rêves.
-TAILLE
- 8
- Vie
- 10
-CONSTITUTION FORCE
- 12
- 11
- Endurance
- Vitesse
- 12/38
- 21
- /HVFKLHQV]RPELV
-PERCEPTION 13
- +dom
- 0
-VOLONTÉ
- 10
- Protection
- 0
- Les « monstres » apparaîtront un soir, durant
-RÊVE
- 10
- l’heure du Serpent, et attaqueront les voya-
-niv
- init
- +dom
- geurs à leur campement. Si ces derniers ne
-Morsure
- 13
- +4
- 10
- +1
- campent pas, ils apparaîtront tout de même à
-Esquive
- 11
- +3
- l’heure du Serpent. Le feu ne les effraie pas. Ils
-Course, Saut
- 12
- +3
- ne sont pas très rapides, mais en revanche, très
-Discrétion
- 12
- +3
- silencieux : ils n’aboient pas. Les voyageurs
-Vigilance
- 13
- +3
-`

module/apps/rdd-text-roll-editor.js

@@ -1,78 +0,0 @@
-import "./xregexp-all.js";
-import { SystemCompendiums } from "../settings/system-compendiums.js";
-import { ACTOR_TYPES } from "../constants.js";
-import { TextRollAlchimie } from "./textroll/text-roll-alchimie.js";
-import { TextRollCaracCompetence } from "./textroll/text-roll-carac-competence.js";
-import { TextRollFormula } from "./textroll/text-roll-formula.js";
-import { TextRollManager } from "./textroll/text-roll-formatter.js";
-
-const TEXT_ROLL_MANAGERS = [
-  new TextRollAlchimie(),
-  new TextRollCaracCompetence(),
-  new TextRollFormula()]
-
-export class RdDTextEditor {
-  static registerChatCallbacks(html) {
-    $(html).on("click", '.roll-text', async event => await RdDTextEditor.rollText(event))
-  }
-
-  static async enrichHTML(text, object, options = {showlink:true}) {
-    const context = {
-      text,
-      object,
-      options,
-      competences: await SystemCompendiums.getCompetences(ACTOR_TYPES.personnage),
-    }
-
-    for (let manager of TEXT_ROLL_MANAGERS) {
-      context.code = manager.code
-      context.template = manager.template
-      context.text = await manager.onReplaceRoll(context);
-    }
-
-    return await foundry.applications.ux.TextEditor.implementation.enrichHTML(context.text, {
-      relativeTo: object,
-      secrets: object?.isOwner,
-      async: true
-    })
-  }
-
-  static async _applyReplaceAll(manager, context) {
-    context.code = manager.code
-    context.template = manager.template
-    context.text = await manager.onReplaceRoll(context);
-    return context.text
-  }
-
-  static getEventElement(event) {
-    return $(event.currentTarget)?.parents(".roll-text-link");
-  }
-
-  static async rollText(event, actor) {
-    const code = TextRollManager.getNode(event)?.data('code')
-    const manager = TEXT_ROLL_MANAGERS.find(it => it.code == code)
-    if (manager) {
-      await manager.onRollText(event, actor)
-    }
-  }
-
-  static async chatRollText(event) {
-    const node = TextRollManager.getNode(event);
-    if (node) {
-      const code = node.data('code')
-      const param = node.data('json')
-      const manager = TEXT_ROLL_MANAGERS.find(it => it.code == code)
-
-      const text = await TextRollManager.createRollText(
-        {
-          code,
-          template: manager.template,
-          options: { showLink: false }
-        },
-        param)
-      ChatMessage.create({
-        content: text
-      })
-    }
-  }
-}

module/apps/textroll/text-roll-alchimie.js

@@ -1,79 +0,0 @@
-import "../xregexp-all.js";
-import { ACTOR_TYPES, ITEM_TYPES } from "../../constants.js";
-import { RdDCarac } from "../../rdd-carac.js";
-import { RdDUtility } from "../../rdd-utility.js";
-import { RdDAlchimie } from "../../rdd-alchimie.js";
-import { TextRollManager } from "./text-roll-formatter.js";
-
-const REGEX_ALCHIMIE_TERMES = "(?<termes>([-A-Za-zÀ-ÖØ-öø-ÿ ])+)"
-const REGEX_ALCHIMIE_MANIP = "(?<manip>(couleur|consistance))"
-const XREGEXP_ROLL_ALCHIMIE = XRegExp("@roll\\[" + REGEX_ALCHIMIE_MANIP + "\\s+" + REGEX_ALCHIMIE_TERMES + "\\]", 'giu')
-const XREGEXP_ROLL_ALCHIMIE_MANIP = XRegExp("@" + REGEX_ALCHIMIE_MANIP + "\\{" + REGEX_ALCHIMIE_TERMES + "\\}", 'giu')
-
-/**
- * classe pour gérer les jets d'alchimie
- */
-export class TextRollAlchimie {
-  get code() { return 'alchimie' }
-  get template() { return `systems/foundryvtt-reve-de-dragon/templates/apps/textroll/link-text-roll-alchimie.hbs` }
-
-  async onReplaceRoll(context) {
-    const handler = new AlchimieTextBuilder(context)
-    return await handler.replaceAll()
-  }
-
-  async onRollText(event, actor) {
-    actor = this.getSelectedActor(actor)
-    if (actor) {
-      const node = TextRollManager.getNode(event)
-      const recetteId = node.data('recetteid')
-      const manip = node.data('manip')
-      const termes = node.data('termes')
-      if (recetteId) {
-        await actor.effectuerTacheAlchimie(recetteId, manip, termes)
-      }
-      else {
-        const carac = RdDCarac.caracDetails(RdDAlchimie.getCaracTache(manip))
-        const diff = RdDAlchimie.getDifficulte(termes)
-        await actor.rollCaracCompetence(carac.code, 'Alchimie', diff)
-      }
-    }
-  }
-
-  getSelectedActor(actor) {
-    actor = actor ?? RdDUtility.getSelectedActor()
-    if (actor && actor.type == ACTOR_TYPES.personnage) {
-      return actor
-    }
-    return undefined
-  }
-}
-
-class AlchimieTextBuilder {
-  constructor(context) {
-    this.context = context
-  }
-
-  async replaceAll() {
-    await XRegExp.forEach(this.context.text, XREGEXP_ROLL_ALCHIMIE, async (rollMatch, i) => await this.replaceMatch(rollMatch, i))
-    await XRegExp.forEach(this.context.text, XREGEXP_ROLL_ALCHIMIE_MANIP, async (rollMatch, i) => await this.replaceMatch(rollMatch, i))
-    return this.context.text
-  }
-
-  async replaceMatch(rollMatch, i) {
-    if (rollMatch.termes && rollMatch.manip) {
-      const manip = rollMatch.manip
-      const termes = rollMatch.termes
-      const carac = RdDCarac.caracDetails(RdDAlchimie.getCaracTache(manip))
-      const diff = RdDAlchimie.getDifficulte(termes)
-      const recette = (this.context.object instanceof Item && this.context.object.type == ITEM_TYPES.recettealchimique) ? this.context.object : undefined
-      const replacement = await TextRollManager.createRollText(this.context,
-        {
-          code: this.context.code,
-          manip, termes, carac, diff, recetteid: recette?.id,
-        })
-      this.context.text = this.context.text.replace(rollMatch[0], replacement);
-    }
-  }
-}
-

module/apps/textroll/text-roll-carac-competence.js

@@ -1,98 +0,0 @@
-import "../xregexp-all.js";
-import { RdDCarac } from "../../rdd-carac.js";
-import { RdDItemCompetence } from "../../item-competence.js";
-import { RdDUtility } from "../../rdd-utility.js";
-import { TextRollManager } from "./text-roll-formatter.js";
-
-const REGECP_CARAC = "(?<carac>[A-Za-zÀ-ÖØ-öø-ÿ\\s\\-]+)"
-const REGEXP_COMP = "(\\/(?<competence>[A-Za-zÀ-ÖØ-öø-ÿ ]+([1-2]?[A-Za-zÀ-ÖØ-öø-ÿ ]+)?))?"
-const REGEXP_DIFF = "(/(?<diff>[\\+\\-]?\\d+(d\\d+)?))?"
-const REGEXP_ROLL_CARAC_COMP = REGECP_CARAC + REGEXP_COMP + REGEXP_DIFF
-const XREGEXP_ROLL_CARAC_COMP = XRegExp("@roll\\[" + REGEXP_ROLL_CARAC_COMP + "\\]", 'giu')
-
-/**
- * classe pour gérer les jets de caractéristique/compétence depuis
- * les journaux/descriptions
- */
-export class TextRollCaracCompetence {
-  get code() { return 'carac' }
-  get template() { return `systems/foundryvtt-reve-de-dragon/templates/apps/textroll/link-text-roll-carac-competence.hbs` }
-
-  async onReplaceRoll(context) {
-    const handler = new CaracCompetenceTextBuilder(context)
-    return await handler.replaceAll()
-  }
-
-  async onRollText(event, actor) {
-    const node = TextRollManager.getNode(event)
-    const caracCode = node.data('carac-code')
-    if (caracCode) {
-      const competence = node.data('competence')
-      const diff = await this.calculDiff(node)
-      const actors = this.getSelectedActors(actor)
-      actors.forEach(async it => await this.doRoll(it, caracCode, competence, diff))
-    }
-  }
-
-  async calculDiff(node) {
-    const diff = node.data('diff') ?? 0
-    if (!Number.isInteger(diff)) {
-      const roll = new Roll(diff)
-      await roll.evaluate()
-      await roll.toMessage({ flavor: `La difficulté de ${diff} a donné ${roll.total}` })
-      return roll.total
-    }
-    return diff
-  }
-
-  async doRoll(actor, caracCode, competence, diff) {
-    caracCode = actor.mapCarac(caracCode)
-    if (caracCode) {
-      if (competence) {
-        await actor.rollCaracCompetence(caracCode, competence, diff)
-      }
-      else {
-        await actor.rollCarac(caracCode, { diff })
-      }
-    }
-  }
-
-  getSelectedActors(actor) {
-    const selected = canvas.tokens.controlled.map(it => it.actor).filter(it => it)
-    if (selected.length > 0) {
-      return selected
-    }
-    actor = actor ?? RdDUtility.getSelectedActor()
-    if (actor) {
-      return [actor]
-    }
-    return []
-  }
-}
-
-class CaracCompetenceTextBuilder {
-  constructor(context) {
-    this.context = context
-  }
-
-  async replaceAll() {
-    await XRegExp.forEach(this.context.text, XREGEXP_ROLL_CARAC_COMP, async (rollMatch, i) => await this.replaceMatch(rollMatch, i))
-    return this.context.text
-  }
-
-  async replaceMatch(rollMatch, i) {
-    const carac = RdDCarac.caracDetails(rollMatch.carac)
-    if (carac) {
-      const competence = rollMatch.competence ? RdDItemCompetence.findCompetence(this.context.competences, rollMatch.competence) : undefined
-      const replacement = await TextRollManager.createRollText(this.context,
-        {
-          code: this.context.code,
-          carac: carac,
-          competence: competence?.name,
-          diff: rollMatch.diff,
-        })
-      this.context.text = this.context.text.replace(rollMatch[0], replacement)
-    }
-  }
-}
-

module/apps/textroll/text-roll-formatter.js

@@ -1,13 +0,0 @@
-
-export class TextRollManager {
-
-  static async createRollText(context, param) {
-    return await renderTemplate(context.template, {
-      param, options: context.options
-    })
-  }
-
-  static getNode(event) {
-    return $(event.currentTarget)?.parents(".roll-text-link");
-  }
-}

module/apps/textroll/text-roll-formula.js

@@ -1,51 +0,0 @@
-import "../xregexp-all.js";
-import { TextRollManager } from "./text-roll-formatter.js";
-
-const REGEXP_ROLL_FORMULA = "(?<formula>[^\\[\\]]+)"
-const XREGEXP_ROLL_FORMULA = XRegExp("@roll\\[" + REGEXP_ROLL_FORMULA + "\\]", 'giu')
-
-/**
- * classe pour gérer les jets de dés (formules Foundry)
- */
-export class TextRollFormula {
-  get code() { return 'formula' }
-  get template() { return `systems/foundryvtt-reve-de-dragon/templates/apps/textroll/link-text-roll-formula.hbs` }
-
-  async onReplaceRoll(context) {
-    const handler = new FormulaTextBuilder(context)
-    return await handler.replaceAll()
-  }
-
-  async onRollText(event, actor) {
-    const node = TextRollManager.getNode(event)
-    const rollFormula = node.data('formula')
-    if (rollFormula) {
-      const roll = new Roll(rollFormula)
-      await roll.evaluate()
-      await roll.toMessage()
-    }
-  }
-}
-
-class FormulaTextBuilder {
-  constructor(context) {
-    this.context = context
-  }
-
-  async replaceAll() {
-    await XRegExp.forEach(this.context.text, XREGEXP_ROLL_FORMULA,
-      async (rollMatch, i) => await this.replaceMatch(rollMatch, i))
-    return this.context.text
-  }
-
-  async replaceMatch(rollMatch, i) {
-    if (rollMatch.formula) {
-      const replacement = await TextRollManager.createRollText(this.context,
-        {
-          code: this.context.code,
-          formula: rollMatch.formula,
-        })
-      this.context.text = this.context.text.replace(rollMatch[0], replacement)
-    }
-  }
-}

module/chat-utility.js

@@ -1,16 +1,15 @@
 import { Misc } from "./misc.js";
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
-import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";
 
 
 /**
- * Class providing helper methods to get the list of users, and
+ * Class providing helper methods to get the list of users, and 
  */
 export class ChatUtility {
 
   static async init() {
-    Hooks.on("renderChatMessageHTML", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
+    Hooks.on("renderChatMessage", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
     Hooks.on("createChatMessage", async (chatMessage, options, id) => await ChatUtility.onCreateChatMessage(chatMessage, options, id))
   }
 
@@ -62,6 +61,7 @@ export class ChatUtility {
   }
 
   /* -------------------------------------------- */
+
   static removeMessages(socketData) {
     if (Misc.isFirstConnectedGM()) {
       ChatUtility.onRemoveMessages(socketData);
@@ -96,7 +96,7 @@ export class ChatUtility {
         }
         break
       case "gmroll":
-        messageData.whisper = actor ? ChatUtility.getOwners(actor) : ChatUtility.getUserAndGMs()
+        messageData.whisper = ChatUtility.getOwners(actor)
         break
       case "selfroll":
         messageData.whisper = [game.user]
@@ -107,7 +107,7 @@ export class ChatUtility {
   }
 
   static getOwners(document) {
-    return document ? game.users.filter(it => document.getUserLevel(it) == CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER) : [game.user]
+    return game.users.filter(it => document.getUserLevel(it) == CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
   }
 
   static getUserAndGMs() {
@@ -190,15 +190,14 @@ export class ChatUtility {
     if (rddTimestamp) {
       const timestamp = new RdDTimestamp(rddTimestamp);
       const timestampData = timestamp.toCalendrier();
-      const dateHeure = await foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
-      $(html).find('header.message-header .message-sender').after(dateHeure)
+      const dateHeure = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
+      html.find('header.message-header .message-sender').after(dateHeure)
     }
   }
 
   static async onCreateChatMessage(chatMessage, options, id) {
     if (chatMessage.isAuthor) {
       await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
-      await chatMessage.update({ content: await RdDTextEditor.enrichHTML(chatMessage.content, undefined, { showLink: false }) })
     }
   }
 }

module/coeur/rdd-coeur.js

@@ -1,17 +1,18 @@
 import { RdDBaseActor } from "../actor/base-actor.js";
 import { ChatUtility } from "../chat-utility.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
 
 const INFO_COEUR = 'info-coeur';
 
 export class RdDCoeur {
   static registerChatCallbacks(html) {
-    $(html).on("click", 'a.accepter-tendre-moment', event => {
+    html.on("click", 'a.accepter-tendre-moment', event => {
       RdDCoeur.accepterTendreMoment(RdDCoeur.extractInfoCoeur(event))
     })
-    $(html).on("click", 'a.refuser-tendre-moment', event => {
+    html.on("click", 'a.refuser-tendre-moment', event => {
       RdDCoeur.refuserTendreMoment(RdDCoeur.extractInfoCoeur(event))
     })
-    $(html).on("click", 'a.perdre-point-coeur-douceur', event => {
+    html.on("click", 'a.perdre-point-coeur-douceur', event => {
       RdDCoeur.perdreEnDouceur(
         RdDCoeur.extractInfoCoeur(event),
         event.currentTarget.attributes['data-actor-id'].value)

module/common/_module.mjs

@@ -1,8 +0,0 @@
-import { CommonDescription } from "./description.mjs";
-import { CommonInventaire } from "./inventaire.mjs";
-
-export const TEMPLATE_DESCRIPTION = new CommonDescription()
-export const TEMPLATE_INVENTAIRE = new CommonInventaire()
-
-export const ALL_COMMON_TEMPLATES = [TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE]
-

module/common/common-template.mjs

@@ -1,10 +0,0 @@
-/**
- * class describing common methods implemented by template parts,
- * used for sheet/models/documents
- */
-export default class CommonTemplate {
-  fields() { }
-  handlebars() { return [] }
-  actions() { return {} }
-  async prepareContext(item) { }
-}

module/common/description.mjs

@@ -1,32 +0,0 @@
-import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js"
-import CommonTemplate from "./common-template.mjs"
-import { HTMLSTRING } from "./field-types.mjs"
-
-const fields = foundry.data.fields
-
-export class CommonDescription extends CommonTemplate {
-  fields() {
-    return {
-      description: new fields.HTMLField({ ...HTMLSTRING }),
-      descriptionmj: new fields.HTMLField({ gmOnly: true, ...HTMLSTRING })
-    }
-  }
-
-  handlebars() {
-    return [
-      "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-description.hbs",
-    ]
-  }
-  actions() {
-    return {}
-  }
-
-  async prepareContext(item) {
-    const enriched = {
-      description: await RdDTextEditor.enrichHTML(item.system.description, item),
-      descriptionmj: await RdDTextEditor.enrichHTML(item.system.descriptionmj, item),
-    }
-    return { enriched }
-  }
-
-}

module/common/field-types.mjs

@@ -1,9 +0,0 @@
-export const INTEGER = { required: true, nullable: false, min: 0, integer: true }
-export const DECIMAL = { required: true, nullable: false, min: 0, integer: false } /* TODO: validation de nombre décimales?*/
-export const INTEGER_SIGNED = { required: true, nullable: false, integer: true }
-export const DECIMAL_SIGNED = { required: true, nullable: false, integer: false }
-export const STRING = { required: true, nullable: false, blank: true, trim: true }
-export const HTMLSTRING = { initial: "", required: true, nullable: false, blank: true, textSearch: true }
-
-export const MODEL_ARRAY = { initial: [], required: true, nullable: false }
-

module/common/inventaire.mjs

@@ -1,36 +0,0 @@
-import CommonTemplate from "./common-template.mjs"
-import { RARETES } from "../item/raretes.js"
-import { DECIMAL, INTEGER, INTEGER_SIGNED, MODEL_ARRAY, STRING } from "./field-types.mjs"
-
-const fields = foundry.data.fields
-
-export class CommonInventaire extends CommonTemplate {
-  fields() {
-    return {
-      encombrement: new fields.NumberField({ label: "Encombrement", initial: 0, ...INTEGER }),
-      quantite: new fields.NumberField({ label: "Quantité", initial: 1, ...INTEGER }),
-      qualite: new fields.NumberField({ label: "Qualité", initial: 0, ...INTEGER_SIGNED }),
-      cout: new fields.NumberField({ label: "Coût", initial: 0.0, ...DECIMAL }),
-      environnement: new fields.ArrayField(
-        new fields.SchemaField({
-          milieu: new fields.StringField({ label: "Milieu", initial: "", ...STRING }),
-          rarete: new fields.StringField({
-            label: "Rareté", initial: RARETES[0].code, ...STRING,
-            validate: (value, options) => RARETES.find(it => it.code == value)
-          }),
-          frequence: new fields.NumberField({ label: "Fréquence", initial: RARETES[0].frequence, ...INTEGER }),
-        }),
-        { label: "Environnement", ...MODEL_ARRAY }),
-    }
-  }
-
-  handlebars() {
-    return [
-      "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-inventaire.hbs"
-    ]
-  }
-
-  async prepareContext(item) {
-    return {}
-  }
-}

module/constants.js

@@ -1,13 +1,13 @@
-export const SYSTEM_RDD = 'foundryvtt-reve-de-dragon'
-export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon'
-export const LOG_HEAD = 'RdD | '
+export const SYSTEM_RDD = 'foundryvtt-reve-de-dragon';
+export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';
+export const LOG_HEAD = 'RdD | ';
 
-export const HIDE_DICE = 'hide'
-export const SHOW_DICE = 'show'
+export const HIDE_DICE = 'hide';
+export const SHOW_DICE = 'show';
 
-export const ENTITE_INCARNE = 'incarne'
-export const ENTITE_NONINCARNE = 'nonincarne'
-export const ENTITE_BLURETTE = 'blurette'
+export const ENTITE_INCARNE = 'incarne';
+export const ENTITE_NONINCARNE = 'nonincarne';
+export const ENTITE_BLURETTE = 'blurette';
 
 export const RDD_CONFIG = {
   niveauEthylisme : [
@@ -50,59 +50,4 @@ export const RDD_CONFIG = {
     {value: "Rare", label: "Rare"},
     {value: "Rarissime", label: "Rarissime"}
   ]
-}
-
-export const ACTOR_TYPES = {
-  personnage: 'personnage',
-  creature: 'creature',
-  entite: 'entite',
-  commerce: 'commerce',
-  vehicule: 'vehicule'
-}
-
-export const ITEM_TYPES = {
-  competence: 'competence',
-  competencecreature: 'competencecreature',
-  empoignade: 'empoignade',
-  possession: 'possession',
-  blessure: 'blessure',
-  maladie: 'maladie',
-  poison: 'poison',
-  arme: 'arme',
-  armure: 'armure',
-  conteneur: 'conteneur',
-  objet: 'objet',
-  monnaie: 'monnaie',
-  gemme: 'gemme',
-  munition: 'munition',
-  nourritureboisson: 'nourritureboisson',
-  herbe: 'herbe',
-  plante: 'plante',
-  ingredient: 'ingredient',
-  faune: 'faune',
-  livre: 'livre',
-  potion: 'potion',
-  service: 'service',
-  musique: 'musique',
-  danse: 'danse',
-  chant: 'chant',
-  jeu: 'jeu',
-  race: 'race',
-  recettecuisine: 'recettecuisine',
-  oeuvre: 'oeuvre',
-  recettealchimique: 'recettealchimique',
-  tache: 'tache',
-  sort: 'sort',
-  sortreserve: 'sortreserve',
-  rencontre: 'rencontre',
-  queue: 'queue',
-  ombre: 'ombre',
-  souffle: 'souffle',
-  tete: 'tete',
-  casetmr: 'casetmr',
-  meditation: 'meditation',
-  signedraconique: 'signedraconique',
-  tarot: 'tarot',
-  nombreastral: 'nombreastral',
-  extraitpoetique: 'extraitpoetique',
-}
+}

module/dialog-choix-xp-carac.js

@@ -27,7 +27,7 @@ export class DialogChoixXpCarac extends Dialog {
     dialogData = foundry.utils.mergeObject(dialogData, {
       default: 'appliquer',
       buttons: {
-        'appliquer': { icon: '<i class="fa-solid fa-check"></i>', label: "Ajouter la répartition", callback: it => this.appliquerSelection() }
+        'appliquer': { icon:'<i class="fa-solid fa-check"></i>', label: "Ajouter la répartition", callback: it => this.appliquerSelection() }
       }
     })
     super(dialogData, dialogOptions)
@@ -37,13 +37,18 @@ export class DialogChoixXpCarac extends Dialog {
   }
 
   activateListeners(html) {
+    //TODO
     super.activateListeners(html)
     this.html = html
-    this.html.find("li.xpCarac-option .xpCarac-moins").click(event => this.ajouterXp(event, -1))
-    this.html.find("li.xpCarac-option .xpCarac-plus").click(event => this.ajouterXp(event, 1))
+    this.html.find("li.xpCarac-option .xpCarac-moins").click(event =>
+      this.ajouterXp(event, -1)
+    )
+    this.html.find("li.xpCarac-option .xpCarac-plus").click(event =>
+      this.ajouterXp(event, 1)
+    )
   }
 
-  ajouterXp(event, delta) {
+  async ajouterXp(event, delta) {
     const liCarac = this.html.find(event.currentTarget)?.parents("li.xpCarac-option")
     const label = liCarac?.data("carac-label")
     const carac = this.caracs.find(c => c.label == label)

module/dialog-chronologie.js

@@ -27,7 +27,7 @@ export class DialogChronologie extends Dialog {
       timestamp: game.system.rdd.calendrier.timestamp,
       dateReel: game.system.rdd.calendrier.dateReel()
     };
-    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-chronologie.hbs", dialogData);
+    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-chronologie.html", dialogData);
     const dialog = new DialogChronologie(html, dialogData);
     dialog.render(true);
   }
@@ -100,7 +100,7 @@ export class DialogChronologie extends Dialog {
   }
 
   async prepareChronologieEntry(journalParameters) {
-    return await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chronologie-entry.hbs", journalParameters);
+    return await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chronologie-entry.html", journalParameters);
   }
 
   extractJournalParameters() {

module/dialog-create-signedraconique.js

@@ -18,7 +18,7 @@ export class DialogCreateSigneDraconique extends Dialog {
         }))
     };
 
-    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-create-signedraconique.hbs", dialogData);
+    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-create-signedraconique.html", dialogData);
     new DialogCreateSigneDraconique(dialogData, html)
       .render(true);
   }
@@ -49,9 +49,9 @@ export class DialogCreateSigneDraconique extends Dialog {
     actor.createEmbeddedDocuments("Item", [signe]);
     ChatMessage.create({
       whisper: ChatUtility.getOwners(actor),
-      content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-actor.hbs", {
+      content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-actor.html", {
         signe: signe,
-        alias: actor.getAlias()
+        alias: actor.name
       })
     });
   }

module/dialog-fabriquer-potion.js

@@ -1,79 +1,88 @@
+import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDUtility } from "./rdd-utility.js";
 
 export class DialogFabriquerPotion extends Dialog {
 
   /* -------------------------------------------- */
-  static async create(actor, item) {
-    const brinsMinimum = DialogFabriquerPotion.nombreBrinsMinimum(item)
-    if (item.system.quantite < brinsMinimum) {
-      ui.notifications.warn(`Vous avez ${item.system.quantite} brins de ${item.name}, il en faut au moins ${brinsMinimum} pour faire une potion!`)
-      return
+  static async create(actor, item, onActionItem) {
+    const min = DialogFabriquerPotion.nombreBrinsMinimum(item);
+    if (item.system.quantite < min) {
+      ui.notifications.warn(`Vous avez ${item.system.quantite} brins de ${item.name}, il en faut au moins ${min} pour faire une potion!`);
+      return;
     }
-    const potionData = DialogFabriquerPotion.prepareData(item, brinsMinimum)
-    const options = { classes: ["dialogfabriquerpotion"], width: 600, height: 160, 'z-index': 99999 }
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-fabriquer-potion-base.hbs', potionData)
+    let potionData = DialogFabriquerPotion.prepareData(actor, item);
 
-    new DialogFabriquerPotion(actor, potionData, html, options).render(true)
+    const html = await renderTemplate( 'systems/foundryvtt-reve-de-dragon/templates/dialog-fabriquer-potion-base.html', potionData);
+
+    let options = { classes: ["dialogfabriquerpotion"], width: 600, height: 160, 'z-index': 99999 };
+    new DialogFabriquerPotion(actor, potionData, onActionItem, html, options).render(true);
   }
 
   /* -------------------------------------------- */
-  static prepareData(item, brinsMinimum) {
-    const brinsOptimal = DialogFabriquerPotion.nombreBrinsOptimal(item)
-    return foundry.utils.mergeObject(foundry.utils.duplicate(item), {
-      nbBrinsSelect: RdDUtility.buildListOptions(brinsMinimum, brinsOptimal),
-      nbBrins: Math.min(item.system.quantite, brinsOptimal),
-      herbebonus: item.system.niveau
-    })
+  static prepareData(actor, item) {
+    let potionData = foundry.utils.duplicate(item)
+    potionData.nbBrinsSelect = RdDUtility.buildListOptions(
+      DialogFabriquerPotion.nombreBrinsMinimum(item),
+      DialogFabriquerPotion.nombreBrinsOptimal(item));
+    potionData.nbBrins = Math.min(potionData.system.quantite, DialogFabriquerPotion.nombreBrinsOptimal(potionData));
+    potionData.herbebonus = item.system.niveau;
+    potionData.buttonName = "Fabriquer";
+    return potionData;
   }
 
   /* -------------------------------------------- */
-  constructor(actor, potionData, html, options) {
+  constructor(actor, potionData, onActionItem, html, options) {
     const conf = {
       title: `Fabriquer une potion de ${potionData.system.categorie}`,
       content: html,
       default: 'fabriquer',
       buttons: {
-        'fabriquer': { label: "Fabriquer", callback: it => this.onFabriquer() }
+        'fabriquer': {
+          label: potionData.buttonName, callback: it => this.onFabriquer()
+        }
       }
-    }
-    super(conf, options)
+    };
 
-    this.actor = actor
-    this.potionData = potionData
+    super(conf, options);
+
+    this.actor = actor;
+    this.potionData = potionData;
+    this.onActionItem = onActionItem;
   }
 
   /* -------------------------------------------- */
   activateListeners(html) {
-    super.activateListeners(html)
-    this.html = html
+    super.activateListeners(html);
+    this.html = html;
     this.html.find("[name='nbBrins']").change(event => {
-      this.potionData.nbBrins = Misc.toInt(event.currentTarget.value)
-      const brinsManquants = Math.max(0, DialogFabriquerPotion.nombreBrinsOptimal(this.potionData) - this.potionData.nbBrins)
+      this.potionData.nbBrins = Misc.toInt(event.currentTarget.value);
+      const brinsManquants = Math.max(0, DialogFabriquerPotion.nombreBrinsOptimal(this.potionData) - this.potionData.nbBrins);
       this.potionData.herbebonus = Math.max(0, this.potionData.system.niveau - brinsManquants)
-    })
+    });
   }
 
   /* -------------------------------------------- */
   async onFabriquer() {
-    await this.html.find("[name='nbBrins']").change()
-    await this.actor.fabriquerPotion(this.potionData)
-    this.close()
+    await this.html.find("[name='nbBrins']").change();
+    await this.actor.fabriquerPotion(this.potionData);
+    this.close();
+    await this.onActionItem()
   }
 
   static nombreBrinsMinimum(herbeData) {
     switch (herbeData.system.categorie ?? '') {
-      case "Soin": return 1 + Math.max(0, 12 - 2 * herbeData.system.niveau)
-      case "Repos": return 1 + Math.max(0, 7 - 2 * herbeData.system.niveau)
+      case "Soin": return 1 + Math.max(0, 12 - 2 * herbeData.system.niveau);
+      case "Repos": return 1 + Math.max(0, 7 - 2 * herbeData.system.niveau);
     }
-    return 1
+    return 1;
   }
 
   static nombreBrinsOptimal(herbeData) {
     switch (herbeData.system.categorie ?? '') {
-      case "Soin": return 12 - herbeData.system.niveau
-      case "Repos": return 7 - herbeData.system.niveau
+      case "Soin": return 12 - herbeData.system.niveau;
+      case "Repos": return 7 - herbeData.system.niveau;
     }
-    return 1
+    return 1;
   }
 }

module/dialog-item-consommer.js

@@ -2,13 +2,13 @@ import { Misc } from "./misc.js";
 
 export class DialogConsommer extends Dialog {
 
-  static async create(actor, item) {
+  static async create(actor, item, onActionItem = async () => { }) {
     const consommerData = DialogConsommer.prepareData(actor, item);
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-item-consommer.hbs', consommerData);
-    return new DialogConsommer(actor, item, consommerData, html)
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-item-consommer.html', consommerData);
+    return new DialogConsommer(actor, item, consommerData, html, onActionItem)
   }
 
-  constructor(actor, item, consommerData, html) {
+  constructor(actor, item, consommerData, html, onActionItem = async () => { }) {
     const options = { classes: ["dialogconsommer"], width: 350, height: 'fit-content', 'z-index': 99999 };
     let conf = {
       title: consommerData.title,
@@ -16,7 +16,10 @@ export class DialogConsommer extends Dialog {
       default: consommerData.buttonName,
       buttons: {
         [consommerData.buttonName]: {
-          label: consommerData.buttonName, callback: async it => await this.onConsommer()
+          label: consommerData.buttonName, callback: async it => {
+            await this.onConsommer();
+            await onActionItem();
+          }
         }
       }
     };

module/dialog-select.js

@@ -2,11 +2,11 @@
 export class DialogSelect extends Dialog {
   static extractIdNameImg(it) { return { id: it.id, name: it.name, img: it.img } }
 
-  static async select(selectionData, onSelectChoice) {
-    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-select.hbs", selectionData)
+  static async select(selectData, onSelectChoice) {
+    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-select.html", selectData)
 
     const dialogData = {
-      title: selectionData.title ?? selectionData.label,
+      title: selectData.title ?? selectData.label,
       content: html,
       buttons: {}
     }
@@ -18,7 +18,7 @@ export class DialogSelect extends Dialog {
       'max-height': 600,
       'z-index': 99999
     }
-    new DialogSelect(dialogData, dialogOptions, selectionData, onSelectChoice).render(true)
+    new DialogSelect(dialogData, dialogOptions, selectData, onSelectChoice).render(true)
   }
 
   constructor(dialogData, dialogOptions, selectionData, onSelectChoice) {
@@ -36,7 +36,7 @@ export class DialogSelect extends Dialog {
   }
 
   choiceSelected(selectedId) {
-    const selected = this.selectionData.list.find(it => it.id == selectedId)
+    const selected = this.selectionData.find(it => it.id == selectedId)
     this.close()
     if (selected) {
       this.onSelectChoice(selected)

module/dialog-split-item.js

@@ -7,7 +7,7 @@ export class DialogSplitItem extends Dialog {
       item: item,
       choix: { quantite: 1, max: item.system.quantite - 1 }
     };
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-split.hbs`, splitData);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-split.html`, splitData);
     return new DialogSplitItem(item, splitData, html, callback)
   }
 

module/dialog-validation-encaissement.js

@@ -9,7 +9,7 @@ export class DialogValidationEncaissement extends Dialog {
 
   static async validerEncaissement(actor, rollData, armure, onEncaisser) {
     const encaissement = await RdDUtility.jetEncaissement(actor, rollData, armure, { showDice: HIDE_DICE });
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.hbs', {
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.html', {
       actor: actor,
       rollData: rollData,
       encaissement: encaissement

module/documents/_module.mjs

@@ -1,3 +0,0 @@
-export { default as RdDModelMonnaie } from "./monnaie.mjs"
-export { default as RdDModelMunition } from "./munition.mjs"
-export { default as RdDModelTarot } from "./tarot.mjs"

module/documents/monnaie.mjs

@@ -1,11 +0,0 @@
-import { RdDItem } from "../item.js";
-
-export default class RdDItemMonnaie extends RdDItem {
-
-  constructor(data, context) {
-    if (!data.img) {
-      data.img = 'systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp'
-    }
-    super(data, context);
-  }
-}

module/documents/munition.mjs

@@ -1,7 +0,0 @@
-import { RdDItem } from "../item.js";
-
-export default class RdDItemMunition extends RdDItem {
-  static get defaultIcon() {
-    return 'systems/foundryvtt-reve-de-dragon/icons/objets/fleche.webp'
-  }
-}

module/documents/tarot.mjs

@@ -1,7 +0,0 @@
-import { RdDItem } from "../item.js";
-
-export default class RdDItemTarot extends RdDItem {
-  static get defaultIcon() {
-    return 'systems/foundryvtt-reve-de-dragon/icons/tarots/dos-tarot.webp'
-  }
-}

module/enchantement/dialog-enchanter.js

@@ -1,177 +0,0 @@
-import { ITEM_TYPES } from "../constants.js"
-import { RdDItemSort } from "../item-sort.js"
-import { Misc } from "../misc.js"
-
-export const ACTION_ITEM_ENCHANTER =  {
-  code: 'item-enchanter', label: 'Enchanter', icon: it => 'fa-solid fa-sparkles',
-  filter: it => game.user.isGM || DialogEnchanter.isEnchantable(it),
-  optionsFilter: options => options.editable,
-  action: (item, actor) => DialogEnchanter.enchanter(item)
-}
-
-export class DialogEnchanter extends Dialog {
-
-  static isEnchantable(item) {
-    if (!item.isEnchantementPossible) {
-      return false
-    }
-    if (game.user.isGM) {
-      return true
-    }
-    if (item.system.prpermanent) {
-      return false
-    }
-    if (!item.parent?.isHautRevant()) {
-      return false
-    }
-    return RdDItemSort.lancements(RdDItemSort.findEnchantement(item.parent)) > 0
-      || RdDItemSort.lancements(RdDItemSort.findPurification(item.parent)) > 0
-      || RdDItemSort.lancements(RdDItemSort.findPermanence(item.parent)) > 0
-  }
-
-  static dateEnchantement() {
-    return game.system.rdd.calendrier.getTimestamp().debutJournee().indexDate
-  }
-
-  static async enchanter(item) {
-    const actor = item.parent
-    const sorts = {
-      enchantement: RdDItemSort.findEnchantement(actor),
-      purification: RdDItemSort.findPurification(actor),
-      permanence: RdDItemSort.findPermanence(actor)
-    }
-    const nouveauxpr = (sorts.enchantement?.system.lancements ?? []).map(it => it.reve)
-    const purification = (sorts.purification?.system.lancements ?? []).find(it => true)
-    const permanence = (sorts.permanence?.system.lancements ?? []).find(it => true)
-
-    const enchanter = {
-      type: item.type == ITEM_TYPES.potion ? 'potion' : Misc.typeName('Item', item.type),
-      actor: actor,
-      item: item,
-      reve: item.system.pr,
-      sorts: sorts,
-      nouveauxpr: nouveauxpr,
-      purification: purification != undefined,
-      permanence: permanence != undefined,
-      options: { isGM: game.user.isGM }
-    }
-    if (!item.isEnchantementPossible) {
-      ui.notifications.info("Seuls les liquides et les gemmes sont enchantables")
-      return
-    }
-    if (item.system.prpermanent) {
-      ui.notifications.info(`La ${enchanter.type} est permanente`)
-      return
-    }
-    if (!game.user.isGM) {
-      if (!(actor?.isPersonnage() || actor?.isHautRevant())) {
-        ui.notifications.info(`Seul un haut rêvant peut enchanter une ${enchanter.type}`)
-        return
-      }
-      if (item.system.quantite != 1) {
-        ui.notifications.info(`Impossible d'enchanter ${item.system.quantite} ${enchanter.type}s ${item.system.quantite > 1 ? 'en une seule fois' : ''}`)
-        return
-      }
-      if (!(nouveauxpr.length > 0 || purification || permanence)) {
-        ui.notifications.info("Le haut-rêvant n'a lancé de rituel d'enchantement")
-        return
-      }
-      if (item.system.magique && item.system.purifie && !purification && !permanence) {
-        ui.notifications.info(`La ${enchanter.type} est déjà enchantée et doit être purifiée`)
-        return
-      }
-    }
-
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/enchantement/dialog-enchanter.hbs`, enchanter)
-    const dialog = new DialogEnchanter(enchanter, html)
-    dialog.render(true)
-  }
-
-  constructor(enchanter, html) {
-    let options = { classes: ["dialog-enchanter"], width: 400, height: 'fit-content', 'z-index': 99999 }
-    let conf = {
-      title: `Enchanter une ${enchanter.type}`,
-      content: html,
-      default: "enchanter",
-      buttons: {
-        "enchanter": { label: "Enchanter", callback: it => this.onEnchanter() }
-      }
-    };
-    super(conf, options)
-    this.html = html
-    this.enchanter = enchanter
-    this.item = enchanter.item
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html)
-    this.html = html
-    this.html.find("input.enchantement").change(event => this.$onSelectEnchantement(event))
-    this.html.find("input.reve").change(event => this.$onForceReve(event))
-  }
-
-  $onSelectEnchantement(event) {
-    const addReve = $(event.currentTarget).data('reve')
-    this.enchanter.idx = $(event.currentTarget).data('idx')
-    this.enchanter.reve = this.item.system.pr + Number(addReve)
-    this.html.find("input.reve").val(this.enchanter.reve)
-    for (let idx = 0; idx < this.enchanter.nouveauxpr.length; idx++) {
-      if (idx != this.enchanter.idx) {
-        this.html.find(`.enchantement[data-idx='${idx}']`).prop("checked", false)
-      }
-    }
-  }
-
-  $onForceReve(event) {
-    const newReve = Number(event.currentTarget.value)
-    if (this.enchanter.reve != newReve) {
-      this.enchanter.idx = undefined
-    }
-    this.enchanter.reve = newReve
-  }
-
-  async onEnchanter() {
-    foundry.utils.mergeObject(this.enchanter,
-      {
-        rendrepurifie: this.html.find("input.rendrepurifie").prop("checked"),
-        rendrepermanent: this.html.find("input.rendrepermanent").prop("checked"),
-        addreve: this.enchanter.reve != this.item.system.pr
-      },
-      { inplace: true })
-    const item = this.enchanter.item
-    const actor = this.enchanter.actor
-
-    if (this.enchanter.reve == 0) {
-      await item.update({
-        'system.pr': 0,
-        'system.magique': false,
-        'system.purifie': false,
-        'system.prpermanent': false,
-        'system.prdate': 0
-      })
-    }
-    else {
-      const isPurifiee = this.enchanter.addreve
-        ? (this.enchanter.rendrepurifie && (item.item.system.pr == 0 ? true : item.system.purifie))
-        : (this.enchanter.rendrepurifie || item.system.purifie)
-      await item.update({
-        'system.pr': this.enchanter.reve,
-        'system.magique': true,
-        'system.purifie': isPurifiee,
-        'system.prpermanent': item.system.prpermanent || this.enchanter.rendrepermanent,
-        'system.prdate': DialogEnchanter.dateEnchantement()
-      })
-      if (actor) {
-        if (this.enchanter.rendrepurifie) {
-          await RdDItemSort.changeLancementsSort(this.enchanter.sorts.purification, it => it.slice(1));
-        }
-        if (this.enchanter.rendrepermanent) {
-          await RdDItemSort.changeLancementsSort(this.enchanter.sorts.permanence, it => it.slice(1));
-        }
-        if (this.enchanter.addreve && this.enchanter.idx != undefined) {
-          await RdDItemSort.changeLancementsSort(RdDItemSort.findEnchantement(actor), it => it.toSpliced(this.enchanter.idx, 1))
-        }
-      }
-    }
-  }
-}

module/grammar.js

@@ -24,7 +24,7 @@ export class Grammar {
   }
   
   static includesLowerCaseNoAccent(value, content) {
-    return Grammar.toLowerCaseNoAccent(value)?.includes(Grammar.toLowerCaseNoAccent(content));
+    return Grammar.toLowerCaseNoAccent(value).includes(Grammar.toLowerCaseNoAccent(content));
   }
 
   /* -------------------------------------------- */

module/item-arme.js

@@ -1,12 +1,10 @@
-import { Grammar } from "./grammar.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js"
-import { ITEM_TYPES } from "./constants.js";
-import { BASE_CORPS_A_CORPS } from "./item/base-items.js";
+import { ITEM_TYPES } from "./item.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 
 const nomCategorieParade = {
   "sans-armes": "Sans arme",
-  "armes-naturelles": "Armes naturelles",
+  "armes-naturelles": "Sans arme",
   "hast": "Armes d'hast",
   "batons": "Bâtons",
   "boucliers": "Boucliers",
@@ -32,7 +30,7 @@ export class RdDItemArme extends Item {
       case ITEM_TYPES.competencecreature:
         return RdDItemCompetenceCreature.armeCreature(arme);
     }
-    return RdDItemArme.corpsACorps();
+    return RdDItemArme.mainsNues();
   }
 
   static getCompetenceArme(arme, maniement) {
@@ -58,8 +56,8 @@ export class RdDItemArme extends Item {
   }
 
   static niveauCompetenceArme(arme, competences) {
-    const compArme = competences.find(it => Grammar.equalsInsensitive(it.name, arme.system.competence))
-    return compArme?.system.niveau ?? -8
+    const compArme = competences.find(it => it.name == arme.system.competence);
+    return compArme?.system.niveau ?? -8;
   }
 
   /* -------------------------------------------- */
@@ -83,59 +81,37 @@ export class RdDItemArme extends Item {
   /* -------------------------------------------- */
   static getCategorieParade(armeData) {
     if (armeData.system.categorie_parade) {
-      return armeData.system.categorie_parade
+      return armeData.system.categorie_parade;
     }
     // pour compatibilité avec des personnages existants
     if (armeData.type == ITEM_TYPES.competencecreature || armeData.system.categorie == 'creature') {
-      return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : '')
+      return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : '');
     }
     if (!armeData.type.match(/arme|competencecreature/)) {
-      return ''
+      return '';
     }
     if (armeData.system.competence == undefined) {
       return ITEM_TYPES.competencecreature;
     }
     let compname = armeData.system.competence.toLowerCase();
-    if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) {
-      return ''
-    }
+    if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) return '';
 
-    if (compname.match('hache')) return 'haches'
-    if (compname.match('hast')) return 'hast'
-    if (compname.match('lance')) return 'lances'
-    if (compname.match('bouclier')) return 'boucliers'
-    if (compname.match('masse')) return 'masses'
+    if (compname.match('hache')) return 'haches';
+    if (compname.match('hast')) return 'hast';
+    if (compname.match('lance')) return 'lances';
+    if (compname.match('bouclier')) return 'boucliers';
+    if (compname.match('masse')) return 'masses';
     if (compname.match('epée') || compname.match('épée')) {
       if (armeData.name.toLowerCase().match(/(gnome)/))
-        return 'epees-courtes'
+        return 'epees-courtes';
       if (armeData.name.toLowerCase().match(/((e|é)pée dragone|esparlongue|demi-dragonne)/))
-        return 'epees-longues'
-      return 'epees-lourdes'
+        return 'epees-longues';
+      return 'epees-lourdes';
     }
     if (compname.match('dague')) {
-      return 'dagues'
-    }
-    return 'sans-armes'
-  }
-
-  static defenseArmeParade(armeAttaque, armeParade) {
-    const defCategory = RdDItemArme.getCategorieParade(armeParade)
-    if (defCategory == 'boucliers') {
-      return 'norm'
-    }
-    if (armeAttaque?.system?.competence?.toLowerCase().match(/(fléau)/)) {
-      return ''
-    }
-    if (armeParade.system?.tir) {
-      return ''
-    }
-    const attCategory = RdDItemArme.getCategorieParade(armeAttaque)
-    switch (attCategory) {
-      case 'armes-naturelles': case 'sans-armes':
-        return defCategory == 'sans-armes' ? 'norm' : ''
-      default:
-        return RdDItemArme.needParadeSignificative(armeAttaque, armeParade) ? 'sign' : 'norm'
+      return 'dagues';
     }
+    return 'sans-armes';
   }
 
   /* -------------------------------------------- */
@@ -144,8 +120,8 @@ export class RdDItemArme extends Item {
       return false;
     }
     // categories d'armes à la parade (cf. page 115 )
-    const attCategory = RdDItemArme.getCategorieParade(armeAttaque)
-    const defCategory = RdDItemArme.getCategorieParade(armeParade)
+    let attCategory = RdDItemArme.getCategorieParade(armeAttaque);
+    let defCategory = RdDItemArme.getCategorieParade(armeParade);
     // bouclier et mêmes catégorie: peuvent se parer sans difficulté
     if (defCategory == 'boucliers') {
       return false;
@@ -208,7 +184,7 @@ export class RdDItemArme extends Item {
     return arme.system.competence.replace(" 1 main", " 2 mains");
   }
 
-  static isUtilisable(arme) {
+  static isArmeUtilisable(arme) {
     switch (arme.type) {
       case ITEM_TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
       case ITEM_TYPES.competencecreature: return true
@@ -216,34 +192,19 @@ export class RdDItemArme extends Item {
     return false
   }
 
-  static isAttaque(arme) {
-    switch (arme.type) {
-      case ITEM_TYPES.arme:
-        return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
-      case ITEM_TYPES.competencecreature:
-        return arme.system.iscombat && RdDItemCompetenceCreature.isAttaque(item)
-    }
-    return false
-  }
-
-  static isParade(arme) {
-    switch (arme.type) {
-      case ITEM_TYPES.arme:
-        return arme.system.equipe && arme.system.resistance > 0 && true/* TODO: regarder la categorie d'arme?*/
-      case ITEM_TYPES.competencecreature:
-        return arme.system.iscombat && RdDItemCompetenceCreature.isParade(arme)
-    }
-    return false
+  static ajoutCorpsACorps(armes, actor) {
+    armes.push(RdDItemArme.mainsNues(actor));
+    armes.push(RdDItemArme.empoignade(actor));
   }
 
   static corpsACorps(actor) {
-    let competence = actor?.getCompetenceCorpsACorps() ?? BASE_CORPS_A_CORPS
+    let competence = actor?.getCompetenceCorpsACorps() ?? { system: { niveau: -6 } };
     let melee = actor ? actor.system.carac['melee'].value : 0
     return {
-      _id: competence.id,
+      _id: competence?.id,
       name: 'Corps à corps',
       type: ITEM_TYPES.arme,
-      img: competence.img,
+      img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp',
       system: {
         initiative: RdDCombatManager.calculInitiative(competence.system.niveau, melee),
         equipe: true,
@@ -254,8 +215,6 @@ export class RdDItemArme extends Item {
         mortalite: 'non-mortel',
         competence: 'Corps à corps',
         resistance: 1,
-        baseInit: 4,
-        cac: 'pugilat',
         deuxmains: true,
         categorie_parade: 'sans-armes'
       }
@@ -265,6 +224,8 @@ export class RdDItemArme extends Item {
   static mainsNues(actor) {
     const mainsNues = RdDItemArme.corpsACorps(actor)
     mainsNues.name = 'Mains nues'
+    mainsNues.system.cac = 'pugilat'
+    mainsNues.system.baseInit = 4
     return mainsNues;
   }
 

module/item-competence.js

@@ -1,6 +1,5 @@
 import { Grammar } from "./grammar.js";
 import { RdDItem } from "./item.js";
-import { SANS_COMPETENCE } from "./item/base-items.js";
 import { Misc } from "./misc.js";
 
 const competenceTroncs = [["Esquive", "Dague", "Corps à corps"],
@@ -138,7 +137,7 @@ export class RdDItemCompetence extends Item {
   /* -------------------------------------------- */
   static computeEconomieXPTronc(competences) {
     return competenceTroncs.map(
-      list => list.map(name => RdDItemCompetence.findCompetence(competences, name, { onMessage: message => { } }))
+      list => list.map(name => RdDItemCompetence.findCompetence(competences, name))
         // calcul du coût xp jusqu'au niveau 0 maximum
         .map(it => RdDItemCompetence.computeDeltaXP(it?.system.base ?? -11, Math.min(it?.system.niveau ?? -11, 0)))
         .sort(Misc.ascending())
@@ -191,7 +190,7 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isNiveauBase(item) {
-    return item.system.niveau == undefined || Number(item.system.niveau) == RdDItemCompetence.getNiveauBase(item.system.categorie, item.type);
+    return Number(item.system.niveau) == RdDItemCompetence.getNiveauBase(item.system.categorie, item.type);
   }
 
   /* -------------------------------------------- */
@@ -204,12 +203,26 @@ export class RdDItemCompetence extends Item {
   }
 
   /* -------------------------------------------- */
-  static findCompetences(list, name, options = {}) {
-    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false, inplace: false });
-    return Misc.findAllLike(name, list, options);
+  static findCompetences(list, name) {
+    return Misc.findAllLike(name, list, { filter: it => it.isCompetence(), description: 'compétence' });
   }
 
-  static sansCompetence() { return SANS_COMPETENCE }
+  static sansCompetence() {
+    return {
+      name: "Sans compétence",
+      type: "competence",
+      img: "systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp",
+      system: {
+        niveau: 0,
+        default_diffLibre: 0,
+        base: 0,
+        categorie: "Aucune",
+        description: "",
+        descriptionmj: "",
+        defaut_carac: "",
+      }
+    };
+  }
 
   static findFirstItem(list, idOrName, options) {
     return list.find(it => it.id == idOrName && options.preFilter(it))
@@ -259,9 +272,8 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static triVisible(competences) {
-    return competences
-      ? competences.filter(it => !it.system.isHidden).sort((a, b) => RdDItemCompetence.compare(a, b))
-      : []
+    return competences.filter(it => !it.system.isHidden)
+      .sort((a, b) => RdDItemCompetence.compare(a, b))
   }
 
   static $positionTri(comp) {

module/item-competencecreature.js

@@ -1,6 +1,5 @@
 
-import { ITEM_TYPES } from "./constants.js";
-import { Grammar } from "./grammar.js";
+import { ITEM_TYPES } from "./item.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 
 export const CATEGORIES_COMPETENCES_CREATURES = {
@@ -18,11 +17,9 @@ export class RdDItemCompetenceCreature extends Item {
 
   /* -------------------------------------------- */
   static setRollDataCreature(rollData) {
-    const code = Grammar.toLowerCaseNoAccentNoSpace(rollData.competence.name);
-    const selectedCarac = { code: code, label: rollData.competence.name, value: rollData.competence.system.carac_value };
-    rollData.carac = { [code]: selectedCarac }
-    rollData.competence.system.defaut_carac = code
-    rollData.selectedCarac = selectedCarac
+    rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.system.carac_value } }
+    rollData.competence.system.defaut_carac = "carac_creature"
+    rollData.selectedCarac = rollData.carac.carac_creature
     rollData.arme = RdDItemCompetenceCreature.armeCreature(rollData.competence);
   }
 
@@ -30,29 +27,40 @@ export class RdDItemCompetenceCreature extends Item {
   static armeCreature(item) {
     const categorieAttaque = RdDItemCompetenceCreature.getCategorieAttaque(item)
     if (categorieAttaque != undefined) {
-      // cloner pour ne pas modifier la compétence
-      return foundry.utils.mergeObject(item, {
-        action: item.isCompetencePossession() ? 'possession' : 'attaque',
-        system: {
-          competence: item.name,
-          cac: categorieAttaque == "naturelle" ? "naturelle" : "",
-          niveau: item.system.niveau,
-          initiative: RdDCombatManager.calculInitiative(item.system.niveau, item.system.carac_value),
-          equipe: true,
-          resistance: 100,
-          dommagesReels: item.system.dommages,
-          penetration: 0,
-          force: 0,
-          rapide: true,
-        }
-      }, { inplace: false, });
+      // si c'est un Item compétence: cloner pour ne pas modifier la compétence
+      let arme = item.clone();
+      return foundry.utils.mergeObject(arme, {
+          action: item.isCompetencePossession() ? 'possession' : 'attaque',
+          system: {
+            competence: arme.name,
+            cac: categorieAttaque == "naturelle" ? "naturelle" : "",
+            niveau: item.system.niveau,
+            initiative: RdDCombatManager.calculInitiative(item.system.niveau, item.system.carac_value),
+            equipe: true,
+            resistance: 100,
+            dommagesReels: arme.system.dommages,
+            penetration: 0,
+            force: 0,
+            rapide: true,
+          }
+        }, { inplace: false });
     }
     return undefined;
   }
 
   /* -------------------------------------------- */
-  static isAttaque(item) {
-    return RdDItemCompetenceCreature.getCategorieAttaque(item) != undefined
+  static isCompetenceAttaque(item) {
+    if (item.type == ITEM_TYPES.competencecreature) {
+      switch (item.system.categorie) {
+        case "melee":
+        case "tir":
+        case "lancer":
+        case "naturelle":
+        case "possession":
+          return true
+      }
+    }
+    return undefined
   }
 
   static getCategorieAttaque(item) {
@@ -63,12 +71,12 @@ export class RdDItemCompetenceCreature extends Item {
         case "lancer":
         case "naturelle":
         case "possession":
+        case "parade":
           return item.system.categorie
       }
     }
     return undefined
   }
-
   static isDommages(item) {
     if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
@@ -81,12 +89,20 @@ export class RdDItemCompetenceCreature extends Item {
     }
     return false
   }
-
   static isParade(item) {
     if (item.type == ITEM_TYPES.competencecreature) {
-      return item.system.categorie_parade || item.system.isparade
+      switch (item.system.categorie) {
+        case "melee":
+        case "naturelle":
+        case "parade":
+          return true
+      }
     }
     return false
   }
 
-}
+  /* -------------------------------------------- */
+  static isCompetenceParade(item) {
+    return item.type == 'competencecreature' && item.system.categorie_parade !== "";
+  }
+}  

module/item-monnaie.js

@@ -1,5 +1,5 @@
 import { Misc } from "./misc.js";
-import { ITEM_TYPES, LOG_HEAD } from "./constants.js";
+import { LOG_HEAD } from "./constants.js";
 
 const MONNAIE_ETAIN = {
   name: "Denier (étain)", type: 'monnaie',
@@ -70,17 +70,18 @@ export class Monnaie {
   }
 
   static getFortune(monnaies) {
-    return (monnaies ?? [])
+    return (monnaies??[])
       .map(m => Number(m.system.cout) * Number(m.system.quantite))
       .reduce(Misc.sum(), 0);
   }
 
   static async optimiserFortune(actor, fortune) {
-    Monnaie.validerMonnaies(actor)
     let resteEnDeniers = Math.round(fortune * 100);
-    const updates = []
+    let monnaies = actor.itemTypes['monnaie'];
+    let updates = [];
+    Monnaie.validerMonnaies(monnaies, actor);
 
-    const  parValeur = Misc.classifyFirst(actor.itemTypes[ITEM_TYPES.monnaie], it => VALEUR_DENIERS(it.system.cout));
+    let parValeur = Misc.classifyFirst(monnaies, it => VALEUR_DENIERS(it.system.cout));
     for (let valeurDeniers of [1000, 100, 10, 1]) {
       const itemPiece = parValeur[valeurDeniers];
       if (itemPiece) {
@@ -101,11 +102,8 @@ export class Monnaie {
     }
   }
 
-  static validerMonnaies(actor) {
-    if (!actor) {
-      return
-     }
-    actor.itemTypes[ITEM_TYPES.monnaie]?.filter(it => VALEUR_DENIERS(it.system.cout) == 0)
+  static validerMonnaies(monnaies, actor = undefined) {
+    monnaies.filter(it => VALEUR_DENIERS(it.system.cout) == 0)
       .map(it => `La  monnaie ${it.name} de l'acteur ${actor?.name ?? 'sélectionné'} a une valeur de 0!`)
       .forEach(message => {
         ui.notifications.warn(message);

module/item-sheet.js

@@ -1,7 +1,9 @@
-import { ACTOR_TYPES, ITEM_TYPES } from "./constants.js";
 import { RdDItemSort } from "./item-sort.js";
 import { RdDUtility } from "./rdd-utility.js";
+import { RdDAlchimie } from "./rdd-alchimie.js";
 import { RdDItemCompetence } from "./item-competence.js";
+import { RdDHerbes } from "./rdd-herbes.js";
+import { RdDGemme } from "./rdd-gemme.js";
 import { HtmlUtility } from "./html-utility.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { SYSTEM_RDD } from "./constants.js";
@@ -10,15 +12,12 @@ import { SystemCompendiums } from "./settings/system-compendiums.js";
 import { Misc } from "./misc.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
-import { RdDItem } from "./item.js";
-import { FLEUVE_COORD, TMRUtility } from "./tmr-utility.js";
-import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";
-import { ItemAction } from "./item/item-actions.js";
+import { ITEM_TYPES, RdDItem } from "./item.js";
 
 /**
  * Extend the basic ItemSheet for RdD specific items
  */
-export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
+export class RdDItemSheet extends ItemSheet {
 
   static get ITEM_TYPE() {
     return undefined
@@ -26,12 +25,12 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
 
   static defaultTemplate(type) {
     return type ?
-      `systems/foundryvtt-reve-de-dragon/templates/item/${type}-sheet.hbs` :
-      "systems/foundryvtt-reve-de-dragon/templates/item/item-sheet.hbs";
+      `systems/foundryvtt-reve-de-dragon/templates/item-${type}-sheet.html` :
+      "systems/foundryvtt-reve-de-dragon/templates/item-sheet.html";
   }
 
   static register(sheetClass) {
-    foundry.documents.collections.Items.registerSheet(SYSTEM_RDD, sheetClass, {
+    Items.registerSheet(SYSTEM_RDD, sheetClass, {
       label: Misc.typeName('Item', sheetClass.ITEM_TYPE),
       types: [sheetClass.ITEM_TYPE],
       makeDefault: true
@@ -42,7 +41,7 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
   static get defaultOptions() {
     return foundry.utils.mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
-      template: RdDItemSheetV1.defaultTemplate(RdDItemSheetV1.ITEM_TYPE),
+      template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
       width: 550,
       height: 550
     }, { inplace: false });
@@ -50,7 +49,7 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
 
   /* -------------------------------------------- */
   get template() {
-    return RdDItemSheetV1.defaultTemplate(this.item.type);
+    return RdDItemSheet.defaultTemplate(this.item.type);
   }
 
   get title() {
@@ -97,56 +96,59 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
       name: this.item.name,
       system: this.item.system,
       actorId: this.actor?.id,
-      description: await RdDTextEditor.enrichHTML(this.item.system.description, this.item),
-      descriptionmj: await RdDTextEditor.enrichHTML(this.item.system.descriptionmj, this.item),
+      description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
+      descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
       isComestible: this.item.getUtilisationCuisine(),
-      options: RdDSheetUtility.mergeDocumentRights({}, this.item, this.isEditable),
-      competences: await SystemCompendiums.getCompetences(ACTOR_TYPES.personnage),
-      categories: RdDItem.getCategories(this.item.type),
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable),
     }
-
     if (this.item.type == ITEM_TYPES.competencecreature) {
       formData.isparade = RdDItemCompetenceCreature.isParade(this.item)
       formData.isdommages = RdDItemCompetenceCreature.isDommages(this.item)
     }
-    if (this.item.type == ITEM_TYPES.tache ||
-      this.item.type == ITEM_TYPES.livre ||
-      this.item.type == ITEM_TYPES.meditation ||
-      this.item.type == ITEM_TYPES.oeuvre) {
+
+    const competences = await SystemCompendiums.getCompetences('personnage');
+    formData.categories = RdDItem.getCategories(this.item.type)
+    if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
       formData.caracList = foundry.utils.duplicate(game.model.Actor.personnage.carac)
       formData.caracList["reve-actuel"] = foundry.utils.duplicate(game.model.Actor.personnage.reve.reve)
+      formData.competences = competences;
     }
-    if (this.item.type == ITEM_TYPES.arme) {
-      formData.competences = formData.competences.filter(it => it.isCompetenceArme())
+    if (this.item.type == 'arme') {
+      formData.competences = competences.filter(it => it.isCompetenceArme())
     }
-    if (this.item.type == ITEM_TYPES.recettecuisine) {
-      formData.ingredients = await RdDTextEditor.enrichHTML(this.item.system.ingredients, this.item)
+    if (['sort', 'sortreserve'].includes(this.item.type)) {
+      formData.competences = competences.filter(it => RdDItemCompetence.isDraconic(it));
     }
-    if (this.item.type == ITEM_TYPES.extraitpoetique) {
-      formData.extrait = await RdDTextEditor.enrichHTML(this.item.system.extrait, this.item)
-      formData.texte = await RdDTextEditor.enrichHTML(this.item.system.texte, this.item)
+    if (this.item.type == 'recettecuisine') {
+      formData.ingredients = await TextEditor.enrichHTML(this.object.system.ingredients, { async: true })
     }
-    if (this.item.type == ITEM_TYPES.recettealchimique) {
-      formData.manipulation = await RdDTextEditor.enrichHTML(this.item.system.manipulation, this.item)
-      formData.utilisation = await RdDTextEditor.enrichHTML(this.item.system.utilisation, this.item)
-      formData.enchantement = await RdDTextEditor.enrichHTML(this.item.system.enchantement, this.item)
-      formData.sureffet = await RdDTextEditor.enrichHTML(this.item.system.sureffet, this.item)
+    if (this.item.type == 'extraitpoetique') {
+      formData.extrait = await TextEditor.enrichHTML(this.object.system.extrait, { async: true })
+      formData.texte = await TextEditor.enrichHTML(this.object.system.texte, { async: true })
     }
-
-    if (this.item.type == ITEM_TYPES.herbe) {
-      if (formData.options.isOwned && ['Soin', 'Repos'].includes(formData.system.categorie)) {
-        formData.isIngredientPotionBase = true;
-      }
+    if (this.item.type == 'recettealchimique') {
+      RdDAlchimie.processManipulation(this.item, this.actor && this.actor.id);
+      formData.manipulation_update = await TextEditor.enrichHTML(this.object.system.manipulation_update, { async: true })
+      formData.utilisation = await TextEditor.enrichHTML(this.object.system.utilisation, { async: true })
+      formData.enchantement = await TextEditor.enrichHTML(this.object.system.enchantement, { async: true })
+      formData.sureffet = await TextEditor.enrichHTML(this.object.system.sureffet, { async: true })
     }
-    if (this.item.type == ITEM_TYPES.sortreserve) {
+    if (this.item.type == 'gemme') {
+      formData.gemmeTypeList = RdDGemme.getGemmeTypeOptionList();
+      RdDGemme.calculDataDerivees(this.item);
+    }
+    if (this.item.type == 'potion') {
+      await RdDHerbes.addPotionFormData(formData);
+    }
+    if (formData.options.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
+      formData.isIngredientPotionBase = true;
+    }
+    if (this.item.type == 'sortreserve') {
       const sortId = this.item.system.sortid;
-      formData.competences = formData.competences.filter(it => RdDItemCompetence.isDraconic(it));
       formData.sort = formData.options.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
     }
-    if (this.item.type == ITEM_TYPES.sort) {
-      formData.competences = formData.competences.filter(it => RdDItemCompetence.isDraconic(it));
-      formData.bonusCaseList = RdDItemSort.getBonusCaseList(this.item);
-    }
+    formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true);
+
     return formData;
   }
 
@@ -158,19 +160,23 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
 
     HtmlUtility.showControlWhen(this.html.find(".item-cout"), ReglesOptionnelles.isUsing('afficher-prix-joueurs')
       || game.user.isGM
-      || !this.item.isOwned)
-    HtmlUtility.showControlWhen(this.html.find(".item-magique"), this.item.isMagique)
+      || !this.item.isOwned);
+    HtmlUtility.showControlWhen(this.html.find(".item-magique"), this.item.isMagique());
 
     // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return
+    if (!this.options.editable) return;
 
-    this.form.ondragstart = async event => await this._onDragStart(event)
-    this.form.ondrop = async event => await this._onDrop(event)
+    this.form.ondragstart = (event) => this._onDragStart(event);
+    this.form.ondrop = (event) => this._onDrop(event);
 
     // Select competence categorie
-    this.html.find(".categorie").change(async event => await this._onSelectCategorie(event))
+    this.html.find(".categorie").change(event => this._onSelectCategorie(event));
 
-    this.html.find('.sheet-competence-xp').change(event => RdDUtility.checkThanatosXP(this.item))
+    this.html.find('.sheet-competence-xp').change((event) => {
+      if (this.item.isCompetencePersonnage()) {
+        RdDUtility.checkThanatosXP(this.item.name);
+      }
+    });
     this.html.find(".item-cout input[name='system.cout']").change(event => {
       if (this.item.isMonnaie()) {
         const value = event.currentTarget.value;
@@ -179,60 +185,72 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
         }
       }
     })
-    this.html.find('.delete-bonus-case').click(async event => await this.supprimerBonusCase(event.currentTarget.attributes['data-deleteCoord'].value))
-    this.html.find('.creer-tache-livre').click(async event => await this._getEventActor(event).creerTacheDepuisLivre(this.item))
-    this.html.find('.creer-potion-base').click(async event => await this._getEventActor(event).fabriquerDecoctionHerbe(this.item))
-    this.html.find('input[name="system.cacher_points_de_tache"]').change(async event =>
-      await this.item.update({ 'system.cacher_points_de_tache': event.currentTarget.checked })
-    )
 
-    this.html.find('.roll-text').click(async event => await RdDTextEditor.rollText(event, this.actor))
-    this.html.find('.chat-roll-text').click(async event => await RdDTextEditor.chatRollText(event))
+    this.html.find('.date-enchantement').change((event) => {
+      const jour = Number(this.html.find('input.date-enchantement[name="enchantement.jour"]').val());
+      const mois = RdDTimestamp.definition(this.html.find('select.date-enchantement[name="enchantement.mois"]').val());
+      const indexDate = game.system.rdd.calendrier.getIndexFromDate(jour, mois.heure);
+      this.item.update({ 'system.prdate': indexDate });
+      console.warn(`Date d'enchantement modifiée ${jour}/${mois.heure}: ${indexDate}`)
+    });
+
+    this.html.find('.creer-tache-livre').click((event) => this._getEventActor(event).creerTacheDepuisLivre(this.item));
+    this.html.find('.consommer-potion').click((event) => this._getEventActor(event).consommerPotion(this.item, this.getActionRenderItem()));
+    this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).actionHerbe(this.item));
+    this.html.find('input[name="system.cacher_points_de_tache"]').change(async event => await this.item.update({ 'system.cacher_points_de_tache': event.currentTarget.checked }));
+
+    this.html.find('.alchimie-tache a').click((event) => {
+      let actor = this._getEventActor(event);
+      if (actor) {
+        let recetteId = event.currentTarget.attributes['data-recette-id'].value;
+        let tacheName = event.currentTarget.attributes['data-alchimie-tache'].value;
+        let tacheData = event.currentTarget.attributes['data-alchimie-data'].value;
+        actor.effectuerTacheAlchimie(recetteId, tacheName, tacheData);
+      } else {
+        ui.notifications.info("Impossible trouver un acteur pour réaliser cette tache Alchimique.");
+      }
+    });
 
     if (this.actor) {
-      this.html.find('.actionItem').click(async event => await ItemAction.onActionItem(event, this.actor, this.options))
-
-      // TODO: utiliser un itemAction?
-      this.html.find('.item-potion-consommer').click(async event => await this.itemActionConsommer(event))
+      this.html.find('.item-split').click(async event => RdDSheetUtility.splitItem(RdDSheetUtility.getItem(event, this.actor), this.actor, this.getActionRenderItem()));
+      this.html.find('.item-edit').click(async event => RdDSheetUtility.getItem(event, this.actor)?.sheet.render(true));
+      this.html.find('.item-delete').click(async event => RdDUtility.confirmActorItemDelete(this, RdDSheetUtility.getItem(event, this.actor)));
+      this.html.find('.item-vendre').click(async event => RdDSheetUtility.getItem(event, this.actor)?.proposerVente());
+      this.html.find('.item-montrer').click(async event => RdDSheetUtility.getItem(event, this.actor)?.postItemToChat());
+      this.html.find('.item-action').click(async event => RdDSheetUtility.getItem(event, this.actor)?.actionPrincipale(this.actor, this.getActionRenderItem()));
 
       this.html.find('.item-quantite-plus').click(async event => {
         await this.actor.itemQuantiteIncDec(RdDSheetUtility.getItemId(event), 1)
-        //this.render()
-      })
+        this.render();
+      });
       this.html.find('.item-quantite-moins').click(async event => {
         await this.actor.itemQuantiteIncDec(RdDSheetUtility.getItemId(event), -1)
-        //this.render()
-      })
+        this.render();
+      });
     }
 
     const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: foundry.utils.duplicate(timestamp) })
 
-    RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.debut', updateItemTimestamp)
-    RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.fin', updateItemTimestamp)
+    RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.debut', updateItemTimestamp);
+    RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.fin', updateItemTimestamp);
   }
 
-  async itemActionDelete(event) {
-    const item = RdDSheetUtility.getItem(event, this.actor)
-    return await RdDUtility.confirmActorItemDelete(item, this.actor)
-  }
-
-  async itemActionConsommer(event) {
-    const item = RdDSheetUtility.getItem(event, this.actor)
-    if (item) {
-      await actor.consommerPotion(item)
-      await RdDSheetUtility.renderItemBranch(this.actor, item)
+  getActionRenderItem() {
+    return async () => {
+      let item = this.item;
+      while (item) {
+        await item.sheet?.render()
+        item = this.actor.getContenant(item)
+      }
     }
   }
 
-  async itemActionSplit(event) {
-    const item = RdDSheetUtility.getItem(event, this.actor)
-    if (item) {
-      await RdDSheetUtility.splitItem(item, this.actor)
-      await RdDSheetUtility.renderItemBranch(this.actor, item)
-    }
+  _getEventActor(event) {
+    let actorId = event.currentTarget.attributes['data-actor-id'].value;
+    let actor = game.actors.get(actorId);
+    return actor;
   }
 
-  _getEventActor(event) { return game.actors.get(event.currentTarget.attributes['data-actor-id'].value) }
 
   /* -------------------------------------------- */
   async _onSelectCategorie(event) {
@@ -246,74 +264,23 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
     }
   }
 
-  async supprimerBonusCase(deleteCoord) {
-    if (this.item.type == ITEM_TYPES.sort) {
-      const oldList = RdDItemSort.getBonusCaseList(this.item)
-      const newList = oldList.filter(it => it.case != deleteCoord);
-      if (newList.length != oldList.length) {
-        await this.item.update({
-          'system.bonuscase': RdDItemSort.bonuscasesToString(newList)
-        })
-      }
-    }
-  }
-
   /* -------------------------------------------- */
   /** @override */
   _updateObject(event, formData) {
-    switch (this.item.type) {
-      case ITEM_TYPES.sort:
-        formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheetV1._listCaseTmr(
-          formData.caseTmrCoord,
-          formData.caseTmrBonus,
-          formData.caseTmrAdd
-        ))
-        break
-      case ITEM_TYPES.competence:
-        formData['system.niveau'] = formData['system.niveau'] ?? formData['system.base']
-        break
+    if (this.item.type == 'sort') {
+      // Données de bonus de cases ?
+      formData['system.bonuscase'] = RdDItemSort.buildBonuscaseFromArrays(formData.bonusValue, formData.caseValue);
     }
-
-    return this.item.update(formData)
+    return this.item.update(formData);
   }
 
   /* -------------------------------------------- */
-  /**
-   * reconstruit les bonus de cases
-   * @param {*} caseTmrCoord tableau des coordonées
-   * @param {*} caseTmrBonus tableau des bonus
-   * @param {*} caseTmrAdd case à ajouter
-   * @returns list d'objets {coord, bonus}
-   */
-  static _listCaseTmr(caseTmrCoord, caseTmrBonus, caseTmrAdd) {
-    const listCaseTmrCoord = caseTmrCoord == undefined ? [] : Array.isArray(caseTmrCoord) ? caseTmrCoord : [caseTmrCoord]
-    const listCaseTmrBonus = caseTmrBonus == undefined ? [] : Array.isArray(caseTmrBonus) ? caseTmrBonus : [caseTmrBonus]
-    if (caseTmrAdd != undefined && caseTmrAdd != '' && TMRUtility.verifyTMRCoord(caseTmrAdd) && !listCaseTmrCoord.includes(caseTmrAdd)) {
-      listCaseTmrCoord.push(TMRUtility.getTMR(caseTmrAdd).coord)
-      listCaseTmrBonus.push(1)
-    }
-
-    const list = [];
-    const caseChecked = {};
-    for (let i = 0; i < listCaseTmrBonus.length && i < listCaseTmrCoord.length; i++) {
-      const coord = listCaseTmrCoord[i] == FLEUVE_COORD ? FLEUVE_COORD : (listCaseTmrCoord[i]?.toUpperCase() ?? 'A1')
-      const bonus = listCaseTmrBonus[i] ?? 0
-      if (TMRUtility.verifyTMRCoord(coord) && bonus >= 0 && !caseChecked[coord]) {
-        caseChecked[coord] = coord
-        list.push({ case: coord, bonus: bonus })
-      }
-    }
-    return list
+  async _onDragStart(event) {
   }
 
-  /* -------------------------------------------- */
-  async _onDragStart(event) { }
-  async _onDropItem(event, dragData) { }
-  async _onDropActor(event, dragData) { }
-
   async _onDrop(event) {
     // Try to extract the dragData
-    let dragData = RdDItemSheetV1.$extractDragData(event);
+    let dragData = RdDItemSheet.$extractDragData(event);
     if (!dragData) return false;
     const allowed = Hooks.call("dropActorSheetData", this.actor, this, dragData);
     if (allowed === false) return false;
@@ -335,7 +302,13 @@ export class RdDItemSheetV1 extends foundry.appv1.sheets.ItemSheet {
         return JSON.parse(eventData);
       }
     } catch (err) { }
-    return undefined
+    return undefined;
+  }
+
+  async _onDropItem(event, dragData) {
+  }
+
+  async _onDropActor(event, dragData) {
   }
 
 }

module/item-sort.js

@@ -1,88 +1,53 @@
 import { Grammar } from "./grammar.js";
 import { RdDItemCompetence } from "./item-competence.js";
-import { ITEM_TYPES } from "./constants.js";
+import { ITEM_TYPES } from "./item.js";
 import { Misc } from "./misc.js";
-import { FLEUVE_COORD, TMRUtility } from "./tmr-utility.js";
+import { TMRUtility } from "./tmr-utility.js";
 
-export const VOIES_DRACONIC = [
+const VOIES_DRACONIC = [
   { code: 'O', label: "Voie d'Oniros", short: 'Oniros', ordre: 'a' },
   { code: 'H', label: "Voie d'Hypnos", short: 'Hypnos', ordre: 'b' },
   { code: 'N', label: "Voie de Narcos", short: 'Narcos', ordre: 'c' },
   { code: 'T', label: "Voie de Thanatos", short: 'Thanatos', ordre: 'd' },
-  { code: 'O/H/N/T', label: "Oniros/Hypnos/Narcos/Thanatos", short: 'O/H/N/T', ordre: 'e' },
-  { code: 'O/H/N', label: "Oniros/Hypnos/Narcos", short: "O/H/N", ordre: 'f' }
+  { code: 'O/H/N/T', label: "Oniros/Hypnos/Narcos/Thanatos", short: 'Oniros/Hypnos/Narcos/Thanatos', ordre: 'e' },
+  { code: 'O/H/N', label: "Oniros/Hypnos/Narcos", short: "Oniros/Hypnos/Narcos", ordre: 'f' }
 ]
 
 /* -------------------------------------------- */
 export class RdDItemSort extends Item {
-  static preloadHandlebars() {
-    Handlebars.registerHelper('itemSort-spaceIfText', val => RdDItemSort.addSpaceToNonNumeric(val))
-    Handlebars.registerHelper('itemSort-codeDraconic', voie => RdDItemSort.getCode(voie))
-    Handlebars.registerHelper('itemSort-shortDraconic', voie => RdDItemSort.getShortVoie(voie))
-  }
 
-  static addSpaceToNonNumeric(value) {
-    return Number.isNumeric(value) || ['-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].includes(String(value).charAt[0]) ? value : ' ' + RdDItemSort.toVar(value)
-  }
-
-  static lancements(sort) { return sort?.system.lancements.length ?? 0 }
-
-  static findEnchantement(actor) { return RdDItemSort.findSort(actor, 'Enchantement', ['Narcos', 'N']) }
-  static findPermanence(actor) { return RdDItemSort.findSort(actor, 'Permanence', ['Narcos', 'N']) }
-  static findPurification(actor) { return RdDItemSort.findSort(actor, 'Purification', ['Narcos', 'N']) }
-
-  static findSort(actor, name, draconics) {
-    return actor.itemTypes[ITEM_TYPES.sort].find(it => Grammar.includesLowerCaseNoAccent(it.name, name)
-      && (draconics == undefined || draconics.includes(it.system.draconic)))
-  }
-  static async changeLancementsSort(sort, changement) {
-    await sort?.update({ 'system.lancements': changement(sort.system.lancements) });
-  }
-
-  static toVar(value) {
-    return value ? value.replace('variable', 'var') : ''
-  }
-
-  static getDraconicsSort(competencesDraconic, sort) {
-    // se baser sur la voie du sort?
+  static getDraconicsSort(draconicList, sort) {
     switch (Grammar.toLowerCaseNoAccent(sort.name)) {
       case "lecture d'aura":
       case "detection d'aura":
-        return competencesDraconic;
+        return draconicList;
       case "annulation de magie":
-        return competencesDraconic.filter(it => !RdDItemCompetence.isThanatos(it));
+        return draconicList.filter(it => !RdDItemCompetence.isThanatos(it));
     }
-    const voies = sort.system.draconic.split('/')
-    return voies.map(voie => RdDItemCompetence.getVoieDraconic(competencesDraconic, voie))
-  }
-
-  static getBestDraconicSort(competencesDraconic, sort) {
-    return  RdDItemSort.getDraconicsSort(competencesDraconic, sort).sort(Misc.descending(it => it.system.niveau)).find(it=>true)
+    return [RdDItemCompetence.getVoieDraconic(draconicList, sort.system.draconic)];
   }
 
   static getOrdreCode(code) {
     return (VOIES_DRACONIC.find(it => it.code == code)?.ordre ?? '?')
   }
 
-  static getCodeVoie(voie) {
-    return VOIES_DRACONIC.find(it => [it.code, it.short, it.label].includes(voie))?.code ?? '?'
+  static getVoieCode(voie) {
+    return VOIES_DRACONIC.find(it => voie.name.includes(it.short))?.code ?? '?'
   }
 
-  static getShortVoie(voie) {
-    return VOIES_DRACONIC.find(it => [it.code, it.short, it.label].includes(voie))?.short ?? voie
-  }
-
-  static getCode(sort, codeVoies = ['O', 'H', 'N', 'T']) {
+  static getCodeDraconic(sort, voies = ['O', 'H', 'N', 'T']) {
     switch (Grammar.toLowerCaseNoAccent(sort.name)) {
       case "lecture d'aura":
       case "detection d'aura":
-        return RdDItemSort.$voiesConnues('O/H/N/T', codeVoies)
+        return RdDItemSort.$voiesConnues('O/H/N/T', voies)
       case "annulation de magie":
-        return RdDItemSort.$voiesConnues('O/H/N', codeVoies)
+        return RdDItemSort.$voiesConnues('O/H/N', voies)
     }
-    return RdDItemSort.getCodeVoie(sort.system.draconic)
+    const voie = VOIES_DRACONIC.find(it => it.label.includes(sort.system.draconic))
+    return voie?.code ?? sort.system.draconic
   }
 
+
   static $voiesConnues(voiesSort, voies) {
     const codes = voies.filter(it => voiesSort.includes(it))
       .sort(Misc.ascending(it => RdDItemSort.getOrdreCode(it)))
@@ -96,7 +61,7 @@ export class RdDItemSort extends Item {
 
   /* -------------------------------------------- */
   static isCoutVariable(sort) {
-    return sort && !Number.isInteger(sort.system.ptreve) && (sort.system.ptreve.toLowerCase() == "variable" || sort.system.ptreve.indexOf("+") >= 0);
+    return sort && (sort.system.ptreve.toLowerCase() == "variable" || sort.system.ptreve.indexOf("+") >= 0);
   }
 
   /* -------------------------------------------- */
@@ -114,59 +79,89 @@ export class RdDItemSort extends Item {
     return variable;
   }
 
+  /* -------------------------------------------- */
+  static buildBonusCaseList(bonuscase, newCase) {
+    const list = RdDItemSort.bonuscaseStringToList(bonuscase)
+    if (newCase) {
+      list.push({ case: "Nouvelle", bonus: 0 })
+    }
+    return list;
+  }
+
   /**
    * Retourne une liste de bonus/case pour un item-sheet
   * @param {} item 
   */
-  static getBonusCaseList(item) {
+  static getBonusCaseList(item, newCase = false) {
     // Gestion spéciale case bonus
     if (item.type == ITEM_TYPES.sort) {
-      return RdDItemSort.stringToBonuscases(item.system.bonuscase)
+      return RdDItemSort.buildBonusCaseList(item.system.bonuscase, newCase);
     }
-    return [];
+    return undefined;
+  }
+
+  /* -------------------------------------------- */
+  /** Met à jour les données de formulaire 
+   * si static des bonus de cases sont présents 
+   * */
+  static buildBonuscaseFromArrays(bonuses, coords) {
+    if (bonuses) {
+      const list = [];
+      const caseCheck = {};
+      for (let i = 0; i < bonuses.length && i < coords.length; i++) {
+        const coord = coords[i] == 'Fleuve' ? 'Fleuve' : (coords[i]?.toUpperCase() ?? 'A1');
+        const bonus = bonuses[i] || 0;
+        if (TMRUtility.verifyTMRCoord(coord) && bonus > 0 && caseCheck[coord] == undefined) {
+          caseCheck[coord] = bonus;
+          list.push({ case: coord, bonus: bonus });
+        }
+      }
+      return RdDItemSort._bonuscaseListToString(list);
+    }
+    return undefined;
   }
 
   /* -------------------------------------------- */
   static incrementBonusCase(actor, sort, coord) {
-    if (TMRUtility.isFleuve(coord)) {
-      coord = FLEUVE_COORD;
-    }
-    let list = RdDItemSort.stringToBonuscases(sort.system.bonuscase);
-    const existing = list.find(it => it.case == coord)
-    const bonus = Number(existing?.bonus ?? 0) + 1
-    if (existing) {
-      existing.bonus = bonus
-    }
-    else {
-      list.push({ case: coord, bonus: 1 })
+    if (TMRUtility.getTMR(coord).type == "fleuve") {
+      coord = 'Fleuve';
     }
+    const list = RdDItemSort.buildBonusCaseList(sort.system.bonuscase, false);
+    const bonus = Number(list.find(it => it.case == coord)?.bonus ?? 0);
+    const modified = { case: coord, bonus: bonus + 1 };
 
-    actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': RdDItemSort.bonuscasesToString(list) }]);
+    const bonuscase = RdDItemSort._bonuscaseListToString(
+      list.filter(it => it.case != coord).concat(modified)
+    );
+
+    // Sauvegarde/update
+    actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': bonuscase }]);
   }
 
 
   /* -------------------------------------------- */
   static getCaseBonus(sort, coord) {
-    const search = TMRUtility.isFleuve(coord)
-      ? it => it.case == 'Fleuve'
-      : it => it.case == coord;
-    const bc = RdDItemSort.stringToBonuscases(sort.system.bonuscase)
-      .find(search)
+    const isFleuve = TMRUtility.getTMR(coord).type == "fleuve";
+
+    let bc = RdDItemSort.buildBonusCaseList(sort.system.bonuscase, false)
+      .filter(it => it.case == coord || (isFleuve && it.case == 'Fleuve'))
+      .find(it => true)
     return Number(bc?.bonus ?? 0);
   }
 
-  static bonuscasesToString(list) {
+  static _bonuscaseListToString(list) {
     return list.map(it => `${it.case}:${it.bonus}`)
       .sort(Misc.ascending())
       .join(',');
   }
-
-  static stringToBonuscases(bonuscase) {
+  static bonuscaseStringToList(bonuscase) {
     if (bonuscase == undefined || bonuscase == '') {
       return []
     }
-    return bonuscase.split(',')
-      .map(it => it.split(':'))
-      .map(it => { return { case: it[0], bonus: it[1] } });
+    return bonuscase.split(',').map(it => {
+      const b = it.split(':');
+      return { case: b[0], bonus: b[1] };
+    });
   }
+
 }