Ajout release process

.gitea/workflows/release.yaml

@@ -0,0 +1,63 @@
+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
+
+    # 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 system.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/public/fvtt-hawkmoon-cyd/releases/download/latest/system.json
+        download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-hawkmoon-cyd.zip
+
+    # 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 ./fvtt-hawkmoon-cyd.zip system.json README.md LICENCE.txt assets/ lang/ modules/ packs/ styles/ templates/
+
+    - name: setup go
+      uses: https://github.com/actions/setup-go@v4
+      with:
+        go-version: '>=1.20.1'
+
+    - name: Use Go Action
+      id: use-go-action
+      uses: https://gitea.com/actions/release-action@main
+      with:
+        files: |-
+          ./fvtt-hawkmoon-cyd.zip
+          system.json
+        api_key: '${{secrets.ALLOW_PUSH_RELEASE}}'
+
+    - name: Publish to Foundry server
+      uses: https://github.com/djlechuck/foundryvtt-publish-package-action@v1
+      with:
+        token: ${{ secrets.FOUNDRYVTT_RELEASE_TOKEN }}
+        id: 'fvtt-hawkmoon-cyd'
+        version: ${{github.event.release.tag_name}}
+        manifest: 'https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/releases/download/latest/system.json'
+        notes: 'https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-hawkmoon-cyd.zip'
+        compatibility-minimum: '13'
+        compatibility-verified: '13'

.gitignore

@@ -0,0 +1,10 @@
+.vscode/settings.json
+.idea
+.history
+todo.md
+/.vscode
+/ignored/
+/node_modules/
+/jsconfig.json
+/package.json
+/package-lock.json

LICENCE.txt

@@ -0,0 +1,25 @@
+MIT License
+
+Copyright (c) 2022 Uberwald/LeRatierBretonnien
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+This license does not apply to the compendium content listed in this software's
+"packs" directory. See the README for licensing information for the compendium
+packs.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,23 +1,29 @@
-# Système Foundry pour Mournblade (French RPG, Titam France/Sombres Projets)
+# Système Foundry pour Hawkmoon (French RPG, Titam France/Sombres Projets)
 
 ## EN
 
-Unofficial system for Mournblade (French version from Titam France).
+Unofficial system for Hawkmoon (French version from Titam France).
+
+This system has been approved by Département des Sombres Projets ( http://www.titam-france.fr/ ), thanks !
 
 Books are mandatory to play and are available at : http://www.titam-france.fr
 
 ## FR
 
-Système non-officiel pour le JDR Mournblade (Titam France).
+Système non-officiel pour le JDR Hawkmoon (Titam France/Sombres Projets).
 
-Ce système a été autorisé par Ludospherik ( http://www.ludospherik.fr/ ), merci à eux !
+Ce système a été autorisé par le Département des Sombres Projets ( http://www.titam-france.fr/ ), merci à eux !
 
 Les livres du jeu sont nécessaires pour jouer, et sont disponibles ici : http://www.titam-france.fr
 
 # Credits 
 
-Mournblade, le jeu de rôle de Sword & Sorcery, is a property of Titam France/Sombres Projets.
+Hawkmoon, le jeu de rôle du Troisième Millénaire, is a property of Titam France/Sombres Projets.
 
 # Developmement 
 
 LeRatierBretonnien
+
+# Tests, icones et saisie des données
+
+Prêtre, Blondin, Zechrub/Chris, Kyllian, Lightbringer

_deprecated/actor-sheet.html

@@ -37,12 +37,10 @@
                   <h4 class="item-name-label competence-name item-field-label-medium">Etat</h4>
                   <select class="status-small-label color-class-common item-field-label-medium" type="text" name="system.sante.etat"
                     value="{{system.sante.etat}}" data-dtype="Number">
-                    {{#select system.sante.etat}}
-                    {{> systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html}}
-                    {{/select}}
+                    {{selectOptions combativiteList selected=system.sante.etat valueAttr="value" nameAttr="value" labelAttr="label"}}
                   </select>
                 </li>
-    
+
             </ul>
           </div>
         </div>
@@ -57,6 +55,7 @@
     <a class="item" data-tab="equipement">Equipement</a>
     <a class="item" data-tab="biodata">Bio&Notes</a>
   </nav>
+  <hr>
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
@@ -65,7 +64,7 @@
     <div class="tab principal" data-group="primary" data-tab="principal">
 
       <div class="flexcol">
-       
+
         <div class="grid grid-2col">
 
           <div class="sheet-box color-bg-archetype">
@@ -73,13 +72,11 @@
               {{#each system.attributs as |attr key|}}
               <li class="item flexrow " data-attr-key="{{key}}">
                 <img class="item-name-img" src="systems/fvtt-hawkmoon-cyd/assets/icons/{{attr.labelnorm}}.webp">
-                <span class="item-name-label competence-name item-field-label-medium"><a
+                <span data-tooltip="Cliquez pour faire un jet" class="item-name-label competence-name item-field-label-medium"><a
                     class="roll-attribut">{{attr.label}}</a></span>
                 <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                   name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="Number">
-                  {{#select attr.value}}
-                  {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
-                  {{/select}}
+                  {{selectOptions @root.config.listeNiveauSkill selected=attr.value}}
                 </select>
               </li>
               {{/each}}
@@ -90,7 +87,7 @@
                 <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
                       value="{{system.vitesse.value}}" data-dtype="Number" />
               </li>
-    
+
             </ul>
           </div>
 
@@ -112,6 +109,13 @@
               </li>
               {{/each}}
             </ul>
+            {{#if isGM}}
+            <div class="flexrow">
+              <span class="item-name-label competence-name item-field-label-medium">Modificateur de Vigueur</span>
+              <input type="text" class="item-field-label-short" name="system.sante.vigueurmodifier"
+                  value="{{system.sante.vigueurmodifier}}" data-dtype="Number" />
+            </div>
+            {{/if}}
           </div>
         </div>
 
@@ -125,9 +129,13 @@
                 <label class="short-label">Résumé</label>
               </span>
               <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
             </li>
             {{#each talents as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
               <img class="item-name-img" src="{{talent.img}}" />
               <span class="item-name-label competence-name">{{talent.name}}</span>
               <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
@@ -142,6 +150,39 @@
           </ul>
         </div>
 
+        {{#if (count mutations)}}
+          <div class="sheet-box color-bg-archetype">
+            <ul class="item-list alternate-list">
+              <li class="item flexrow">
+                <span class="item-name-label-header">
+                  <h3><label class="items-title-text">Mutations</label></h3>
+                </span>
+                <span class="item-field-label-long">
+                  <label class="short-label">Catégorie</label>
+                </span>
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="mutation" title="Ajouter une Mutation"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+              </li>
+              {{#each mutations as |mutation key|}}
+              <li class="item flexrow " data-item-id="{{mutation._id}}" data-item-type="mutation">
+                <img class="item-name-img" src="{{mutation.img}}" />
+                <span class="item-name-label competence-name">{{mutation.name}}</span>
+                <span class="item-name-label item-field-label-long2">{{mutation.system.mutationcategorie}}</span>
+
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          </div>
+        {{/if}}
+
         <div class="flexrow">
           <div class="sheet-box color-bg-archetype">
             <ul class="item-list alternate-list">
@@ -153,7 +194,11 @@
                   <label class="short-label">Résumé</label>
                 </span>
                 <div class="item-filler">&nbsp;</div>
-              </li>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+                </li>
               {{#each talentsCell as |talent key|}}
               <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
                 <img class="item-name-img" src="{{talent.img}}" />
@@ -192,13 +237,24 @@
             {{#each skills as |skill key|}}
             <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
               <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
+
+              <div class="flexcol item-name-label">
+
+                <span class="item-name-label competence-name"><a class="roll-competence "
                   data-attr-key="tochoose">{{skill.name}}</a></span>
+
+                    <span class="predilection-text">
+                    {{#each skill.system.predilections as |pred key|}}
+                      {{#if (and pred.acquise (not pred.used))}}
+                        {{pred.name}},
+                      {{/if}}
+                    {{/each}}
+                  </span>
+              </div>
+
               <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                 data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
-                {{#select skill.system.niveau}}
-                {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
-                {{/select}}
+                {{selectOptions @root.config.listeNiveauSkill selected=skill.system.niveau}}
               </select>
 
               {{#if (ne skill.system.attribut1 "none")}}
@@ -234,6 +290,19 @@
       <ul class="item-list alternate-list">
         <li class="item flexrow">
           <button class="chat-card-button roll-initiative">Initiative (actuelle : {{initiative}} )</button>
+          <label class="item-field-label-short">&nbsp</label>
+          <label class="item-field-label-short">Monté?</label>
+          <input type="checkbox" name="system.combat.monte" {{checked system.combat.monte}} />
+          <label class="item-field-label-short">&nbsp</label>
+          <label class="item-field-label-medium">Défense totale?</label>
+          <input type="checkbox" name="system.combat.defensetotale" {{checked system.combat.defensetotale}} />
+        </li>
+        <li class="item flexrow">
+          <button class="chat-card-button roll-assommer">Assommer</button>
+          <button class="chat-card-button roll-coup-bas">Coup bas</button>
+          <button class="chat-card-button roll-immobiliser">Immobiliser</button>
+          <button class="chat-card-button roll-repousser">Repousser</button>
+          <button class="chat-card-button roll-desengager">Se désengager</button>
         </li>
       </ul>
 
@@ -275,11 +344,11 @@
 
               {{#if arme.system.isdefense}}
               <span class="item-field-label-short arme-defensif item-field-label-short"><label
-                  class="arme-defensif item-field-label-short">{{arme.system.totalDefensif}}</label></span>
+                  class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
               {{else}}
-              <span class="item-field-label-short arme-defensif"><label
-                  class="item-field-label-short arme-defensif">-</label></span>
-              {{/if}}
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
+                class="arme-defensif item-field-label-short defense-sheet">N/A</label></span>
+            {{/if}}
 
               <span class="item-field-label-short">
                 {{#if arme.system.equipped}}
@@ -291,10 +360,10 @@
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-equip" title="Worn">{{#if arme.system.equipped}}<i
+                <a class="item-control item-equip" title="Equipé">{{#if arme.system.equipped}}<i
                     class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-edit" title="Editer l' Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -312,7 +381,7 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="protection" title="Ajouter une arme"><i
                     class="fas fa-plus"></i></a>
               </div>
             </li>
@@ -325,8 +394,10 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-equip" title="Equipé">{{#if protection.system.equipped}}<i
+                  class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-edit" title="Editer l'Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -340,21 +411,21 @@
     <div class="tab equipement" data-group="primary" data-tab="equipement">
 
       <div class="flexcol">
-        
+
         <hr>
         <div class="sheet-box color-bg-archetype">
             <h4>
               <label class="argent-total-text">
                 Argent Total : {{richesse.po}} PO - {{richesse.pa}} PA - {{richesse.sc}} SC (total {{richesse.valueSC}} SC)
               </label>
-          </h4>  
+          </h4>
         </div>
-        
+
         <div class="sheet-box color-bg-archetype">
           <ul class="item-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header">
-                <h3><label class="items-title-text">Richesses et Argent</label></h3>  
+                <h3><label class="items-title-text">Richesses et Argent</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">Quantité</label>
@@ -362,7 +433,7 @@
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="monnaie" title="Ajouter une monnaie"><i
                     class="fas fa-plus"></i></a>
               </div>
             </li>
@@ -370,7 +441,7 @@
             <li class="item flexrow " data-item-id="{{monnaie._id}}" data-item-type="monnaie">
               <img class="item-name-img" src="{{monnaie.img}}" />
               <span class="item-name-label competence-name">{{monnaie.name}}</span>
-              <span class="item-name-label competence-name item-field-label-medium">{{monnaie.system.quantite}} 
+              <span class="item-name-label competence-name item-field-label-medium">{{monnaie.system.quantite}}
                 <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
                 <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
               </span>
@@ -390,7 +461,7 @@
               <label class="argent-total-text">
                 Valeur Total Equipement : {{valeurEquipement.po}} PO - {{valeurEquipement.pa}} PA - {{valeurEquipement.sc}} SC (total {{valeurEquipement.valueSC}} SC)
               </label>
-          </h4>  
+          </h4>
         </div>
 
         <div class="sheet-box color-bg-archetype">
@@ -406,7 +477,7 @@
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="equipement" title="Ajouter un équipement"><i
                     class="fas fa-plus"></i></a>
               </div>
             </li>
@@ -441,7 +512,7 @@
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                <a class="item-control item-add" data-type="artefact" title="Ajouter un artefact"><i
                     class="fas fa-plus"></i></a>
               </div>
             </li>
@@ -473,6 +544,7 @@
 
       <div>
         <ul class="item-list alternate-list">
+          {{#each historiques as |historique key|}}
           <li class="item flexrow" data-item-id="{{historique._id}}">
             <label class="generic-label">Historique : </label>
             <label class="generic-label">{{historique.name}}</label>
@@ -482,6 +554,7 @@
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
+          {{/each}}
           {{#each profils as |profil key|}}
           <li class="item flexrow" data-item-id="{{profil._id}}">
             <label class="generic-label">Profil : </label>
@@ -500,6 +573,12 @@
       <div class="grid grid-3col">
         <div>
           <ul>
+            <li class="flexrow item">
+              <label class="generic-label">Statut de résistant</label>
+              <select class="status-small-label color-class-common item-field-label-long" type="text" name="system.biodata.statutresistant" data-dtype="String">
+              {{selectOptions config.optionsStatutResistant selected=system.biodata.statutresistant valueAttr="key" nameAttr="key" labelAttr="label"}}
+              </select>
+            </li>
             <li class="flexrow item">
               <label class="generic-label">Sexe</label>
               <input type="text" class="" name="system.biodata.sex" value="{{system.biodata.sex}}"
@@ -549,9 +628,6 @@
       <span>
         <h3>Description</h3>
       </span>
-      <div class="medium-editor item-text-long-line">
-        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
-      </div>
 
     </div>
 

_deprecated/cellule-sheet.html

@@ -0,0 +1,385 @@
+<form class="{{cssClass}}" autocomplete="off">
+
+  {{!-- Sheet Header --}}
+  <header class="sheet-header">
+    <div class="header-fields background-sheet-header">
+      <div class="flexrow">
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        <div class="flexcol">
+          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+          <div class="flexrow">
+
+            <ul class="item-list alternate-list">
+
+              <li class="item flexrow">
+                <h4 class="item-name-label competence-name item-field-label-medium">Notoriété</h4>
+                <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                  name="system.notoriete" value="{{system.notoriete}}" data-dtype="Number" />
+
+                <h4 class="item-name-label competence-name item-field-label-long">Résistance</h4>
+                <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                  name="system.resistance" value="{{system.resistance}}" data-dtype="Number" />
+              </li>
+
+              <li class="item flexrow ">
+                <h4 class="item-name-label competence-name item-field-label-long">Développement</h4>
+                <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                  name="system.developpement" value="{{system.developpement}}" data-dtype="Number" />
+              </li>
+
+            </ul>
+          </div>
+
+        </div>
+      </div>
+  </header>
+
+  {{!-- Sheet Tab Navigation --}}
+  <nav class="sheet-tabs tabs" data-group="primary">
+    <a class="item" data-tab="talents">Membres&Talents</a>
+    <a class="item" data-tab="contacts">Contacts</a>
+    <a class="item" data-tab="ressources">Ressources</a>
+    <a class="item" data-tab="equipement">Equipement</a>
+    <a class="item" data-tab="biodata">Description</a>
+  </nav>
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{!-- Talents Tab --}}
+    <div class="tab talents" data-group="primary" data-tab="talents">
+
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Membres</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+            </li>
+            {{#each members as |membre key|}}
+            <li class="item flexrow " data-actor-id="{{membre.id}}" >
+              <img class="item-name-img" src="{{membre.img}}" />
+              <span class="item-name-label competence-name">{{membre.name}}</span>
+  
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control actor-edit" title="Edit Actor"><i class="fas fa-edit"></i></a>
+                <a class="item-control actor-delete" title="Delete Actor"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+                
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Talents de Cellule</label></h3>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Résumé</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each talents as |talent key|}}
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
+              <img class="item-name-img" src="{{talent.img}}" />
+              <span class="item-name-label competence-name">{{talent.name}}</span>
+              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
+  
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+    </div>
+
+    {{!-- Contacts Tab --}}
+    <div class="tab contacts" data-group="primary" data-tab="contacts">
+
+      <div class="flexrow">
+
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Contacts</label></h3>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Type</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Niveau</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+            </li>
+            {{#each contacts as |contact key|}}
+            <li class="item flexrow " data-item-id="{{contact._id}}" data-item-type="competence">
+              <img class="item-name-img" src="{{contact.img}}" />
+              <span class="item-name-label competence-name">{{contact.name}}</span>
+              <span class="item-name-label item-field-label-medium">{{upperFirst contact.system.contacttype}}</span>
+              <span class="item-name-label item-field-label-medium">{{contact.system.niveau}}</span>
+  
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+      </div>
+
+    </div>
+
+    {{!-- Ressources Tab --}}
+    <div class="tab ressources" data-group="primary" data-tab="ressources">
+
+      <div class="flexrow">
+
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Ressources</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+            </li>
+            {{#each ressources as |ressource key|}}
+            <li class="item flexrow " data-item-id="{{ressource._id}}" data-item-type="competence">
+              <img class="item-name-img" src="{{ressource.img}}" />
+              <span class="item-name-label competence-name">{{ressource.name}}</span>
+  
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+      </div>
+
+    </div>
+
+    {{!-- Equipement Tab --}}
+    <div class="tab equipement" data-group="primary" data-tab="equipement">
+
+      <div class="flexcol">
+        
+        <hr>
+        <div class="sheet-box color-bg-archetype">
+            <h4>
+              <label class="argent-total-text">
+                Argent Total : {{richesse.po}} PO - {{richesse.pa}} PA - {{richesse.sc}} SC (total {{richesse.valueSC}} SC)
+              </label>
+          </h4>  
+        </div>
+        
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Richesses et Argent</label></h3>  
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Quantité</label>
+              </span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="monnaie" title="Ajouter une monnaie"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each monnaies as |monnaie key|}}
+            <li class="item flexrow " data-item-id="{{monnaie._id}}" data-item-type="monnaie">
+              <img class="item-name-img" src="{{monnaie.img}}" />
+              <span class="item-name-label competence-name">{{monnaie.name}}</span>
+              <span class="item-name-label competence-name item-field-label-medium">{{monnaie.system.quantite}} 
+                <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
+                <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+        <hr>
+        <div class="sheet-box color-bg-archetype">
+            <h4>
+              <label class="argent-total-text">
+                Valeur Total Equipement : {{valeurEquipement.po}} PO - {{valeurEquipement.pa}} PA - {{valeurEquipement.sc}} SC (total {{valeurEquipement.valueSC}} SC)
+              </label>
+          </h4>  
+        </div>
+
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Equipements</label></h3>
+              </span>
+
+              <span class="item-field-label-short">
+                <label class="short-label">Quantité</label>
+              </span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="equipement" title="Ajouter un équipement"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each equipements as |equipement key|}}
+            <li class="item flexrow " data-item-id="{{equipement._id}}" data-item-type="equipement">
+              <img class="item-name-img" src="{{equipement.img}}" />
+              <span class="item-name-label competence-name">{{equipement.name}}</span>
+              <span class="item-name-label competence-name item-field-label-medium">{{equipement.system.quantite}}
+                <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
+                <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+        <div class="flexcol">
+
+          <div class="sheet-box color-bg-archetype">
+            <ul class="item-list alternate-list">
+              <li class="item flexrow list-item items-title-bg">
+                <span class="item-name-label-header">
+                  <h3><label class="items-title-text">Armes</label></h3>
+                </span>
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+              </li>
+              {{#each armes as |arme key|}}
+              <li class="item flexrow " data-item-id="{{arme._id}}" data-item-type="arme">
+                <img class="item-name-img" src="{{arme.img}}" />
+                <span class="item-name-label competence-name">{{arme.name}}</span>
+  
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-edit" title="Editer l' Item"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Supprimer l'Item"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          </div>
+  
+          <div class="sheet-box color-bg-archetype">
+            <ul class="item-list alternate-list">
+              <li class="item flexrow list-item items-title-bg">
+                <span class="item-name-label-header">
+                  <h3><label class="items-title-text">Protections</label></h3>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Protection</label>
+                </span>
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="protection" title="Ajouter une arme"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+              </li>
+              {{#each protections as |protection key|}}
+              <li class="item flexrow " data-item-id="{{protection._id}}" data-item-type="protection">
+                <img class="item-name-img" src="{{protection.img}}" />
+                <span class="item-name-label competence-name">{{protection.name}}</span>
+                <span class="item-field-label-short arme-defensif"><label
+                    class="arme-defensif">{{protection.system.protection}}</label>
+                </span>
+                <div class="item-filler">&nbsp;</div>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-edit" title="Editer l'Item"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Supprimer l'Item"><i class="fas fa-trash"></i></a>
+                </div>
+              </li>
+              {{/each}}
+            </ul>
+          </div>
+        </div>
+  
+        <div class="sheet-box color-bg-archetype">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Artefacts</label></h3>
+              </span>
+
+              <span class="item-field-label-short">
+                <label class="short-label">Quantité</label>
+              </span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="artefact" title="Ajouter un artefact"><i
+                    class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each artefacts as |artefact key|}}
+            <li class="item flexrow " data-item-id="{{artefact._id}}" data-item-type="artefact">
+              <img class="item-name-img" src="{{artefact.img}}" />
+              <span class="item-name-label competence-name">{{artefact.name}}</span>
+              <span class="item-name-label competence-name item-field-label-medium">{{artefact.system.quantite}}
+                <a class="quantity-modify plus-minus-button" data-quantite-value="-1">-</a>
+                <a class="quantity-modify plus-minus-button" data-quantite-value="+1">+</a>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
+      </div>
+
+    </div>
+
+    {{!-- Biography Tab --}}
+    <div class="tab biodata" data-group="primary" data-tab="biodata">
+      <span>
+        <h3>Description</h3>
+      </span>
+      <div class="medium-editor item-text-long-line">
+        {{editor description target="system.description" button=true owner=owner editable=editable}}
+      </div>
+
+    </div>
+
+  </section>
+</form>

_deprecated/chat-generic-result-v2.html

@@ -0,0 +1,254 @@
+<div class="hawkmoon-chat-result">
+  {{!-- Header avec acteur --}}
+  <div class="chat-result-header">
+    {{#if actorImg}}
+    <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+    {{/if}}
+    <div class="header-info">
+      <h4 class="actor-name">{{alias}}</h4>
+      {{#if competence}}
+      <div class="action-title">
+        <i class="fas fa-dice-d20"></i>
+        {{competence.name}}
+        {{#if arme}}• {{arme.name}}{{/if}}
+      </div>
+      {{else if actionImg}}
+      <div class="action-title">
+        <i class="fas fa-dice-d20"></i>
+        {{attr.label}}{{#if attr2}} + {{attr2.label}}{{/if}}
+      </div>
+      {{/if}}
+    </div>
+  </div>
+
+  {{!-- Résultat principal --}}
+  <div class="result-main">
+    <div class="result-display">
+      <div class="dice-result">
+        <i class="fas fa-dice"></i>
+        <span class="dice-value">{{diceResult}}</span>
+      </div>
+      <div class="total-result">
+        <span class="total-label">Total</span>
+        <span class="total-value">{{finalResult}}</span>
+      </div>
+      {{#if difficulte}}
+      <div class="difficulty">
+        <span class="difficulty-label">SD</span>
+        <span class="difficulty-value">{{difficulte}}</span>
+      </div>
+      {{/if}}
+    </div>
+
+    {{!-- Badge de résultat --}}
+    {{#if difficulte}}
+    <div class="result-badge-container">
+      {{#if isHeroique}}
+      <div class="result-badge heroique">
+        <i class="fas fa-star"></i> HÉROÏQUE !
+      </div>
+      {{else if isDramatique}}
+      <div class="result-badge dramatique">
+        <i class="fas fa-skull"></i> DRAMATIQUE !
+      </div>
+      {{else if isSuccess}}
+      <div class="result-badge success">
+        <i class="fas fa-check"></i> Succès
+      </div>
+      {{else}}
+      <div class="result-badge failure">
+        <i class="fas fa-times"></i> Échec
+      </div>
+      {{/if}}
+    </div>
+    {{/if}}
+  </div>
+
+  {{!-- Détails du jet --}}
+  <div class="result-details">
+    <div class="details-section">
+      <div class="detail-row">
+        <span class="detail-label">Formule:</span>
+        <span class="detail-value">{{diceFormula}}</span>
+      </div>
+
+      <div class="detail-row">
+        <span class="detail-label">{{attr.label}}:</span>
+        <span class="detail-value">{{attr.value}}</span>
+      </div>
+
+      {{#if attr2}}
+      <div class="detail-row">
+        <span class="detail-label">{{attr2.label}}:</span>
+        <span class="detail-value">{{attr2.value}}</span>
+      </div>
+      {{/if}}
+
+      {{#if competence}}
+      <div class="detail-row">
+        <span class="detail-label">{{competence.name}}:</span>
+        <span class="detail-value">{{competence.system.niveau}}</span>
+      </div>
+      {{/if}}
+
+      {{#if selectedMaitrise}}
+      <div class="detail-row">
+        <span class="detail-label">Maîtrise:</span>
+        <span class="detail-value">{{selectedMaitrise.name}}</span>
+      </div>
+      {{/if}}
+
+      {{#if arme}}
+      <div class="detail-row">
+        <span class="detail-label">Arme:</span>
+        <span class="detail-value">{{arme.name}} (+{{arme.system.bonusmaniementoff}})</span>
+      </div>
+      {{/if}}
+
+      {{#if bonusRoll}}
+      <div class="detail-row bonus">
+        <span class="detail-label">{{textBonus}}:</span>
+        <span class="detail-value">+{{bonusRoll.total}}</span>
+      </div>
+      {{/if}}
+    </div>
+  </div>
+
+  {{!-- Effets et conséquences --}}
+  {{#if isSuccess}}
+  <div class="result-effects">
+    {{#if attaqueDesarme}}
+    <div class="effect-item">
+      <i class="fas fa-hand-sparkles"></i>
+      {{#if isHeroique}}
+      Vous récupérez l'arme de votre adversaire dans votre main !
+      {{else}}
+      Vous désarmez votre adversaire ! Son arme tombe hors de sa portée.
+      {{/if}}
+    </div>
+    {{/if}}
+
+    {{#if immobiliser}}
+    <div class="effect-item">
+      <i class="fas fa-lock"></i>
+      {{#if isHeroique}}
+      Votre cible est immobilisée, et vous pouvez faire une action complexe.
+      {{else}}
+      Votre cible est immobilisée.
+      {{/if}}
+    </div>
+    {{/if}}
+
+    {{#if desengager}}
+    <div class="effect-item">
+      <i class="fas fa-running"></i>
+      Vous vous désengagez de votre adversaire.
+    </div>
+    {{/if}}
+
+    {{#if repousser}}
+    <div class="effect-item">
+      <i class="fas fa-hand-rock"></i>
+      {{#if isHeroique}}
+      Votre cible est repoussée de 3 mètres et tombe au sol.
+      {{else}}
+      Votre cible tombe au sol.
+      {{/if}}
+    </div>
+    {{/if}}
+
+    {{#if assomer}}
+    <div class="effect-item">
+      <i class="fas fa-dizzy"></i>
+      {{#if isHeroique}}
+      Votre cible est assomée pour [[/r 1d10+10]] minutes.
+      {{else}}
+      Votre cible est assomée pour [[/r 1d10]] minutes.
+      {{/if}}
+    </div>
+    {{/if}}
+
+    {{#if coupBas}}
+    <div class="effect-item">
+      <i class="fas fa-shoe-prints"></i>
+      La cible a reçu 2 adversités bleues et a perdu 1 niveau de combativité.
+      {{#if isHeroique}}
+      <br><strong>Et votre cible perd sa prochaine action complexe.</strong>
+      {{/if}}
+    </div>
+    {{/if}}
+
+    {{#if arme}}
+      {{#if contenir}}
+      <div class="effect-item">
+        <i class="fas fa-shield-alt"></i>
+        {{#if isHeroique}}
+        Aucun dégât, mais tous les adversaires dont le SD + 10 est atteint ne peuvent déclarer d'attaque contre vous lors de leur prochaine action complexe.
+        {{else}}
+        Aucun dégât, mais la cible ne peut pas déclarer d'attaque contre vous lors de sa prochaine action complexe.
+        {{/if}}
+      </div>
+      {{else}}
+        {{#if (eq nbCombativitePerdu "vaincu")}}
+        <div class="effect-item victory">
+          <i class="fas fa-trophy"></i>
+          <strong>Votre adversaire est vaincu !</strong>
+        </div>
+        {{else}}
+        <div class="effect-item">
+          <i class="fas fa-heart-broken"></i>
+          Votre adversaire a perdu {{nbCombativitePerdu}} État de Combativité.
+        </div>
+        {{/if}}
+
+        {{#if (not arme.system.onlevelonly)}}
+        <div class="damage-buttons">
+          <button class="chat-card-button roll-chat-degat">
+            <i class="fas fa-burst"></i> Dégâts de l'arme
+          </button>
+          {{#if coupDevastateur}}
+          <button class="chat-card-button roll-chat-degat-devastateur">
+            <i class="fas fa-explosion"></i> Dégâts avec Coup Dévastateur
+          </button>
+          {{/if}}
+        </div>
+        {{/if}}
+      {{/if}}
+    {{/if}}
+  </div>
+  {{/if}}
+
+  {{!-- Avertissements --}}
+  {{#if attaqueCharge}}
+  <div class="result-warning">
+    <i class="fas fa-exclamation-triangle"></i>
+    Vous avez chargé : vos adversaires bénéficient de +3 pour vous attaquer.
+  </div>
+  {{/if}}
+
+  {{#if desengager}}
+    {{#if (not isSuccess)}}
+    <div class="result-warning">
+      <i class="fas fa-exclamation-triangle"></i>
+      Vous ne parvenez pas à vous désengager, votre adversaire a un bonus de +3 pour vous attaquer.
+    </div>
+    {{/if}}
+  {{/if}}
+
+  {{#if isInit}}
+  <div class="result-info">
+    <i class="fas fa-flag"></i> Initiative stockée !
+  </div>
+  {{/if}}
+
+  {{!-- Prédilections --}}
+  {{#each predilections as |pred key|}}
+    {{#if (and (and pred.acquise (not pred.maitrise)) (not pred.used))}}
+    <div class="predilection-section">
+      <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">
+        <i class="fas fa-redo"></i> Prédilection : {{pred.name}}
+      </button>
+    </div>
+    {{/if}}
+  {{/each}}
+</div>

_deprecated/competences-creatures.db

@@ -0,0 +1,8 @@
+{"name":"Mêlée","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">M&ecirc;l&eacute;e repr&eacute;sente la ma&icirc;trise martiale et l&rsquo;habilet&eacute; au combat rapproch&eacute;, avec ou sans arme. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage est &agrave; m&ecirc;me de passer la garde de ses adversaires en combat au corps-&agrave;-corps.</p>","niveau":0,"attribut1":"pui","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Armes à une main (Puissance)","used":false,"description":"Pour utiliser des armes comme l’épée courte, la hache, une arme improvisée à une main, etc.\n\n"},{"name":"Armes à deux mains (Puissance)","used":false,"description":"Pour utiliser des armes comme la hache nordaine ou l’épée arthurienne, une arme improvisée à deux mains, etc."},{"name":"Mains nues (Puissance)","used":false,"description":"Pour se battre à mains nues, qu’il s’agisse d’une bagarre ou d’un pugilat codifié."}],"predilections[0]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.VM3TSQYxseYdCFjv"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645643952,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"0nhTxujlIUB63Aqt"}
+{"name":"Discrétion","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Discr&eacute;tion repr&eacute;sente la capacit&eacute; &agrave; ne pas se faire remarquer, qu&rsquo;il s&rsquo;agisse de se fondre dans la foule, de prendre l'apparence de quelqu&rsquo;un d&rsquo;autre, de se cacher dans l&rsquo;ombre ou encore de se d&eacute;placer en silence. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage est apte &agrave; passer<br>physiquement inaper&ccedil;u.</p>","niveau":0,"attribut1":"adr","attribut2":"tre","attribut3":"none","doublebonus":false,"predilections":[{"name":"Cacher et se cacher (Trempe)","used":false,"description":"Pour se fondre dans le décor. Le personnage adopte un comportement décontracté qui le fait passer inaperçu, il trouve une cachette, etc. Permet également de dissimuler un objet sur soi (qu’il s’agisse d’une bourse, d’une arme, d’un tatouage, etc.).\n\n"},{"name":"Déguisement (Trempe)","used":false,"description":"Pour dissimuler son identité, altérer ses traits ou prendre ceux d'une personne spécifique."},{"name":"Déplacement silencieux (Adresse)","used":false,"description":"Pour se déplacer sans éveiller l’attention lorsqu’on ne peut être vu (dans l’obscurité ou à couvert, lorsqu’un garde est derrière une porte ou un angle\nde mur, etc.)."}]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.gBmAdYl4rhbY89ee"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645638028,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"J4x6SP6l6njOrZn3"}
+{"name":"Armes à distance","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Repr&eacute;sente l&rsquo;habilet&eacute; au lancer ou avec une arme &agrave; distance. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus les tirs du personnage sont pr&eacute;cis.&nbsp;</p>\n<p style=\"text-align: justify;\">&nbsp;</p>\n<p style=\"text-align: justify;\">&nbsp;</p>\n<p style=\"text-align: justify;\">&nbsp;</p>","niveau":0,"attribut1":"adr","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Armes à feu (Adresse)  ","used":false,"description":"Pour des armes comme le lance-feu. "},{"name":"Armes à projectile (Adresse)","used":false,"description":"Pour des armes comme l'arc, la fronde, l'arbalète, etc."},{"name":"Armes de jet (Adresse)","used":false,"description":"Pour des armes comme la dague de lancer, la bombe à mèche, le javelot, les projectiles improvisés, etc. "}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.MLMlscPBb1ZCPTRl"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666619959067,"modifiedTime":1671645649970,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"UfVYwmPFwy2T7jZM"}
+{"name":"Survie","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Survie repr&eacute;sente la capacit&eacute; &agrave; trouver de quoi subsister dans la nature, &agrave; &eacute;tablir un campement, &agrave; faire du feu avec les moyens du bord, &agrave; se rep&eacute;rer. Avec Clairvoyance, cette Comp&eacute;tence permet de trouver des baies comestibles, de poser tous les types de pi&egrave;ges, de pister, de trouver le meilleur emplacement pour un campement. Avec Adresse, elle permet de chasser, de p&ecirc;cher, de faire du feu dans des conditions difficiles et de confectionner les pi&egrave;ges les plus simples (collets, fosses, etc.).</p>\n<p style=\"text-align: justify;\">Les Pr&eacute;dilections repr&eacute;sentent quant &agrave; elles les diff&eacute;rents milieux ou climats.</p>","niveau":0,"attribut1":"adr","attribut2":"cla","attribut3":"none","doublebonus":false,"predilections":[{"name":"Fleuve, Forêt, Hiver, Mer, Montagne, Souterrains, etc. (Adresse ou Clairvoyance)","used":false,"description":"En fonction de chaque milieu, la Prédilection permet d’y évoluer de la façon la plus adaptée."}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""],"predilections[3]":["Nouvelle prédilection",""],"predilections[4]":["Nouvelle prédilection",""],"predilections[5]":["Nouvelle prédilection",""],"predilections[6]":["Nouvelle prédilection",""],"predilections[7]":["Nouvelle prédilection",""],"predilections[8]":["Nouvelle prédilection",""],"predilections[9]":["Nouvelle prédilection",""],"predilections[10]":["Nouvelle prédilection",""],"predilections[11]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.yI1zY5k8mAdx9wHK"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645647913,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"Vpth0atT9qS6VqUB"}
+{"name":"Perception","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Perception repr&eacute;sente &agrave; la fois la conscience de son environnement, la capacit&eacute; &agrave; remarquer les d&eacute;tails incongrus, et l&rsquo;aptitude &agrave; lire le langage corporel. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus les sens du personnage sont aff&ucirc;t&eacute;s.</p>","niveau":0,"attribut1":"cla","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Empathie (Clairvoyance)","used":false,"description":"Pour déchiffrer, par son attitude ou ses gestes, l’opinion ou la sincérité d’un interlocuteur, pour deviner les choses exprimées à mots couverts, pour comprendre quelqu’un qui s’exprime par signes."},{"name":"Recherche (Clairvoyance)","used":false,"description":"Pour remarquer les détails les plus infimes, pour trouver un objet ou un passage dissimulés."},{"name":"Vigilance (Clairvoyance) ","used":false,"description":"Pour détecter un personnage ou un animal qui se cache, pour remarquer une menace potentielle (piège, terrain dangereux, tireur embusqué), pour rester attentif lors d’un tour de garde."}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""],"predilections[3]":["Nouvelle prédilection",""],"predilections[4]":["Nouvelle prédilection",""],"predilections[5]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.7p2MTjttE4fllp9e"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645646434,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"cunjmZoXNhSX5qdV"}
+{"name":"Coercition","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Coercition repr&eacute;sente la capacit&eacute; de forcer quelqu&rsquo;un &agrave; agir contre son gr&eacute;, &agrave; r&eacute;v&eacute;ler des secrets ou &agrave; ob&eacute;ir aveugl&eacute;ment. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage sait se montrer intimidant et jouer sur l&rsquo;autorit&eacute; qu&rsquo;il inspire pour briser la volont&eacute; de ses interlocuteurs.</p>","niveau":0,"attribut1":"pre","attribut2":"none","attribut3":"none","doublebonus":false,"predilections":[{"name":"Commandement (Présence) ","used":false,"description":"Pour donner des ordres auxquels on obéira sans poser de question. "},{"name":"Interrogatoire (Présence)","used":false,"description":"Pour forcer quelqu'un à révéler des informations, que ce soit par la torture ou à l'aide de techniques de manipulation plus subtiles. "},{"name":"Intimidation (Présence)","used":false,"description":"Pour faire peur, pour convaincre quelqu'un de renoncer à se battre, pour donner l'impression d'être dangereux. "}]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.15IDGG6JoZnRCQtY"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620317429,"modifiedTime":1671645635525,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"lchi2ulzWdm8j1l7"}
+{"name":"Nage","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Nage repr&eacute;sente la vitesse (Adresse), mais aussi l&rsquo;endurance du nageur (Puissance). La natation est une Comp&eacute;tence assez rare dans le monde de Hawkmoon. Un personnage qui n&rsquo;a plus pied et ne sait pas nager commence &agrave; se noyer au bout d&rsquo;un tour de jeu (soit six secondes). Reportez-vous &agrave; la r&egrave;gle de noyade p. 214.</p>\n<p style=\"text-align: justify;\">&nbsp;</p>\n<h3 style=\"text-align: justify;\"><strong>Pr&eacute;dilections/Ma&icirc;trises</strong></h3>\n<ul>\n<li style=\"text-align: justify;\"><strong>Au choix du joueur et du MJ.</strong></li>\n</ul>","niveau":0,"attribut1":"adr","attribut2":"pui","attribut3":"none","doublebonus":false,"predilections":[],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""],"predilections[3]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.Dw7q0dGCoaBy1Smu"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645639961,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"pyeEZFo46NTnV8WK"}
+{"name":"Mouvements","type":"competence","img":"systems/fvtt-hawkmoon-cyd/assets/icons/competence.webp","system":{"description":"<p style=\"text-align: justify;\">Mouvements indique la capacit&eacute; du personnage &agrave; se d&eacute;placer rapidement et longtemps. Cette Comp&eacute;tence repr&eacute;sente aussi bien la souplesse et la vivacit&eacute; des gestes que l&rsquo;endurance physique et la r&eacute;sistance &agrave; l&rsquo;effort. Plus cette Comp&eacute;tence est &eacute;lev&eacute;e, plus le personnage est en forme et peut courir, grimper ou sauter longtemps et rapidement sans se fatiguer.</p>","niveau":0,"attribut1":"adr","attribut2":"pui","attribut3":"none","doublebonus":false,"predilections":[{"name":"Acrobaties (Adresse)","used":true,"description":"Pour faire des figures acrobatiques, sauter en hauteur ou en longueur, jongler, ou encore pour rattraper un objet fragile sans l’abîmer (ou un ustensile dangereux sans se blesser).\n\n"},{"name":"Course (Puissance)","used":false,"description":"Pour sprinter ou pour tenir la distance dans une course d’endurance."},{"name":"Escalade (Puissance) ","used":false,"description":"Pour escalader murs, arbres, etc. Sert également à avancer en étant suspendu à une corde horizontale."}],"predilections[0]":["Nouvelle prédilection",""],"predilections[1]":["Nouvelle prédilection",""],"predilections[2]":["Nouvelle prédilection",""]},"effects":[],"ownership":{"default":0,"8b7NkRYwYKm5eOMy":3,"wYQCdPQVeRKBJmZI":3},"flags":{"core":{"sourceId":"Compendium.fvtt-hawkmoon-cyd.skills.bP7pPSCekexUEf7m"}},"_stats":{"systemId":"fvtt-hawkmoon-cyd","systemVersion":"10.1.7","coreVersion":"10.291","createdTime":1666620807186,"modifiedTime":1671645642114,"lastModifiedBy":"wYQCdPQVeRKBJmZI"},"folder":null,"sort":0,"_id":"tFU5yISK6spdNWco"}

_deprecated/creature-sheet.html

@@ -48,9 +48,7 @@
                   class="roll-attribut">{{attr.label}}</a></span>
               <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                 name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="Number">
-                {{#select attr.value}}
-                {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
-                {{/select}}
+                {{selectOptions @root.config.listeNiveauCreature selected=attr.value}}
               </select>
             </li>
             {{/each}}
@@ -58,29 +56,30 @@
               <img class="item-name-img" src="systems/fvtt-hawkmoon-cyd/assets/icons/vitesse.webp">
               <span class="item-name-label competence-name item-field-label-medium">Vitesse</span>
               <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
-                    value="{{system.vitesse.value}}" data-dtype="Number" />
+                value="{{system.vitesse.value}}" data-dtype="Number" />
             </li>
           </ul>
           <h4 class="item-name-label competence-name">Santé</h4>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <label class="label-name item-field-label-short">Vigueur</label>
-              <label class="label-name item-field-label-short">{{system.sante.vigueur}}</label>
+              <label class="label-name item-field-label-medium">Vigueur</label>
+              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number"
+                name="system.sante.vigueur" value="{{system.sante.vigueur}}">
             </li>
             <li class="item  flexrow">
-              <label class="label-name item-field-label-short">Etat</label>
-              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat" value="{{system.sante.etat}}" data-dtype="Number">
-                {{#select system.sante.etat}}
-                {{> systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html}}
-                {{/select}}
+              <label class="label-name item-field-label-medium">Etat</label>
+              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat"
+                value="{{system.sante.etat}}" data-dtype="Number">
+                {{selectOptions combativiteList selected=system.sante.etat valueAttr="value" nameAttr="value" labelAttr="label"}}
               </select>
             </li>
+
           </ul>
 
           <h4 class="item-name-label competence-name">Combat</h4>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <button class="chat-card-button roll-initiative">Initiative</button>
+              <button class="chat-card-button roll-initiative">Initiative (actuelle : {{initiative}} )</button>
             </li>
           </ul>
 
@@ -103,14 +102,33 @@
             </li>
             {{/each}}
           </ul>
-
-          <h4 class="item-name-label competence-name">Vitesse</h4>
           <ul class="item-list alternate-list">
-            <li class="item flexrow" data-adversite="{{key}}">
-              <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
-                value="{{system.vitesse.value}}" data-dtype="Number" />      
+            <li class="item  flexrow">
+              <label class="label-name item-field-label-long1">Niveaux de combativité</label>
+              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number"
+                name="system.sante.nbcombativite" value="{{system.sante.nbcombativite}}">
             </li>
           </ul>
+          <ul class="item-list alternate-list">
+            
+          <li class="item flexrow">
+            <label class="item-field-label-short">Monté?</label>
+            <input type="checkbox" name="system.combat.monte" {{checked system.combat.monte}} />
+            <label class="item-field-label-short">&nbsp</label>
+            <label class="item-field-label-medium">Défense totale?</label>
+            <input type="checkbox" name="system.combat.defensetotale" {{checked system.combat.defensetotale}} />
+          </li>
+          <li class="item flexrow">
+            <button class="chat-card-button roll-assommer">Assommer</button>
+            <button class="chat-card-button roll-coup-bas">Coup bas</button>
+            <button class="chat-card-button roll-immobiliser">Immobiliser</button>
+          </li>
+          <li class="item flexrow">
+            <button class="chat-card-button roll-repousser">Repousser</button>
+            <button class="chat-card-button roll-desengager">Se désengager</button>
+          </li>
+          </ul>
+  
 
 
         </div>
@@ -138,26 +156,37 @@
             {{#each skills as |skill key|}}
             <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
               <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
+
+              <div class="flexcol item-name-label">
+
+                <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
                   data-attr-key="tochoose">{{skill.name}}</a></span>
+
+                    <span class="predilection-text">
+                    {{#each skill.system.predilections as |pred key|}}
+                      {{#if (and pred.acquise (not pred.used))}}
+                        {{pred.name}},
+                      {{/if}} 
+                    {{/each}}
+                  </span>
+              </div>
+
               <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                 data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
-                {{#select skill.system.niveau}}
-                  {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
-                {{/select}}
+                {{selectOptions @root.config.listeNiveauCreature selected=skill.system.niveau}}
               </select>
 
               {{#if (ne skill.system.attribut1 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
-                  skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
+                skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
               {{/if}}
               {{#if (ne skill.system.attribut2 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
-                  skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
+                skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
               {{/if}}
               {{#if (ne skill.system.attribut3 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
-                  skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
+                skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
               {{/if}}
 
               <div class="item-filler">&nbsp;</div>
@@ -189,13 +218,17 @@
                 <label class="short-label">Résumé</label>
               </span>
               <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
             </li>
             {{#each talents as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
               <img class="item-name-img" src="{{talent.img}}" />
               <span class="item-name-label competence-name">{{talent.name}}</span>
               <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
-  
+
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -218,9 +251,13 @@
                 <label class="short-label">Résumé</label>
               </span>
               <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
             </li>
             {{#each talentsCell as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
               <img class="item-name-img" src="{{talent.img}}" />
               <span class="item-name-label competence-name">{{talent.name}}</span>
               <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
@@ -278,9 +315,10 @@
 
               {{#if arme.system.isdefense}}
               <span class="item-field-label-short arme-defensif item-field-label-short"><label
-                  class="arme-defensif item-field-label-short">{{arme.system.totalDefensif}}</label></span>
+                  class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
               {{else}}
-              <span class="item-field-label-short arme-defensif"><label class="item-field-label-short arme-defensif">-</label></span>
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
+                  class="arme-defensif item-field-label-short defense-sheet">N/A</label></span>
               {{/if}}
 
               <span class="item-field-label-short">
@@ -293,10 +331,10 @@
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-equip" title="Worn">{{#if arme.system.equipped}}<i
+                <a class="item-control item-equip" title="Equipé">{{#if arme.system.equipped}}<i
                     class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-edit" title="Editer l'Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -313,8 +351,8 @@
                 <label class="short-label">Protection</label>
               </span>
               <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="arme" title="Ajouter une arme"><i
+              <div class="item-controls item-controls-fixed">                
+                <a class="item-control item-add" data-type="protection" title="Ajouter une arme"><i
                     class="fas fa-plus"></i></a>
               </div>
             </li>
@@ -327,8 +365,10 @@
               </span>
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-equip" title="Equipé">{{#if protection.system.equipped}}<i
+                  class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-edit" title="Editer l'Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Supprimer l'Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}

_deprecated/hawkmoon-actor-sheet.js

@@ -3,16 +3,16 @@
  * @extends {ActorSheet}
  */
 
-import { HawkmoonUtility } from "./hawkmoon-utility.js";
-import { HawkmoonAutomation } from "./hawkmoon-automation.js";
+import { HawkmoonUtility } from "../modules/hawkmoon-utility.js";
+import { HawkmoonAutomation } from "../modules/hawkmoon-automation.js";
 
 /* -------------------------------------------- */
-export class HawkmoonActorSheet extends ActorSheet {
+export class HawkmoonActorSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
       template: "systems/fvtt-hawkmoon-cyd/templates/actor-sheet.html",
       width: 640,
@@ -25,7 +25,7 @@ export class HawkmoonActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)    
+    const objectData = foundry.utils.duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -36,33 +36,37 @@ export class HawkmoonActorSheet extends ActorSheet {
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
       system: objectData.system,
+      systemFields: this.document.system.schema.fields,
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
       skills: this.actor.getSkills(),
-      armes: duplicate(this.actor.getWeapons()),
-      monnaies: duplicate(this.actor.getMonnaies()),
-      protections: duplicate(this.actor.getArmors()),
-      historique: duplicate(this.actor.getHistorique() || {}),
-      talents: duplicate(this.actor.getTalents() || {}),
+      armes: foundry.utils.duplicate(this.actor.getWeapons()),
+      monnaies: foundry.utils.duplicate(this.actor.getMonnaies()),
+      protections: foundry.utils.duplicate(this.actor.getArmors()),
+      historiques: foundry.utils.duplicate(this.actor.getHistoriques() || []),
+      talents: foundry.utils.duplicate(this.actor.getTalents() || []),
+      mutations: foundry.utils.duplicate(this.actor.getMutations() || []),
       talentsCell: this.getCelluleTalents(),
-      profils: duplicate(this.actor.getProfils()  || {}),
-      combat: this.actor.getCombatValues(),      
-      equipements: duplicate(this.actor.getEquipments()),
-      artefacts: duplicate(this.actor.getArtefacts()),
-      monnaies: duplicate(this.actor.getMonnaies()),
+      profils: foundry.utils.duplicate(this.actor.getProfils()  || []),
+      combat: this.actor.getCombatValues(),
+      equipements: foundry.utils.duplicate(this.actor.getEquipments()),
+      artefacts: foundry.utils.duplicate(this.actor.getArtefacts()),
       richesse: this.actor.computeRichesse(),
+      coupDevastateur: this.actor.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup devastateur" && !it.system.used),
       valeurEquipement: this.actor.computeValeurEquipement(),
+      nbCombativite: this.actor.system.sante.nbcombativite,
+      combativiteList: HawkmoonUtility.getCombativiteList(this.actor.system.sante.nbcombativite),
       initiative: this.actor.getFlag("world", "last-initiative") || -1,
-      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
-      habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
+      enrichedDescription: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, {async: true}),
+      habitat: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.habitat, {async: true}),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      config: game.system.hawkmoon.config
     }
     this.formData = formData;
 
-    console.log("PC : ", formData, this.object);
     return formData;
   }
 
@@ -87,14 +91,14 @@ export class HawkmoonActorSheet extends ActorSheet {
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
-    
+
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
       let itemId = li.data("item-id")
       const item = this.actor.items.get( itemId )
       item.sheet.render(true)
-    })      
+    })
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
@@ -116,7 +120,7 @@ export class HawkmoonActorSheet extends ActorSheet {
       let value = Number($(event.currentTarget).data("adversite-value"))
       this.actor.incDecAdversite(adv, value)
     })
-    
+
     html.find('.quantity-modify').click(event => {
       const li = $(event.currentTarget).parents(".item")
       const value = Number($(event.currentTarget).data("quantite-value"))
@@ -124,9 +128,9 @@ export class HawkmoonActorSheet extends ActorSheet {
     })
 
     html.find('.roll-initiative').click((event) => {
-      this.actor.rollAttribut("pre", true)
+      this.actor.rollAttribut("adr", true)
     })
-    
+
     html.find('.roll-attribut').click((event) => {
       const li = $(event.currentTarget).parents(".item")
       let attrKey = li.data("attr-key")
@@ -143,25 +147,46 @@ export class HawkmoonActorSheet extends ActorSheet {
       let armeId  = li.data("item-id")
       this.actor.rollArmeOffensif(armeId)
     })
+
+    html.find('.roll-assommer').click((event) => {
+      this.actor.rollAssommer()
+    })
+    html.find('.roll-coup-bas').click((event) => {
+      this.actor.rollCoupBas()
+    })
+    html.find('.roll-immobiliser').click((event) => {
+      this.actor.rollImmobiliser()
+    })
+    html.find('.roll-repousser').click((event) => {
+      this.actor.rollRepousser()
+    })
+    html.find('.roll-desengager').click((event) => {
+      this.actor.rollDesengager()
+    })
+
     html.find('.roll-arme-degats').click((event) => {
       const li = $(event.currentTarget).parents(".item")
       let armeId  = li.data("item-id")
       this.actor.rollArmeDegats(armeId)
     })
-        
-    
+
+    html.find('.item-add').click((event) => {
+      const itemType = $(event.currentTarget).data("type")
+      this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
+    })
+
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);
-    });    
+    });
     html.find('.item-equip').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.equipItem( li.data("item-id") );
-      this.render(true);      
+      this.render(true);
     });
 
   }
-  
+
   /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {

_deprecated/hawkmoon-cellule-sheet.js

@@ -3,19 +3,19 @@
  * @extends {ActorSheet}
  */
 
-import { HawkmoonUtility } from "./hawkmoon-utility.js";
-import { HawkmoonAutomation } from "./hawkmoon-automation.js";
+import { HawkmoonUtility } from "../modules/hawkmoon-utility.js";
+import { HawkmoonAutomation } from "../modules/hawkmoon-automation.js";
 
 /* -------------------------------------------- */
-const __ALLOWED_ITEM_CELLULE = { "talent": 1, "ressource": 1, "contact": 1}
+const __ALLOWED_ITEM_CELLULE = { "talent": 1, "ressource": 1, "contact": 1, "equipement": 1, "protection": 1, "artefact": 1, "arme": 1, "monnaie": 1 }
 
 /* -------------------------------------------- */
-export class HawkmoonCelluleSheet extends ActorSheet {
+export class HawkmoonCelluleSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
       template: "systems/fvtt-hawkmoon-cyd/templates/cellule-sheet.html",
       width: 640,
@@ -28,7 +28,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)
+    const objectData = foundry.utils.duplicate(this.object)
 
     let formData = {
       title: this.title,
@@ -41,15 +41,23 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       system: objectData.system,
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
-      talents: duplicate(this.actor.getTalents() || {}),
-      ressources: duplicate(this.actor.getRessources()),
-      contacts: duplicate(this.actor.getContacts()),
+      talents: foundry.utils.duplicate(this.actor.getTalents() || {}),
+      ressources: foundry.utils.duplicate(this.actor.getRessources()),
+      contacts: foundry.utils.duplicate(this.actor.getContacts()),
       members: this.getMembers(),
+      equipements: foundry.utils.duplicate(this.actor.getEquipments()),
+      artefacts: foundry.utils.duplicate(this.actor.getArtefacts()),
+      armes: foundry.utils.duplicate(this.actor.getWeapons()),
+      monnaies: foundry.utils.duplicate(this.actor.getMonnaies()),
+      protections: foundry.utils.duplicate(this.actor.getArmors()),
+      richesse: this.actor.computeRichesse(),
+      valeurEquipement: this.actor.computeValeurEquipement(),
       description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      config: game.system.hawkmoon.config
     }
     this.formData = formData;
 
@@ -87,7 +95,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       let actorId = li.data("actor-id")
       this.actor.removeMember(actorId)
     })
-    
+
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
@@ -109,15 +117,15 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       let value = ev.currentTarget.value
       this.actor.editItemField(itemId, itemType, itemField, dataType, value)
     })
-
-    html.find('.quantity-minus').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.incDecQuantity(li.data("item-id"), -1);
-    });
-    html.find('.quantity-plus').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.incDecQuantity(li.data("item-id"), +1);
-    });
+    html.find('.quantity-modify').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      const value = Number($(event.currentTarget).data("quantite-value"))
+      this.actor.incDecQuantity( li.data("item-id"), value );
+    })
+    html.find('.item-add').click((event) => {
+      const itemType = $(event.currentTarget).data("type")
+      this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
+    })
 
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
@@ -128,7 +136,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
   /* -------------------------------------------- */
   async _onDropActor(event, dragData) {
     const actor = fromUuidSync(dragData.uuid)
-    if (actor) { 
+    if (actor) {
       this.actor.addMember(actor.id)
     } else {
       ui.notifications.warn("Cet acteur n'a pas été trouvé.")
@@ -148,7 +156,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
       super._onDropItem(event, dragData)
       return
     }
-    ui.notifications("Ce type d'item n'est pas autorisé sur une Cellule.")
+    ui.notification.info("Ce type d'item n'est pas autorisé sur une Cellule.")
   }
 
 

_deprecated/hawkmoon-creature-sheet.js

@@ -4,8 +4,8 @@
  */
 
  import { HawkmoonActorSheet } from "./hawkmoon-actor-sheet.js";
-import { HawkmoonUtility } from "./hawkmoon-utility.js";
-import { HawkmoonAutomation } from "./hawkmoon-automation.js";
+import { HawkmoonUtility } from "../modules/hawkmoon-utility.js";
+import { HawkmoonAutomation } from "../modules/hawkmoon-automation.js";
 
 /* -------------------------------------------- */
 export class HawkmoonCreatureSheet extends HawkmoonActorSheet {
@@ -13,7 +13,7 @@ export class HawkmoonCreatureSheet extends HawkmoonActorSheet {
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
       template: "systems/fvtt-hawkmoon-cyd/templates/creature-sheet.html",
       width: 640,

_deprecated/hawkmoon-item-sheet.js

@@ -4,12 +4,12 @@ import { HawkmoonUtility } from "./hawkmoon-utility.js";
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
  */
-export class HawkmoonItemSheet extends ItemSheet {
+export class HawkmoonItemSheet extends foundry.appv1.sheets.ItemSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-hawkmoon-cyd", "sheet", "item"],
       template: "systems/fvtt-hawkmoon-cyd/templates/item-sheet.html",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
@@ -48,7 +48,7 @@ export class HawkmoonItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = duplicate(this.object)
+    const objectData = foundry.utils.duplicate(this.object)
     let formData = {
       title: this.title,
       id: this.id,
@@ -64,7 +64,8 @@ export class HawkmoonItemSheet extends ItemSheet {
       owner: this.document.isOwner,
       description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
       mr: (this.object.type == 'specialisation'),
-      isGM: game.user.isGM
+      isGM: game.user.isGM,
+      config: game.system.hawkmoon.config
     }
 
     if (  objectData.type == "don") {
@@ -89,7 +90,7 @@ export class HawkmoonItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = duplicate(HawkmoonUtility.data(this.item));
+    let chatData = foundry.utils.duplicate(HawkmoonUtility.data(this.item));
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }
@@ -132,7 +133,7 @@ export class HawkmoonItemSheet extends ItemSheet {
     html.find('.edit-predilection').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred[index].name = ev.currentTarget.value
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
@@ -140,70 +141,70 @@ export class HawkmoonItemSheet extends ItemSheet {
     html.find('.edit-predilection-description').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred[index].description = ev.currentTarget.value
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })    
+    })
     html.find('.predilection-acquise').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred[index].acquise = ev.currentTarget.checked
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })          
+    })
     html.find('.predilection-maitrise').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred[index].maitrise = ev.currentTarget.checked
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })      
+    })
     html.find('.predilection-used').change(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred[index].used = ev.currentTarget.checked
       pred[index].id = pred[index].id || randomID(16)
       this.object.update( { 'system.predilections': pred })
-    })    
-    
+    })
+
     html.find('#add-predilection').click(ev => {
-      let pred = duplicate(this.object.system.predilections)
-      pred.push( { name: "Nouvelle prédilection", id: randomID(16), used: false }) 
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
+      pred.push( { name: "Nouvelle prédilection", id: randomID(16), used: false })
       this.object.update( { 'system.predilections': pred })
     })
     html.find('.delete-prediction').click(ev => {
       const li = $(ev.currentTarget).parents(".prediction-item")
       let index = li.data("prediction-index")
-      let pred = duplicate(this.object.system.predilections)
+      let pred = foundry.utils.duplicate(this.object.system.predilections)
       pred.splice(index,1)
       this.object.update( { 'system.predilections': pred })
     })
 
     html.find('#add-automation').click(ev => {
-      let autom = duplicate(this.object.system.automations)
-      autom.push( { eventtype: "on-drop", name: "Automatisation 1", competence: "", minLevel: 0, id: randomID(16) }) 
+      let autom = foundry.utils.duplicate(this.object.system.automations)
+      autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) })
       this.object.update( { 'system.automations': autom })
     })
     html.find('.delete-automation').click(ev => {
       const li = $(ev.currentTarget).parents(".automation-item")
       let index = li.data("automation-index")
-      let autom = duplicate(this.object.system.automations)
+      let autom = foundry.utils.duplicate(this.object.system.automations)
       autom.splice(index,1)
       this.object.update( { 'system.automations': autom })
     })
     html.find('.automation-edit-field').change(ev => {
       let index = $(ev.currentTarget).data("automation-index")
       let field = $(ev.currentTarget).data("automation-field")
-      let auto = duplicate(this.object.system.automations)
+      let auto = foundry.utils.duplicate(this.object.system.automations)
       auto[index][field] = ev.currentTarget.value
       auto[index].id = auto[index].id || randomID(16)
       this.object.update( { 'system.automations': auto })
-    })    
-    
+    })
+
     // Update Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");

_deprecated/hawkmoon-roll-dialog.js

@@ -0,0 +1,143 @@
+import { HawkmoonUtility } from "../modules/hawkmoon-utility.js";
+
+export class HawkmoonRollDialog extends Dialog {
+
+  /* -------------------------------------------- */
+  static async create(actor, rollData) {
+
+    let options = { classes: ["HawkmoonDialog"], width: 420, height: 'fit-content', 'z-index': 99999 };
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-hawkmoon-cyd/templates/roll-dialog-generic.html', rollData);
+
+    return new HawkmoonRollDialog(actor, rollData, html, options);
+  }
+
+  /* -------------------------------------------- */
+  constructor(actor, rollData, html, options, close = undefined) {
+    let conf = {
+      title: "Test de Capacité",
+      content: html,
+      buttons: {
+        rolld10: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "Lancer 1d10",
+          callback: () => { this.roll("d10") }
+        },
+        rolld20: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "Lancer 1d20",
+          callback: () => { this.roll("d20") }
+        },
+        cancel: {
+          icon: '<i class="fas fa-times"></i>',
+          label: "Annuler",
+          callback: () => { this.close() }
+        }
+      },
+      close: close
+    }
+
+    super(conf, options);
+
+    this.actor = actor
+    this.rollData = rollData
+  }
+
+  /* -------------------------------------------- */
+  roll(dice) {
+    this.rollData.mainDice = dice
+    HawkmoonUtility.rollHawkmoon(this.rollData)
+  }
+
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    var dialog = this;
+    function onLoad() {
+    }
+    $(function () { onLoad(); });
+
+    html.find('#modificateur').change(async (event) => {
+      this.rollData.modificateur = Number(event.currentTarget.value)
+    })
+    html.find('#difficulte').change((event) => {
+      console.log("Difficulte: " + event.currentTarget.value)
+      this.rollData.difficulte = Number(event.currentTarget.value)
+    })
+    html.find('#attrKey').change(async (event) => {
+      this.rollData.attrKey = String(event.currentTarget.value)
+    })
+    html.find('#attrKey2').change(async (event) => {
+      this.rollData.attrKey2 = String(event.currentTarget.value)
+    })
+    html.find('#select-maitrise').change(async (event) => {
+      this.rollData.maitriseId = String(event.currentTarget.value)
+    })
+    html.find('#competence-talents').change((event) => {
+      this.rollData.selectedTalents = $('#competence-talents').val()
+    })
+    html.find('#taille-cible').change((event) => {
+      this.rollData.tailleCible = String(event.currentTarget.value)
+    })
+    html.find('#tireur-deplacement').change((event) => {
+      this.rollData.tireurDeplacement = String(event.currentTarget.value)
+    })
+    html.find('#cible-couvert').change((event) => {
+      this.rollData.cibleCouvert = String(event.currentTarget.value)
+    })
+    html.find('#distance-tir').change((event) => {
+      this.rollData.distanceTir = String(event.currentTarget.value)
+    })
+    html.find('#bonus-malus-context').change((event) => {
+      this.rollData.bonusMalusContext = Number(event.currentTarget.value)
+    })
+    html.find('#defenseur-au-sol').change((event) => {
+      this.rollData.defenseurAuSol = event.currentTarget.checked
+    })
+    html.find('#ambidextre-1').change((event) => {
+      this.rollData.ambidextre1 = event.currentTarget.checked
+    })
+    html.find('#ambidextre-2').change((event) => {
+      this.rollData.ambidextre2 = event.currentTarget.checked
+    })
+    html.find('#attaque-monte').change((event) => {
+      this.rollData.attqueMonte = event.currentTarget.checked
+    })
+    html.find('#defenseur-aveugle').change((event) => {
+      this.rollData.defenseurAveugle = event.currentTarget.checked
+    })
+    html.find('#defenseur-de-dos').change((event) => {
+      this.rollData.defenseurDeDos = event.currentTarget.checked
+    })
+    html.find('#defenseur-restreint').change((event) => {
+      this.rollData.defenseurRestreint = event.currentTarget.checked
+    })
+    html.find('#defenseur-immobilise').change((event) => {
+      this.rollData.defenseurImmobilise = event.currentTarget.checked
+    })
+    html.find('#attaque-charge').change((event) => {
+      this.rollData.attaqueCharge = event.currentTarget.checked
+    })
+    html.find('#charge-cavalerie').change((event) => {
+      this.rollData.chargeCavalerie = event.currentTarget.checked
+    })
+    html.find('#attaquants-multiple').change((event) => {
+      this.rollData.attaquantsMultiples = event.currentTarget.checked
+    })
+    html.find('#soutiens').change((event) => {
+      this.rollData.soutiens = Number(event.currentTarget.value)
+    })
+    html.find('#feinte').change((event) => {
+      this.rollData.feinte = event.currentTarget.checked
+    })
+    html.find('#contenir').change((event) => {
+      this.rollData.contenir = event.currentTarget.checked
+    })
+    html.find('#attaque-desarme').change((event) => {
+      this.rollData.attaqueDesarme = event.currentTarget.checked
+    })
+
+
+  }
+}

_deprecated/partial-actor-equipment.html

@@ -0,0 +1,36 @@
+<li
+  class="item flexrow list-item list-item-shadow"
+  data-item-id="{{equip._id}}"
+>
+  <a class="item-edit item-name-img" title="Edit Item"
+    ><img class="sheet-competence-img" src="{{equip.img}}"
+  /></a>
+  {{#if (eq level 1)}}
+  <span class="item-name-label">{{equip.name}}</span>
+  {{else}}
+  <span class="item-name-label-level2">{{equip.name}}</span>
+  {{/if}}
+
+  <span class="item-field-label-long"
+    ><label>
+      {{equip.system.quantity}} (<a class="quantity-minus plus-minus-button">
+        -</a
+      >/<a class="quantity-plus plus-minus-button">+</a>)
+    </label>
+  </span>
+
+  <div class="item-filler">&nbsp;</div>
+  <div class="item-controls item-controls-fixed">
+    {{#if (eq level 1)}}
+    <a class="item-control item-equip" title="Worn"
+      >{{#if equip.system.equipped}}<i class="fas fa-circle"></i>{{else}}<i
+        class="fas fa-genderless"
+      ></i
+      >{{/if}}</a
+    >
+    {{/if}}
+    <a class="item-control item-delete" title="Delete Item"
+      ><i class="fas fa-trash"></i
+    ></a>
+  </div>
+</li>

_deprecated/roll-dialog-generic.html

@@ -0,0 +1,334 @@
+<form class="skill-roll-dialog">
+  <header class="roll-dialog-header">
+    {{#if img}}
+    <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
+    {{/if}}
+    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
+  </header>
+
+  <div class="flexcol">
+    <div class="flexrow">
+      {{#if (eq attrKey "tochoose")}}
+      <span class="roll-dialog-label"><strong>Attribut</strong></span>
+      <select
+        class="status-small-label color-class-common"
+        id="attrKey"
+        type="text"
+        name="attrKey"
+        value="attrKey"
+        data-dtype="string"
+      >
+        {{selectOptions attributs selected=attrKey}}
+      </select>
+      {{else}}
+      <span class="roll-dialog-label"><strong>{{attr.label}}</strong></span>
+      <span class="small-label roll-dialog-label">{{attr.value}}</span>
+      {{/if}}
+    </div>
+
+    {{#if nbAdversites}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"><strong>Malus d'adversités</strong></span>
+      <span class="small-label roll-dialog-label">- {{nbAdversites}}</span>
+    </div>
+    {{/if}} {{#if competence}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"><strong>{{competence.name}}</strong></span>
+      <span class="small-label roll-dialog-label"><strong>{{competence.system.niveau}}</strong></span>
+    </div>
+    {{#if maitrises}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"><strong>Maîtrise</strong></span>
+      <select
+        class="status-small-label color-class-common"
+        id="select-maitrise"
+        type="text"
+        name="select-maitrise"
+        value="maitriseId"
+        data-dtype="string"
+      >
+        {{selectOptions maitrises selected=maitriseId valueAttr="key"
+        nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}} {{else}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"><strong>Second Attribut</strong></span>
+      <select
+        class="status-small-label color-class-common"
+        id="attrKey2"
+        type="text"
+        name="attrKey2"
+        value="attrKey2"
+        data-dtype="string"
+      >
+        {{#select attrKey2}}
+        <option value="none">Aucun</option>
+        {{#each attributs as |attrLabel attrKey|}}
+        <option value="{{attrKey}}">{{attrLabel}}</option>
+        {{/each}} {{/select}}
+      </select>
+    </div>
+    {{/if}} {{#if (count talents)}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"><strong></strong>Talents</strong></span>
+      <select
+        class="flex1"
+        name="competence-talents"
+        id="competence-talents"
+        data-type="String"
+        multiple
+      >
+        {{#each talents as |talent key|}}
+        <option value="{{talent._id}}">{{talent.name}}</option>
+        {{/each}}
+      </select>
+    </div>
+    {{/if}} {{#if conditionsCommunes}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">En surplomb, défenseur au sol (+3)?</span>
+      <input type="checkbox" id="defenseur-au-sol" {{checked defenseurAuSol}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Défenseur aveuglé (+10)?</span>
+      <input
+        type="checkbox"
+        id="defenseur-aveugle"
+        {{checked
+        defenseurAveugle}}
+      />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Défenseur de dos (+5)?</span>
+      <input type="checkbox" id="defenseur-de-dos" {{checked defenseurDeDos}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Défenseur immobilisé (+5)?</span>
+      <input
+        type="checkbox"
+        id="defenseur-immobilise"
+        {{checked
+        defenseurImmobilise}}
+      />
+    </div>
+    {{/if}} {{#if (or immobiliser repousser)}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Cible consciente?</span>
+      <input type="checkbox" id="cibleconsciente" {{checked cibleconsciente}} />
+    </div>
+    {{/if}} {{#if arme}} {{#if arme.system.isMelee}} {{#if bonusArmeNaturelle}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Arme naturelle/fortune en défense</span>
+      <span class="small-label roll-dialog-label">{{bonusArmeNaturelle}}</span>
+    </div>
+    {{/if}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">En surplomb, défenseur au sol (+3)?</span>
+      <input type="checkbox" id="defenseur-au-sol" {{checked defenseurAuSol}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label"
+        >Attaquants multiples (après le premier) (+3)?</span
+      >
+      <input
+        type="checkbox"
+        id="attaquants-multiple"
+        {{checked
+        attaquantsMultiples}}
+      />
+    </div>
+    {{#if hasAmbidextre}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"
+        >Première attaque avec deux armes (-3)?</span
+      >
+      <input type="checkbox" id="ambidextre-1" {{checked attaqueAmbidextre1}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label"
+        >Seconde attaque avec deux armes (-6)?</span
+      >
+      <input type="checkbox" id="ambidextre-2" {{checked attaqueAmbidextre2}} />
+    </div>
+    {{/if}} {{#if hasFeinte}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"
+        >Feinte (<strong>cout : 1 BA</strong>) ?</span
+      >
+      <input type="checkbox" id="feinte" {{checked feinte}} />
+    </div>
+    {{/if}}
+    <div class="flexrow">
+      <span class="roll-dialog-label"><strong></strong>Soutiens</strong></span>
+      <select
+        class="status-small-label color-class-common"
+        name="soutiens"
+        id="soutiens"
+        data-type="Number"
+      >
+        {{selectOptions config.optionsSoutiens selected=soutiens valueAttr="key"
+        nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Défenseur aveuglé (+10)?</span>
+      <input
+        type="checkbox"
+        id="defenseur-aveugle"
+        {{checked
+        defenseurAveugle}}
+      />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Défenseur de dos (+5)?</span>
+      <input type="checkbox" id="defenseur-de-dos" {{checked defenseurDeDos}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label"
+        >Défenseur dans espace restreint (+3)?</span
+      >
+      <input
+        type="checkbox"
+        id="defenseur-restreint"
+        {{checked
+        defenseurRestreint}}
+      />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Défenseur immobilisé (+5)?</span>
+      <input
+        type="checkbox"
+        id="defenseur-immobilise"
+        {{checked
+        defenseurImmobilise}}
+      />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Charge ?</span>
+      <input type="checkbox" id="attaque-charge" {{checked attaqueCharge}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Contenir?</span>
+      <input type="checkbox" id="contenir" {{checked contenir}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Désarmer (SD+10)?</span>
+      <input type="checkbox" id="attaque-desarme" {{checked attaqueDesarme}} />
+    </div>
+    {{#if isMonte}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Charge de cavalerie?</span>
+      <input
+        type="checkbox"
+        id="charge-cavalerie"
+        {{checked
+        chargeCavalerie}}
+      />
+    </div>
+    {{/if}} {{else}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Tireur en déplacement ?</span>
+      <select
+        class="item-field-label-long"
+        type="text"
+        id="tireur-deplacement"
+        data-dtype="string"
+      >
+        {{selectOptions config.optionsTireurDeplacement
+        selected=tireurDeplacement valueAttr="key" nameAttr="key"
+        labelAttr="label"}}
+      </select>
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Couvert de la cible ?</span>
+      <select
+        class="item-field-label-long"
+        type="text"
+        id="cible-couvert"
+        data-dtype="string"
+      >
+        {{selectOptions config.optionsCouvert selected=cibleCouvert
+        valueAttr="key" nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Cible se déplace vite (SD+3)?</span>
+      <input
+        type="checkbox"
+        id="tireur-cible-deplace"
+        {{checked
+        cibleDeplace}}
+      />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Cible corps à corps (SD+3)?</span>
+      <input type="checkbox" id="tireur-cible-cac" {{checked cibleCaC}} />
+    </div>
+    <div class="flexrow">
+      <span class="roll-dialog-label">Taille de la cible ?</span>
+      <select
+        class="item-field-label-long"
+        type="text"
+        id="taille-cible"
+        data-dtype="string"
+      >
+        {{selectOptions config.optionsTailleCible selected=tailleCible
+        valueAttr="key" nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}} {{/if}}
+
+    <div class="flexrow">
+      <span class="roll-dialog-label">Bonus/Malus </span>
+      <select
+        class="roll-dialog-label"
+        id="bonus-malus-context"
+        type="text"
+        value="{{bonusMalusContext}}"
+        data-dtype="Number"
+      >
+        {{selectOptions config.optionsBonusMalus selected=bonusMalusContext
+        valueAttr="key" nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+
+    {{#if (or armeDefense arme.system.isDistance)}} {{#if
+    arme.system.isDistance}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">SD de distance</span>
+      <select
+        class="item-field-label-long"
+        type="text"
+        id="distance-tir"
+        data-dtype="string"
+      >
+        {{selectOptions config.optionsDistanceTir selected=distanceTir
+        valueAttr="key" nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+    {{else}}
+    <div class="flexrow">
+      {{#if desengager}}
+      <span class="roll-dialog-label">C. Offensive adversaire </span>
+      {{else}}
+      <span class="roll-dialog-label">C. Défensive adversaire</span>
+      {{/if}}
+      <span class="roll-dialog-label"><strong>{{difficulte}}</strong> </span>
+    </div>
+    {{/if}} {{else}} {{#if isInit}} {{else}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Difficulté : </span>
+      <select
+        class="roll-dialog-label"
+        id="difficulte"
+        type="text"
+        name="difficulte"
+        data-dtype="String"
+      >
+        {{selectOptions config.optionsDifficulte selected=difficulte
+        valueAttr="key" nameAttr="key" labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}} {{/if}}
+  </div>
+</form>

gulpfile.js

@@ -0,0 +1,35 @@
+const gulp = require('gulp');
+const less = require('gulp-less');
+const sourcemaps = require('gulp-sourcemaps');
+
+// Paths
+const paths = {
+  styles: {
+    src: 'less/**/*.less',
+    dest: 'styles/'
+  }
+};
+
+// Compile LESS to CSS
+function styles() {
+  return gulp.src('less/hawkmoon.less')
+    .pipe(sourcemaps.init())
+    .pipe(less())
+    .pipe(sourcemaps.write('.'))
+    .pipe(gulp.dest(paths.styles.dest));
+}
+
+// Watch files
+function watchFiles() {
+  gulp.watch(paths.styles.src, styles);
+}
+
+// Define complex tasks
+const build = gulp.series(styles);
+const watch = gulp.series(build, watchFiles);
+
+// Export tasks
+exports.styles = styles;
+exports.build = build;
+exports.watch = watch;
+exports.default = build;

lang/fr.json

@@ -1,25 +1,25 @@
 {
-  "ACTOR": {
-    "TypePersonnage": "Personnage",
-    "TypeCellule": "Cellule",
-    "TypeCreature": "Créature"
+  "TYPES": {
+    "Actor": {
+      "personnage": "Personnage",
+      "cellule": "Cellule",
+      "creature": "Créature"
+    },
+    "Item": {
+      "artefact": "Artefact",
+      "arme": "Arme",
+      "talent": "Talent",
+      "historique": "Historique",
+      "profil": "Profil",
+      "competence": "Compétence",
+      "protection": "Protection",
+      "monnaie": "Monnaie",
+      "equipement": "Equipement",
+      "ressource": "Ressource",
+      "contact": "Contact",
+      "mutation": "Mutation"    
+    }
   },
-
-  "ITEM": {
-    "TypeArtefact": "Artefact",
-    "TypeArme": "Arme",
-    "TypeTalent": "Talent",
-    "TypeHistorique": "Historique",
-    "TypeProfil": "Profil",
-    "TypeCompetence": "Compétence",
-    "TypeProtection": "Protection",
-    "TypeMonnaie": "Monnaie",
-    "TypeEquipement": "Equipement",
-    "TypeRessource": "Ressource", 
-    "TypeContact": "Contact"
-
-  },
-
   "HAWKMOON": {
     "ui": {
       "editContact": "Modifier le contact",

less/hawkmoon.less

@@ -0,0 +1,4 @@
+// Main LESS file for Hawkmoon system
+// Temporarily importing the full converted simple.css while we refactor
+
+@import "simple-converted";

modules/applications/hawkmoon-roll-dialog.mjs

@@ -0,0 +1,177 @@
+import { HawkmoonUtility } from "../hawkmoon-utility.js"
+import { HAWKMOON_CONFIG } from "../hawkmoon-config.js"
+
+/**
+ * Dialogue de jet de dé pour Hawkmoon - Version DialogV2
+ */
+export class HawkmoonRollDialog {
+
+  /**
+   * Create and display the roll dialog
+   * @param {HawkmoonActor} actor - The actor making the roll
+   * @param {Object} rollData - Data for the roll
+   * @returns {Promise<HawkmoonRollDialog>}
+   */
+  static async create(actor, rollData) {
+    // Préparer le contexte pour le template
+    const context = {
+      ...rollData,
+      difficulte: String(rollData.difficulte || 0), // Convertir en string pour matcher les options du select
+      img: actor.img,
+      name: actor.name,
+      config: HAWKMOON_CONFIG,
+    }
+
+    // Si attrKey est "tochoose", préparer la liste des attributs sélectionnables
+    if (rollData.attrKey === "tochoose") {
+      context.selectableAttributes = actor.system.attributs
+      // Ne pas changer attrKey ni attr - l'utilisateur doit choisir
+    }
+
+    // Rendre le template en HTML
+    const content = await foundry.applications.handlebars.renderTemplate(
+      "systems/fvtt-hawkmoon-cyd/templates/roll-dialog-generic.hbs",
+      context
+    )
+
+    // Utiliser DialogV2.wait avec le HTML rendu
+    return foundry.applications.api.DialogV2.wait({
+      window: { title: "Test de Capacité", icon: "fa-solid fa-dice-d20" },
+      classes: ["hawkmoon-roll-dialog"],
+      position: { width: 480 },
+      modal: false, // Permettre l'interaction avec le canvas pour garder la cible sélectionnée
+      content,
+      buttons: [
+        {
+          action: "rolld10",
+          label: "Lancer 1d10",
+          icon: "fa-solid fa-dice-d10",
+          default: true,
+          callback: (event, button, dialog) => {
+            this._updateRollDataFromForm(rollData, button.form.elements, actor)
+            rollData.mainDice = "d10"
+            HawkmoonUtility.rollHawkmoon(rollData)
+          }
+        },
+        {
+          action: "rolld20",
+          label: "Lancer 1d20",
+          icon: "fa-solid fa-dice-d20",
+          callback: (event, button, dialog) => {
+            this._updateRollDataFromForm(rollData, button.form.elements, actor)
+            rollData.mainDice = "d20"
+            HawkmoonUtility.rollHawkmoon(rollData)
+          }
+        },
+      ],
+      rejectClose: false,
+    })
+  }
+
+  /**
+   * Mettre à jour rollData avec les valeurs du formulaire
+   * @param {Object} rollData - L'objet rollData à mettre à jour
+   * @param {HTMLFormControlsCollection} formElements - Les éléments du formulaire
+   * @param {HawkmoonActor} actor - L'acteur pour récupérer les attributs
+   * @private
+   */
+  static _updateRollDataFromForm(rollData, formElements, actor) {
+    // Attributs
+    if (formElements.attrKey) {
+      rollData.attrKey = formElements.attrKey.value
+      // Si l'attribut a changé, mettre à jour rollData.attr
+      if (rollData.attrKey !== "tochoose" && rollData.attrKey !== "none" && actor) {
+        rollData.attr = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey])
+        rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
+      }
+    }
+    if (formElements.attrKey2) {
+      rollData.attrKey2 = formElements.attrKey2.value
+    }
+
+    // Modificateurs de base
+    if (formElements.difficulte) {
+      rollData.difficulte = Number(formElements.difficulte.value)
+    }
+    if (formElements.modificateur) {
+      rollData.modificateur = Number(formElements.modificateur.value)
+    }
+    if (formElements.soutiens) {
+      rollData.soutiens = Number(formElements.soutiens.value)
+    }
+
+    // Compétence
+    if (formElements.maitrise) {
+      rollData.maitriseId = formElements.maitrise.value
+    }
+    if (formElements.talents) {
+      // Récupérer toutes les options sélectionnées (select multiple)
+      const selectedOptions = Array.from(formElements.talents.selectedOptions)
+      rollData.selectedTalents = selectedOptions.map(opt => opt.value)
+    }
+
+    // Modificateurs de tir
+    if (formElements.tailleCible) {
+      rollData.tailleCible = formElements.tailleCible.value
+    }
+    if (formElements.tireurDeplacement) {
+      rollData.tireurDeplacement = formElements.tireurDeplacement.value
+    }
+    if (formElements.cibleCouvert) {
+      rollData.cibleCouvert = formElements.cibleCouvert.value
+    }
+    if (formElements.distanceTir) {
+      rollData.distanceTir = formElements.distanceTir.value
+    }
+    if (formElements.cibleDeplace) {
+      rollData.cibleDeplace = formElements.cibleDeplace.checked
+    }
+    if (formElements.cibleCaC) {
+      rollData.cibleCaC = formElements.cibleCaC.checked
+    }
+
+    // Modificateurs de combat (checkboxes)
+    if (formElements.defenseurAuSol) {
+      rollData.defenseurAuSol = formElements.defenseurAuSol.checked
+    }
+    if (formElements.ambidextre1) {
+      rollData.ambidextre1 = formElements.ambidextre1.checked
+    }
+    if (formElements.ambidextre2) {
+      rollData.ambidextre2 = formElements.ambidextre2.checked
+    }
+    if (formElements.attaqueMonte) {
+      rollData.attaqueMonte = formElements.attaqueMonte.checked
+    }
+    if (formElements.defenseurAveugle) {
+      rollData.defenseurAveugle = formElements.defenseurAveugle.checked
+    }
+    if (formElements.defenseurDeDos) {
+      rollData.defenseurDeDos = formElements.defenseurDeDos.checked
+    }
+    if (formElements.defenseurRestreint) {
+      rollData.defenseurRestreint = formElements.defenseurRestreint.checked
+    }
+    if (formElements.defenseurImmobilise) {
+      rollData.defenseurImmobilise = formElements.defenseurImmobilise.checked
+    }
+    if (formElements.attaqueCharge) {
+      rollData.attaqueCharge = formElements.attaqueCharge.checked
+    }
+    if (formElements.chargeCavalerie) {
+      rollData.chargeCavalerie = formElements.chargeCavalerie.checked
+    }
+    if (formElements.attaquantsMultiple) {
+      rollData.attaquantsMultiple = formElements.attaquantsMultiple.checked
+    }
+    if (formElements.feinte) {
+      rollData.feinte = formElements.feinte.checked
+    }
+    if (formElements.contenir) {
+      rollData.contenir = formElements.contenir.checked
+    }
+    if (formElements.attaqueDesarme) {
+      rollData.attaqueDesarme = formElements.attaqueDesarme.checked
+    }
+  }
+}

modules/applications/sheets/_module.mjs

@@ -0,0 +1,17 @@
+export { default as HawkmoonTalentSheet } from "./talent-sheet.mjs"
+export { default as HawkmoonCompetenceSheet } from "./competence-sheet.mjs"
+export { default as HawkmoonArmeSheet } from "./arme-sheet.mjs"
+export { default as HawkmoonProtectionSheet } from "./protection-sheet.mjs"
+export { default as HawkmoonHistoriqueSheet } from "./historique-sheet.mjs"
+export { default as HawkmoonProfilSheet } from "./profil-sheet.mjs"
+export { default as HawkmoonEquipementSheet } from "./equipement-sheet.mjs"
+export { default as HawkmoonMonnaieSheet } from "./monnaie-sheet.mjs"
+export { default as HawkmoonArtefactSheet } from "./artefact-sheet.mjs"
+export { default as HawkmoonRessourceSheet } from "./ressource-sheet.mjs"
+export { default as HawkmoonContactSheet } from "./contact-sheet.mjs"
+export { default as HawkmoonMutationSheet } from "./mutation-sheet.mjs"
+
+// Actor sheets
+export { default as HawkmoonPersonnageSheet } from "./personnage-sheet.mjs"
+export { default as HawkmoonCreatureSheet } from "./creature-sheet.mjs"
+export { default as HawkmoonCelluleSheet } from "./cellule-sheet.mjs"

modules/applications/sheets/arme-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonArmeSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["arme"],
+    position: {
+      width: 640,
+    },
+    window: {
+      contentClasses: ["arme-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-arme-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/artefact-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonArtefactSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["artefact"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["artefact-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-artefact-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/base-actor-sheet.mjs

@@ -0,0 +1,547 @@
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+import { HawkmoonUtility } from "../../hawkmoon-utility.js"
+import { HawkmoonAutomation } from "../../hawkmoon-automation.js"
+
+export default class HawkmoonActorSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) {
+  /**
+   * Different sheet modes.
+   * @enum {number}
+   */
+  static SHEET_MODES = { EDIT: 0, PLAY: 1 }
+
+  constructor(options = {}) {
+    super(options)
+    this.#dragDrop = this.#createDragDropHandlers()
+    this._sheetMode = this.constructor.SHEET_MODES.PLAY // Commencer en mode visualisation
+  }
+
+  #dragDrop
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
+    position: {
+      width: 640,
+      height: 720,
+    },
+    window: {
+      resizable: true,
+    },
+    form: {
+      submitOnChange: true,
+      closeOnSubmit: false,
+    },
+    dragDrop: [{ dragSelector: ".item-list .item", dropSelector: "form" }],
+    actions: {
+      editImage: HawkmoonActorSheet.#onEditImage,
+      toggleSheet: HawkmoonActorSheet.#onToggleSheet,
+      editItem: HawkmoonActorSheet.#onEditItem,
+      deleteItem: HawkmoonActorSheet.#onDeleteItem,
+      createItem: HawkmoonActorSheet.#onCreateItem,
+      equipItem: HawkmoonActorSheet.#onEquipItem,
+      modifyQuantity: HawkmoonActorSheet.#onModifyQuantity,
+      modifyAdversite: HawkmoonActorSheet.#onModifyAdversite,
+      rollInitiative: HawkmoonActorSheet.#onRollInitiative,
+      rollAttribut: HawkmoonActorSheet.#onRollAttribut,
+      rollCompetence: HawkmoonActorSheet.#onRollCompetence,
+      rollArmeOffensif: HawkmoonActorSheet.#onRollArmeOffensif,
+      rollArmeDegats: HawkmoonActorSheet.#onRollArmeDegats,
+      rollAssommer: HawkmoonActorSheet.#onRollAssommer,
+      rollCoupBas: HawkmoonActorSheet.#onRollCoupBas,
+      rollImmobiliser: HawkmoonActorSheet.#onRollImmobiliser,
+      rollRepousser: HawkmoonActorSheet.#onRollRepousser,
+      rollDesengager: HawkmoonActorSheet.#onRollDesengager,
+    },
+  }
+
+  /**
+   * Is the sheet currently in 'Play' mode?
+   * @type {boolean}
+   */
+  get isPlayMode() {
+    // Initialize if not set
+    if (this._sheetMode === undefined) this._sheetMode = this.constructor.SHEET_MODES.PLAY
+    return this._sheetMode === this.constructor.SHEET_MODES.PLAY
+  }
+
+  /**
+   * Is the sheet currently in 'Edit' mode?
+   * @type {boolean}
+   */
+  get isEditMode() {
+    // Initialize if not set
+    if (this._sheetMode === undefined) this._sheetMode = this.constructor.SHEET_MODES.PLAY
+    return this._sheetMode === this.constructor.SHEET_MODES.EDIT
+  }
+
+  /**
+   * Tab groups state
+   * @type {object}
+   */
+  tabGroups = { primary: "principal" }
+
+  /** @override */
+  async _prepareContext() {
+    const actor = this.document
+
+    const context = {
+      actor: actor,
+      system: actor.system,
+      source: actor.toObject(),
+      fields: actor.schema.fields,
+      systemFields: actor.system.schema.fields,
+      isEditable: this.isEditable,
+      isEditMode: this.isEditMode,
+      isPlayMode: this.isPlayMode,
+      isGM: game.user.isGM,
+      config: CONFIG.HAWKMOON,
+      enrichedDescription: await foundry.applications.ux.TextEditor.implementation.enrichHTML(actor.system.biodata?.description || "", { async: true }),
+      enrichedHabitat: await foundry.applications.ux.TextEditor.implementation.enrichHTML(actor.system.biodata?.habitat || "", { async: true }),
+    }
+
+    return context
+  }
+
+  /** @override */
+  _onRender(context, options) {
+    super._onRender(context, options)
+
+    // Activate drag & drop handlers
+    this.#dragDrop.forEach(d => d.bind(this.element))
+
+    // Manual tab navigation
+    const html = this.element
+    const tabLinks = html.querySelectorAll('a.item[data-tab]')
+    const tabContents = html.querySelectorAll('.tab[data-tab]')
+
+    // Hide all tabs initially
+    tabContents.forEach(tab => {
+      tab.classList.remove('active')
+      tab.style.display = 'none'
+    })
+
+    // Show active tab
+    const activeTab = this.tabGroups.primary
+    const activeTabContent = html.querySelector(`.tab[data-tab="${activeTab}"]`)
+    if (activeTabContent) {
+      activeTabContent.classList.add('active')
+      activeTabContent.style.display = 'block'
+    }
+
+    // Activate the corresponding nav link
+    tabLinks.forEach(link => {
+      if (link.dataset.tab === activeTab) {
+        link.classList.add('active')
+      } else {
+        link.classList.remove('active')
+      }
+    })
+
+    // Tab click handler
+    tabLinks.forEach(link => {
+      link.addEventListener('click', (event) => {
+        event.preventDefault()
+        const tab = link.dataset.tab
+
+        // Update state
+        this.tabGroups.primary = tab
+
+        // Hide all tabs
+        tabContents.forEach(t => {
+          t.classList.remove('active')
+          t.style.display = 'none'
+        })
+
+        // Show selected tab
+        const selectedTab = html.querySelector(`.tab[data-tab="${tab}"]`)
+        if (selectedTab) {
+          selectedTab.classList.add('active')
+          selectedTab.style.display = 'block'
+        }
+
+        // Update nav links
+        tabLinks.forEach(l => {
+          if (l.dataset.tab === tab) {
+            l.classList.add('active')
+          } else {
+            l.classList.remove('active')
+          }
+        })
+      })
+    })
+
+    // Inline item editing
+    html.querySelectorAll('.edit-item-data').forEach(input => {
+      input.addEventListener('change', (event) => {
+        const li = event.target.closest('.item')
+        const itemId = li.dataset.itemId
+        const itemType = li.dataset.itemType
+        const itemField = event.target.dataset.itemField
+        const dataType = event.target.dataset.dtype
+        const value = event.target.value
+        this.actor.editItemField(itemId, itemType, itemField, dataType, value)
+      })
+    })
+  }
+
+  // #region Drag & Drop
+
+  /**
+   * Create drag-and-drop workflow handlers for this Application
+   * @returns {DragDrop[]}     An array of DragDrop handlers
+   * @private
+   */
+  #createDragDropHandlers() {
+    return this.options.dragDrop.map((d) => {
+      d.permissions = {
+        dragstart: this._canDragStart.bind(this),
+        drop: this._canDragDrop.bind(this),
+      }
+      d.callbacks = {
+        dragstart: this._onDragStart.bind(this),
+        drop: this._onDrop.bind(this),
+      }
+      return new foundry.applications.ux.DragDrop(d)
+    })
+  }
+
+  /**
+   * Define whether a user is able to begin a dragstart workflow for a given drag selector
+   * @param {string} selector       The candidate HTML selector for dragging
+   * @returns {boolean}             Can the current user drag this selector?
+   * @protected
+   */
+  _canDragStart(selector) {
+    return this.isEditable
+  }
+
+  /**
+   * Define whether a user is able to conclude a drag-and-drop workflow for a given drop selector
+   * @param {string} selector       The candidate HTML selector for the drop target
+   * @returns {boolean}             Can the current user drop on this selector?
+   * @protected
+   */
+  _canDragDrop(selector) {
+    return this.isEditable
+  }
+
+  /**
+   * Callback actions which occur at the beginning of a drag start workflow.
+   * @param {DragEvent} event       The originating DragEvent
+   * @protected
+   */
+  _onDragStart(event) {
+    const li = event.currentTarget.closest(".item")
+    if (!li?.dataset.itemId) return
+    const item = this.actor.items.get(li.dataset.itemId)
+    if (!item) return
+
+    const dragData = item.toDragData()
+    event.dataTransfer.setData("text/plain", JSON.stringify(dragData))
+  }
+
+  /**
+   * Callback actions which occur when a dragged element is dropped on a target.
+   * @param {DragEvent} event       The originating DragEvent
+   * @protected
+   */
+  async _onDrop(event) {
+    const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event)
+    const actor = this.actor
+
+    // Handle different data types
+    switch (data.type) {
+      case "Item":
+        return this._onDropItem(event, data)
+      case "Actor":
+        return this._onDropActor(event, data)
+      case "ActiveEffect":
+        return this._onDropActiveEffect(event, data)
+    }
+  }
+
+  /**
+   * Handle dropping an Item on the actor sheet
+   * @param {DragEvent} event
+   * @param {object} data
+   * @private
+   */
+  async _onDropItem(event, data) {
+    if (!this.actor.isOwner) return false
+
+    let item = await fromUuid(data.uuid)
+    if (item.pack) {
+      item = await HawkmoonUtility.searchItem(item)
+    }
+
+    const autoresult = HawkmoonAutomation.processAutomations("on-drop", item, this.actor)
+    if (autoresult.isValid) {
+      // In AppV2, we need to get the item data differently
+      const itemData = item.toObject ? item.toObject() : item
+      return this.actor.createEmbeddedDocuments("Item", [itemData])
+    } else {
+      ui.notifications.warn(autoresult.warningMessage)
+      return false
+    }
+  }
+
+  /**
+   * Handle dropping an Actor on the sheet
+   * @param {DragEvent} event
+   * @param {object} data
+   * @private
+   */
+  async _onDropActor(event, data) {
+    // To be implemented by subclasses if needed
+    return false
+  }
+
+  /**
+   * Handle dropping an ActiveEffect on the sheet
+   * @param {DragEvent} event
+   * @param {object} data
+   * @private
+   */
+  async _onDropActiveEffect(event, data) {
+    // To be implemented by subclasses if needed
+    return false
+  }
+
+  // #endregion
+
+  // #region Action Handlers
+
+  /**
+   * Toggle between edit and play mode
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static #onToggleSheet(event, target) {
+    console.log("Toggle sheet clicked", this)
+    const wasEditMode = this.isEditMode
+    console.log("Current mode:", this._sheetMode, "isEditMode:", wasEditMode, "isPlayMode:", this.isPlayMode)
+    this._sheetMode = wasEditMode ? this.constructor.SHEET_MODES.PLAY : this.constructor.SHEET_MODES.EDIT
+    console.log("New mode set to:", this._sheetMode, "(", wasEditMode ? "PLAY" : "EDIT", ")")
+    console.log("After change - isEditMode:", this.isEditMode, "isPlayMode:", this.isPlayMode)
+    this.render({ force: true })
+  }
+
+  /**
+   * Edit the actor image
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onEditImage(event, target) {
+    const fp = new FilePicker({
+      type: "image",
+      current: this.actor.img,
+      callback: (path) => {
+        this.actor.update({ img: path })
+      },
+    })
+    return fp.browse()
+  }
+
+  /**
+   * Edit an item
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onEditItem(event, target) {
+    const li = target.closest(".item")
+    const itemId = li?.dataset.itemId
+    if (!itemId) return
+    const item = this.actor.items.get(itemId)
+    if (item) item.sheet.render(true)
+  }
+
+  /**
+   * Delete an item
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onDeleteItem(event, target) {
+    const li = target.closest(".item")
+    await HawkmoonUtility.confirmDelete(this, li)
+  }
+
+  /**
+   * Create a new item
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onCreateItem(event, target) {
+    const itemType = target.dataset.type
+    await this.actor.createEmbeddedDocuments("Item", [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true })
+  }
+
+  /**
+   * Equip/unequip an item
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onEquipItem(event, target) {
+    const li = target.closest(".item")
+    const itemId = li?.dataset.itemId
+    if (itemId) {
+      await this.actor.equipItem(itemId)
+      this.render()
+    }
+  }
+
+  /**
+   * Modify item quantity
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onModifyQuantity(event, target) {
+    const li = target.closest(".item")
+    const itemId = li?.dataset.itemId
+    const value = Number(target.dataset.quantiteValue)
+    if (itemId) {
+      await this.actor.incDecQuantity(itemId, value)
+    }
+  }
+
+  /**
+   * Modify adversité
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onModifyAdversite(event, target) {
+    const li = target.closest(".item")
+    const adv = li?.dataset.adversite
+    const value = Number(target.dataset.adversiteValue)
+    if (adv) {
+      await this.actor.incDecAdversite(adv, value)
+    }
+  }
+
+  /**
+   * Roll initiative
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollInitiative(event, target) {
+    await this.actor.rollAttribut("adr", true)
+  }
+
+  /**
+   * Roll attribut
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollAttribut(event, target) {
+    const li = target.closest(".item")
+    const attrKey = li?.dataset.attrKey
+    if (attrKey) {
+      await this.actor.rollAttribut(attrKey, false)
+    }
+  }
+
+  /**
+   * Roll competence
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollCompetence(event, target) {
+    const li = target.closest(".item")
+    const attrKey = target.dataset.attrKey
+    const compId = li?.dataset.itemId
+    if (attrKey && compId) {
+      await this.actor.rollCompetence(attrKey, compId)
+    }
+  }
+
+  /**
+   * Roll arme offensif
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollArmeOffensif(event, target) {
+    const li = target.closest(".item")
+    const armeId = li?.dataset.itemId
+    if (armeId) {
+      await this.actor.rollArmeOffensif(armeId)
+    }
+  }
+
+  /**
+   * Roll arme degats
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollArmeDegats(event, target) {
+    const li = target.closest(".item")
+    const armeId = li?.dataset.itemId
+    if (armeId) {
+      await this.actor.rollArmeDegats(armeId)
+    }
+  }
+
+  /**
+   * Roll assommer
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollAssommer(event, target) {
+    await this.actor.rollAssommer()
+  }
+
+  /**
+   * Roll coup bas
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollCoupBas(event, target) {
+    await this.actor.rollCoupBas()
+  }
+
+  /**
+   * Roll immobiliser
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollImmobiliser(event, target) {
+    await this.actor.rollImmobiliser()
+  }
+
+  /**
+   * Roll repousser
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollRepousser(event, target) {
+    await this.actor.rollRepousser()
+  }
+
+  /**
+   * Roll désengager
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onRollDesengager(event, target) {
+    await this.actor.rollDesengager()
+  }
+
+  // #endregion
+}

modules/applications/sheets/base-item-sheet.mjs

@@ -0,0 +1,342 @@
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+export default class HawkmoonItemSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
+  constructor(options = {}) {
+    super(options)
+    this.#dragDrop = this.#createDragDropHandlers()
+  }
+
+  #dragDrop
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-hawkmoon-cyd", "item"],
+    position: {
+      width: 620,
+      height: 600,
+    },
+    form: {
+      submitOnChange: true,
+    },
+    window: {
+      resizable: true,
+    },
+    tabs: [
+      {
+        navSelector: 'nav[data-group="primary"]',
+        contentSelector: "section.sheet-body",
+        initial: "description",
+      },
+    ],
+    dragDrop: [{ dragSelector: "[data-drag]", dropSelector: null }],
+    actions: {
+      editImage: HawkmoonItemSheet.#onEditImage,
+      postItem: HawkmoonItemSheet.#onPostItem,
+      addPredilection: HawkmoonItemSheet.#onAddPredilection,
+      deletePredilection: HawkmoonItemSheet.#onDeletePredilection,
+      addAutomation: HawkmoonItemSheet.#onAddAutomation,
+      deleteAutomation: HawkmoonItemSheet.#onDeleteAutomation,
+    },
+  }
+
+  /**
+   * Tab groups state
+   * @type {object}
+   */
+  tabGroups = { primary: "description" }
+
+  /**
+   * Is the sheet currently in 'Play' mode?
+   * @type {boolean}
+   */
+  /** @override */
+  async _prepareContext() {
+    const context = {
+      fields: this.document.schema.fields,
+      systemFields: this.document.system.schema.fields,
+      item: this.document,
+      system: this.document.system,
+      source: this.document.toObject(),
+      enrichedDescription: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.description, { async: true }),
+      isEditMode: true,
+      isEditable: this.isEditable,
+      isGM: game.user.isGM,
+      config: CONFIG.HAWKMOON,
+      attributs: this.#getAttributs(),
+    }
+    return context
+  }
+
+  /** @override */
+  _onRender(context, options) {
+    super._onRender(context, options)
+    this.#dragDrop.forEach((d) => d.bind(this.element))
+
+    // Activate tab navigation manually
+    const nav = this.element.querySelector('nav.tabs[data-group]')
+    if (nav) {
+      const group = nav.dataset.group
+      // Activate the current tab
+      const activeTab = this.tabGroups[group] || "description"
+      nav.querySelectorAll('[data-tab]').forEach(link => {
+        const tab = link.dataset.tab
+        link.classList.toggle('active', tab === activeTab)
+        link.addEventListener('click', (event) => {
+          event.preventDefault()
+          this.tabGroups[group] = tab
+          this.render()
+        })
+      })
+
+      // Show/hide tab content
+      this.element.querySelectorAll('[data-group="' + group + '"][data-tab]').forEach(content => {
+        content.classList.toggle('active', content.dataset.tab === activeTab)
+      })
+    }
+  }
+
+  // #region Drag-and-Drop Workflow
+  /**
+   * Create drag-and-drop workflow handlers for this Application
+   * @returns {DragDrop[]}     An array of DragDrop handlers
+   * @private
+   */
+  #createDragDropHandlers() {
+    return this.options.dragDrop.map((d) => {
+      d.permissions = {
+        dragstart: this._canDragStart.bind(this),
+        drop: this._canDragDrop.bind(this),
+      }
+      d.callbacks = {
+        dragstart: this._onDragStart.bind(this),
+        dragover: this._onDragOver.bind(this),
+        drop: this._onDrop.bind(this),
+      }
+      return new foundry.applications.ux.DragDrop.implementation(d)
+    })
+  }
+
+  /**
+   * Can the User start a drag workflow for a given drag selector?
+   * @param {string} selector       The candidate HTML selector for the drag event
+   * @returns {boolean}             Can the current user drag this selector?
+   * @protected
+   */
+  _canDragStart(selector) {
+    return this.isEditable
+  }
+
+  /**
+   * Can the User drop an entry at a given drop selector?
+   * @param {string} selector       The candidate HTML selector for the drop event
+   * @returns {boolean}             Can the current user drop on this selector?
+   * @protected
+   */
+  _canDragDrop(selector) {
+    return this.isEditable
+  }
+
+  /**
+   * Callback for dragstart events.
+   * @param {DragEvent} event       The drag start event
+   * @protected
+   */
+  _onDragStart(event) {
+    const target = event.currentTarget
+    const dragData = { type: "Item", uuid: this.document.uuid }
+    event.dataTransfer.setData("text/plain", JSON.stringify(dragData))
+  }
+
+  /**
+   * Callback for dragover events.
+   * @param {DragEvent} event       The drag over event
+   * @protected
+   */
+  _onDragOver(event) {
+    // Default behavior is fine
+  }
+
+  /**
+   * Callback for drop events.
+   * @param {DragEvent} event       The drop event
+   * @protected
+   */
+  async _onDrop(event) {
+    const data = TextEditor.getDragEventData(event)
+    const item = await fromUuid(data.uuid)
+    if (!item) return
+
+    // Handle drop logic here if needed
+    console.log("Item dropped:", item)
+  }
+  // #endregion
+
+  // #region Action Handlers
+  /**
+   * Edit the item image
+   * @param {Event} event       The triggering event
+   * @param {HTMLElement} target    The target element
+   * @private
+   */
+  static async #onEditImage(event, target) {
+    const fp = new foundry.applications.ui.FilePicker({
+      type: "image",
+      current: this.document.img,
+      callback: (path) => {
+        this.document.update({ img: path })
+      },
+    })
+    return fp.browse()
+  }
+
+  /**
+   * Post item to chat
+   * @param {Event} event       The triggering event
+   * @param {HTMLElement} target    The target element
+   * @private
+   */
+  static async #onPostItem(event, target) {
+    let chatData = foundry.utils.duplicate(this.document)
+    if (this.document.actor) {
+      chatData.actor = { id: this.document.actor.id }
+    }
+    // Don't post any image for the item if the default image is used
+    if (chatData.img.includes("/blank.png")) {
+      chatData.img = null
+    }
+    // JSON object for easy creation
+    chatData.jsondata = JSON.stringify({
+      compendium: "postedItem",
+      payload: chatData,
+    })
+
+    const html = await renderTemplate('systems/fvtt-hawkmoon-cyd/templates/post-item.hbs', chatData)
+    const chatOptions = {
+      user: game.user.id,
+      content: html,
+    }
+    ChatMessage.create(chatOptions)
+  }
+
+  /**
+   * Add a predilection
+   * @param {Event} event       The triggering event
+   * @param {HTMLElement} target    The target element
+   * @private
+   */
+  static async #onAddPredilection(event, target) {
+    let pred = foundry.utils.duplicate(this.document.system.predilections || [])
+    pred.push({ name: "Nouvelle prédilection", id: foundry.utils.randomID(16), used: false, acquise: false, maitrise: false, description: "" })
+    await this.document.update({ 'system.predilections': pred })
+  }
+
+  /**
+   * Delete a predilection
+   * @param {Event} event       The triggering event
+   * @param {HTMLElement} target    The target element
+   * @private
+   */
+  static async #onDeletePredilection(event, target) {
+    const index = parseInt(target.closest("[data-predilection-index]").dataset.predilectionIndex)
+    let pred = foundry.utils.duplicate(this.document.system.predilections)
+    pred.splice(index, 1)
+    await this.document.update({ 'system.predilections': pred })
+  }
+
+  /**
+   * Add an automation
+   * @param {Event} event       The triggering event
+   * @param {HTMLElement} target    The target element
+   * @private
+   */
+  static async #onAddAutomation(event, target) {
+    let autom = foundry.utils.duplicate(this.document.system.automations || [])
+    autom.push({
+      eventtype: "on-drop",
+      name: "Automatisation 1",
+      bonusname: "vigueur",
+      bonus: 0,
+      competence: "",
+      minLevel: 0,
+      baCost: 0,
+      id: foundry.utils.randomID(16)
+    })
+    await this.document.update({ 'system.automations': autom })
+  }
+
+  /**
+   * Delete an automation
+   * @param {Event} event       The triggering event
+   * @param {HTMLElement} target    The target element
+   * @private
+   */
+  static async #onDeleteAutomation(event, target) {
+    const index = parseInt(target.closest("[data-automation-index]").dataset.automationIndex)
+    let autom = foundry.utils.duplicate(this.document.system.automations)
+    autom.splice(index, 1)
+    await this.document.update({ 'system.automations': autom })
+  }
+  // #endregion
+
+  // #region Helper Methods
+  /**
+   * Get list of attributs
+   * @returns {Object}
+   * @private
+   */
+  #getAttributs() {
+    return {
+      "adr": "Adresse",
+      "pui": "Puissance",
+      "cla": "Clairvoyance",
+      "pre": "Présence",
+      "tre": "Trempe"
+    }
+  }
+  // #endregion
+
+  /** @override */
+  _onChangeForm(formConfig, event) {
+    // Handle special form changes
+    const target = event.target
+
+    // Handle predilection field changes
+    if (target.classList.contains('edit-predilection') ||
+      target.classList.contains('edit-predilection-description') ||
+      target.classList.contains('predilection-acquise') ||
+      target.classList.contains('predilection-maitrise') ||
+      target.classList.contains('predilection-used')) {
+      const li = target.closest('.prediction-item')
+      if (li) {
+        const index = parseInt(li.dataset.predictionIndex)
+        const field = target.classList.contains('edit-predilection') ? 'name' :
+          target.classList.contains('edit-predilection-description') ? 'description' :
+            target.classList.contains('predilection-acquise') ? 'acquise' :
+              target.classList.contains('predilection-maitrise') ? 'maitrise' : 'used'
+
+        let pred = foundry.utils.duplicate(this.document.system.predilections)
+        if (target.type === 'checkbox') {
+          pred[index][field] = target.checked
+        } else {
+          pred[index][field] = target.value
+        }
+        pred[index].id = pred[index].id || foundry.utils.randomID(16)
+        this.document.update({ 'system.predilections': pred })
+        return
+      }
+    }
+
+    // Handle automation field changes
+    if (target.classList.contains('automation-edit-field')) {
+      const index = parseInt(target.dataset.automationIndex)
+      const field = target.dataset.automationField
+      let auto = foundry.utils.duplicate(this.document.system.automations)
+      auto[index][field] = target.value
+      auto[index].id = auto[index].id || foundry.utils.randomID(16)
+      this.document.update({ 'system.automations': auto })
+      return
+    }
+
+    super._onChangeForm(formConfig, event)
+  }
+}

modules/applications/sheets/cellule-sheet.mjs

@@ -0,0 +1,142 @@
+import HawkmoonActorSheet from "./base-actor-sheet.mjs"
+
+const __ALLOWED_ITEM_CELLULE = { talent: 1, ressource: 1, contact: 1, equipement: 1, protection: 1, artefact: 1, arme: 1, monnaie: 1 }
+
+export default class HawkmoonCelluleSheet extends HawkmoonActorSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    ...super.DEFAULT_OPTIONS,
+    classes: [...super.DEFAULT_OPTIONS.classes],
+    window: {
+      ...super.DEFAULT_OPTIONS.window,
+      title: "SHEETS.Actor.cellule",
+    },
+    actions: {
+      ...super.DEFAULT_OPTIONS.actions,
+      editActor: HawkmoonCelluleSheet.#onEditActor,
+      deleteActor: HawkmoonCelluleSheet.#onDeleteActor,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    sheet: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/cellule-sheet.hbs",
+    },
+  }
+
+  /** @override */
+  tabGroups = { primary: "talents" }
+
+  /** @override */
+  async _prepareContext() {
+    const context = await super._prepareContext()
+    const actor = this.document
+
+    // Add cellule-specific data
+    context.talents = foundry.utils.duplicate(actor.getTalents() || {})
+    context.ressources = foundry.utils.duplicate(actor.getRessources ? actor.getRessources() : [])
+    context.contacts = foundry.utils.duplicate(actor.getContacts ? actor.getContacts() : [])
+    context.members = this.#getMembers()
+    context.equipements = foundry.utils.duplicate(actor.getEquipments ? actor.getEquipments() : [])
+    context.artefacts = foundry.utils.duplicate(actor.getArtefacts ? actor.getArtefacts() : [])
+    context.armes = foundry.utils.duplicate(actor.getWeapons ? actor.getWeapons() : [])
+    context.monnaies = foundry.utils.duplicate(actor.getMonnaies ? actor.getMonnaies() : [])
+    context.protections = foundry.utils.duplicate(actor.getArmors ? actor.getArmors() : [])
+    context.richesse = actor.computeRichesse ? actor.computeRichesse() : 0
+    context.valeurEquipement = actor.computeValeurEquipement ? actor.computeValeurEquipement() : 0
+    context.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(actor.system.description || "", { async: true })
+
+    return context
+  }
+
+  /**
+   * Get members of the cellule with full actor data
+   * @returns {Array}
+   * @private
+   */
+  #getMembers() {
+    let membersFull = []
+    for (let memberId of this.actor.system.members) {
+      let actor = game.actors.get(memberId)
+      if (actor) {
+        membersFull.push({ name: actor.name, id: actor.id, img: actor.img })
+      }
+    }
+    return membersFull
+  }
+
+  /**
+   * Override _onDropItem to filter allowed item types for cellule
+   * @override
+   */
+  async _onDropItem(event, data) {
+    const item = await fromUuid(data.uuid)
+
+    // Check if item type is allowed for cellule
+    if (!__ALLOWED_ITEM_CELLULE[item.type]) {
+      ui.notifications.warn(`Le type d'item ${item.type} n'est pas autorisé pour une cellule`)
+      return false
+    }
+
+    return super._onDropItem(event, data)
+  }
+
+  /**
+   * Override _onDropActor to handle adding members
+   * @override
+   */
+  async _onDropActor(event, data) {
+    const droppedActor = await fromUuid(data.uuid)
+
+    if (droppedActor.type !== "personnage") {
+      ui.notifications.warn("Seuls les personnages peuvent être ajoutés à une cellule")
+      return false
+    }
+
+    // Check if already a member
+    const isMember = this.actor.system.members.includes(droppedActor.id)
+    if (isMember) {
+      ui.notifications.warn("Ce personnage est déjà membre de cette cellule")
+      return false
+    }
+
+    // Add member ID
+    const members = [...this.actor.system.members, droppedActor.id]
+    await this.actor.update({ "system.members": members })
+    return true
+  }
+
+  // #region Cellule-specific Actions
+
+  /**
+   * Edit an actor (member)
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onEditActor(event, target) {
+    const li = target.closest(".item")
+    const actorId = li?.dataset.actorId
+    if (!actorId) return
+    const actor = game.actors.get(actorId)
+    if (actor) actor.sheet.render(true)
+  }
+
+  /**
+   * Delete an actor (remove member)
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onDeleteActor(event, target) {
+    const li = target.closest(".item")
+    const actorId = li?.dataset.actorId
+    if (actorId) {
+      const members = this.actor.system.members.filter(id => id !== actorId)
+      await this.actor.update({ "system.members": members })
+    }
+  }
+
+  // #endregion
+}

modules/applications/sheets/competence-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonCompetenceSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["competence"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["competence-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-competence-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/contact-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonContactSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["contact"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["contact-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-contact-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/creature-sheet.mjs

@@ -0,0 +1,60 @@
+import HawkmoonActorSheet from "./base-actor-sheet.mjs"
+import { HawkmoonUtility } from "../../hawkmoon-utility.js"
+
+export default class HawkmoonCreatureSheet extends HawkmoonActorSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    ...super.DEFAULT_OPTIONS,
+    classes: [...super.DEFAULT_OPTIONS.classes],
+    window: {
+      ...super.DEFAULT_OPTIONS.window,
+      title: "SHEETS.Actor.creature",
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    sheet: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/creature-sheet.hbs",
+    },
+  }
+
+  /** @override */
+  tabGroups = { primary: "principal" }
+
+  /** @override */
+  async _prepareContext() {
+    const context = await super._prepareContext()
+    const actor = this.document
+
+    // Add creature-specific data
+    context.skills = actor.getSkills ? actor.getSkills() : []
+    context.armes = foundry.utils.duplicate(actor.getWeapons ? actor.getWeapons() : [])
+    context.protections = foundry.utils.duplicate(actor.getArmors ? actor.getArmors() : [])
+    context.combat = actor.getCombatValues ? actor.getCombatValues() : {}
+    context.equipements = foundry.utils.duplicate(actor.getEquipments ? actor.getEquipments() : [])
+    context.talents = foundry.utils.duplicate(actor.getTalents ? actor.getTalents() : [])
+    context.talentsCell = this.#getCelluleTalents()
+    context.nbCombativite = actor.system.sante?.nbcombativite || 0
+    context.combativiteList = HawkmoonUtility.getCombativiteList(actor.system.sante?.nbcombativite || 0)
+    context.initiative = actor.getFlag("world", "last-initiative") || -1
+    context.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(actor.system.biodata?.description || "", { async: true })
+    context.enrichedHabitat = await foundry.applications.ux.TextEditor.implementation.enrichHTML(actor.system.biodata?.habitat || "", { async: true })
+
+    return context
+  }
+
+  /**
+   * Get talents from attached cellule
+   * @private
+   */
+  #getCelluleTalents() {
+    const celluleId = this.actor.system?.details?.celluleid
+    if (!celluleId) return []
+
+    const cellule = game.actors.get(celluleId)
+    if (!cellule) return []
+
+    return foundry.utils.duplicate(cellule.getTalents?.() || [])
+  }
+}

modules/applications/sheets/equipement-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonEquipementSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["equipement"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["equipement-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-equipement-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/historique-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonHistoriqueSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["historique"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["historique-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-historique-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/monnaie-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonMonnaieSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["monnaie"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["monnaie-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-monnaie-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/mutation-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonMutationSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["mutation"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["mutation-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-mutation-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/personnage-sheet.mjs

@@ -0,0 +1,104 @@
+import HawkmoonActorSheet from "./base-actor-sheet.mjs"
+import { HawkmoonUtility } from "../../hawkmoon-utility.js"
+
+export default class HawkmoonPersonnageSheet extends HawkmoonActorSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    ...super.DEFAULT_OPTIONS,
+    classes: [...super.DEFAULT_OPTIONS.classes],
+    window: {
+      ...super.DEFAULT_OPTIONS.window,
+      title: "SHEETS.Actor.personnage",
+    },
+    actions: {
+      ...super.DEFAULT_OPTIONS.actions,
+      openCellule: HawkmoonPersonnageSheet.#onOpenCellule,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    sheet: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/actor-sheet.hbs",
+    },
+  }
+
+  /** @override */
+  tabGroups = { primary: "principal" }
+
+  /** @override */
+  async _prepareContext() {
+    const context = await super._prepareContext()
+    const actor = this.document
+
+    // Add personnage-specific data
+    context.skills = actor.getSkills()
+    context.armes = foundry.utils.duplicate(actor.getWeapons())
+    context.monnaies = foundry.utils.duplicate(actor.getMonnaies())
+    context.protections = foundry.utils.duplicate(actor.getArmors())
+    context.historiques = foundry.utils.duplicate(actor.getHistoriques() || [])
+    context.talents = foundry.utils.duplicate(actor.getTalents() || [])
+    context.mutations = foundry.utils.duplicate(actor.getMutations() || [])
+    context.talentsCell = this.#getCelluleTalents()
+    context.celluleId = this.#getCelluleId()
+    context.profils = foundry.utils.duplicate(actor.getProfils() || [])
+    context.combat = actor.getCombatValues()
+    context.equipements = foundry.utils.duplicate(actor.getEquipments())
+    context.artefacts = foundry.utils.duplicate(actor.getArtefacts())
+    context.richesse = actor.computeRichesse()
+    context.coupDevastateur = actor.items.find(it => it.type == "talent" && it.name.toLowerCase() == "coup devastateur" && !it.system.used)
+    context.valeurEquipement = actor.computeValeurEquipement()
+    context.nbCombativite = actor.system.sante.nbcombativite
+    context.combativiteList = HawkmoonUtility.getCombativiteList(actor.system.sante.nbcombativite)
+    context.initiative = actor.getFlag("world", "last-initiative") || -1
+
+    return context
+  }
+
+  /**
+   * Get talents from cellules this actor is a member of
+   * @returns {Array}
+   * @private
+   */
+  #getCelluleTalents() {
+    let talents = []
+    for (let cellule of game.actors) {
+      if (cellule.type == "cellule") {
+        let found = cellule.system.members.includes(this.actor.id)
+        if (found) {
+          talents = talents.concat(cellule.getTalents())
+        }
+      }
+    }
+    return talents
+  }
+
+  /**
+   * Get the ID of the cellule this actor is a member of
+   * @returns {string|null}
+   * @private
+   */
+  #getCelluleId() {
+    for (let cellule of game.actors) {
+      if (cellule.type == "cellule") {
+        if (cellule.system.members.includes(this.actor.id)) {
+          return cellule.id
+        }
+      }
+    }
+    return null
+  }
+
+  /**
+   * Open cellule sheet
+   * @param {Event} event
+   * @param {HTMLElement} target
+   * @private
+   */
+  static async #onOpenCellule(event, target) {
+    const celluleId = target.dataset.celluleId
+    if (!celluleId) return
+    const cellule = game.actors.get(celluleId)
+    if (cellule) cellule.sheet.render(true)
+  }
+}

modules/applications/sheets/profil-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonProfilSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["profil"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["profil-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-profil-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/protection-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonProtectionSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["protection"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["protection-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-protection-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/ressource-sheet.mjs

@@ -0,0 +1,21 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonRessourceSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["ressource"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["ressource-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-ressource-sheet.hbs",
+    },
+  }
+}

modules/applications/sheets/talent-sheet.mjs

@@ -0,0 +1,51 @@
+import HawkmoonItemSheet from "./base-item-sheet.mjs"
+
+export default class HawkmoonTalentSheet extends HawkmoonItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["talent"],
+    position: {
+      width: 620,
+    },
+    window: {
+      contentClasses: ["talent-content"],
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    main: {
+      template: "systems/fvtt-hawkmoon-cyd/templates/item-talent-sheet.hbs",
+    },
+  }
+
+  /** @override */
+  tabGroups = {
+    primary: "description",
+  }
+
+  /**
+   * Prepare an array of form header tabs.
+   * @returns {Record<string, Partial<ApplicationTab>>}
+   */
+  #getTabs() {
+    const tabs = {
+      details: { id: "details", group: "primary", label: "Détails" },
+      description: { id: "description", group: "primary", label: "Description" }
+    }
+    for (const v of Object.values(tabs)) {
+      v.active = this.tabGroups[v.group] === v.id
+      v.cssClass = v.active ? "active" : ""
+    }
+    return tabs
+  }
+
+  /** @override */
+  async _prepareContext() {
+    const context = await super._prepareContext()
+    context.tabs = this.#getTabs()
+    context.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.description, { async: true })
+    return context
+  }
+
+}

modules/hawkmoon-actor.js

@@ -1,6 +1,6 @@
 /* -------------------------------------------- */
 import { HawkmoonUtility } from "./hawkmoon-utility.js";
-import { HawkmoonRollDialog } from "./hawkmoon-roll-dialog.js";
+import { HawkmoonRollDialog } from "./applications/hawkmoon-roll-dialog.mjs";
 
 /* -------------------------------------------- */
 const __degatsBonus = [-2, -2, -1, -1, 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 9, 9, 10, 10]
@@ -17,8 +17,8 @@ export class HawkmoonActor extends Actor {
   /**
    * Override the create() function to provide additional SoS functionality.
    *
-   * This overrided create() function adds initial items 
-   * Namely: Basic skills, money, 
+   * This overrided create() function adds initial items
+   * Namely: Basic skills, money,
    *
    * @param {Object} data        Barebones actor data which this function adds onto.
    * @param {Object} options     (Unused) Additional options which customize the creation workflow.
@@ -41,7 +41,11 @@ export class HawkmoonActor extends Actor {
       const skills = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.skills")
       data.items = skills.map(i => i.toObject())
     }
-    if (data.type == 'pnj') {
+    if (data.type == 'creature') {
+      const skills = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.skills-creatures")
+      data.items = skills.map(i => i.toObject())
+      data.items.push({ name: "Arme naturelle 1", type: 'arme', img: "systems/fvtt-hawkmoon-cyd/assets/icons/melee.webp", system: { typearme: "contact", bonusmaniementoff: 0, seuildefense: 0, degats: "0" } })
+      data.items.push({ name: "Arme naturelle 2", type: 'arme', img: "systems/fvtt-hawkmoon-cyd/assets/icons/melee.webp", system: { typearme: "contact", bonusmaniementoff: 0, seuildefense: 0, degats: "0" } })
     }
 
     return super.create(data, options);
@@ -63,22 +67,31 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   prepareArme(arme) {
-    arme = duplicate(arme)
+    if (this.type == "cellule") {
+      return arme
+    }
+
+    arme = foundry.utils.duplicate(arme)
     let combat = this.getCombatValues()
     if (arme.system.typearme == "contact" || arme.system.typearme == "contactjet") {
       let bonusDefense = this.getBonusDefenseFromTalents()
-      arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
+      arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
       arme.system.attrKey = "pui"
       arme.system.totalDegats = arme.system.degats + "+" + combat.bonusDegatsTotal
-      arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
-      arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense
+      arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff + (this.system.combat.monte ? 3 : 0)
+      arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + (this.system.combat.monte ? 3 : 0)
+      console.log("Arme", arme.system.totalDefensif, combat, arme.system.competence.system.niveau, arme.system.seuildefense, bonusDefense)
       arme.system.isdefense = true
+      arme.system.isMelee = true
+      arme.system.isDistance = false
     }
     if (arme.system.typearme == "jet" || arme.system.typearme == "tir") {
-      arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
+      arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
       arme.system.attrKey = "adr"
       arme.system.totalOffensif = this.system.attributs.adr.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
       arme.system.totalDegats = arme.system.degats
+      arme.system.isMelee = false
+      arme.system.isDistance = true
       if (arme.system.isdefense) {
         arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense
       }
@@ -87,6 +100,11 @@ export class HawkmoonActor extends Actor {
   }
 
   /* -------------------------------------------- */
+  getItemSorted(types) {
+    let items = this.items.filter(item => types.includes(item.type)) || []
+    HawkmoonUtility.sortArrayObjectsByName(items)
+    return items
+  }
   getWeapons() {
     let armes = []
     for (let arme of this.items) {
@@ -94,60 +112,45 @@ export class HawkmoonActor extends Actor {
         armes.push(this.prepareArme(arme))
       }
     }
+    HawkmoonUtility.sortArrayObjectsByName(armes)
     return armes
   }
-  /* -------------------------------------------- */
   getMonnaies() {
-    return this.items.filter( it => it.type == "monnaie")
+    return this.getItemSorted(["monnaie"])
   }
-
-  /* -----------------------  --------------------- */
-  addMember( actorId) {
-    let members = duplicate(this.system.members)
-    members.push( {id: actorId} )
-    this.update ({'system.members': members})
-  }
-  async removeMember(actorId) {    
-    let members = this.system.members.filter(it => it.id != actorId )
-    this.update ({'system.members': members})
-  }
-
-  /* -----------------------  --------------------- */
   getEquipments() {
-    return this.items.filter(item => item.type == "equipement")
+    return this.getItemSorted(["equipement"])
   }
-  /* -----------------------  --------------------- */
   getArtefacts() {
-    return this.items.filter(item => item.type == "artefact")
+    return this.getItemSorted(["artefact"])
   }
-  /* -----------------------  --------------------- */
-  getMonnaies() {
-    return this.items.filter(item => item.type == "monnaie")
-  }
-  /* -------------------------------------------- */
   getArmors() {
-    return this.items.filter(item => item.type == "protection")
+    return this.getItemSorted(["protection"])
   }
-  getHistorique() {
-    return this.items.find(item => item.type == "historique")
+  getHistoriques() {
+    return this.getItemSorted(["historique"])
   }
   getProfils() {
-    return this.items.filter(item => item.type == "profil")
+    return this.getItemSorted(["profil"])
   }
   getTalents() {
-    return this.items.filter(item => item.type == "talent")
+    return this.getItemSorted(["talent"])
   }
   getRessources() {
-    return this.items.filter(item => item.type == "ressource")
+    return this.getItemSorted(["ressource"])
   }
   getContacts() {
-    return this.items.filter(item => item.type == "contact")
+    return this.getItemSorted(["contact"])
   }
+  getMutations() {
+    return this.getItemSorted(["mutation"])
+  }
+
   /* -------------------------------------------- */
   getSkills() {
     let comp = []
     for (let item of this.items) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
       if (item.type == "competence") {
         item.system.attribut1total = item.system.niveau + (this.system.attributs[item.system.attribut1]?.value || 0)
         item.system.attribut2total = item.system.niveau + (this.system.attributs[item.system.attribut2]?.value || 0)
@@ -163,22 +166,24 @@ export class HawkmoonActor extends Actor {
         comp.push(item)
       }
     }
-    return comp.sort(function (a, b) {
-      let fa = a.name.toLowerCase(),
-        fb = b.name.toLowerCase();
-      if (fa < fb) {
-        return -1;
-      }
-      if (fa > fb) {
-        return 1;
-      }
-      return 0;
-    })
+    HawkmoonUtility.sortArrayObjectsByName(comp)
+    return comp
+  }
+
+  /* -----------------------  --------------------- */
+  addMember(actorId) {
+    let members = foundry.utils.duplicate(this.system.members)
+    members.push({ id: actorId })
+    this.update({ 'system.members': members })
+  }
+  async removeMember(actorId) {
+    let members = this.system.members.filter(it => it.id != actorId)
+    this.update({ 'system.members': members })
   }
 
   /* -------------------------------------------- */
   getDefenseBase() {
-    return Math.max(this.system.attributs.tre.value, this.system.attributs.pui.value)
+    return Math.max(this.system.attributs.tre.value, this.system.attributs.adr.value)
   }
 
   /* -------------------------------------------- */
@@ -188,7 +193,7 @@ export class HawkmoonActor extends Actor {
   /* -------------------------------------------- */
   getProtection() {
     let equipProtection = 0
-    for(let armor in this.items) {
+    for (let armor of this.items) {
       if (armor.type == "protection" && armor.system.equipped) {
         equipProtection += Number(armor.system.protection)
       }
@@ -201,6 +206,20 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   getCombatValues() {
+    if (this.type == "cellule") {
+      return {
+        initBase: 0,
+        initTotal: 0,
+        bonusDegats: 0,
+        bonusDegatsTotal: 0,
+        vitesseBase: 0,
+        vitesseTotal: 0,
+        defenseBase: 0,
+        protection: 0,
+        defenseTotal: 0
+      }
+    }
+
     let combat = {
       initBase: this.system.attributs.adr.value,
       initTotal: this.system.attributs.adr.value + this.system.combat.initbonus,
@@ -209,8 +228,8 @@ export class HawkmoonActor extends Actor {
       vitesseBase: this.getVitesseBase(),
       vitesseTotal: this.getVitesseBase() + this.system.combat.vitessebonus,
       defenseBase: this.getDefenseBase(),
-      protection : this.getProtection(),
-      defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite()
+      protection: this.getProtection(),
+      defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite() + (this.system.combat.defensetotale ? 3 : 0)
     }
     return combat
   }
@@ -229,26 +248,33 @@ export class HawkmoonActor extends Actor {
 
     if (this.type == 'personnage') {
       let talentBonus = this.getVigueurBonus()
-      let vigueur = Math.floor((this.system.attributs.pui.value + this.system.attributs.tre.value) / 2) + talentBonus
+      let vigueur = Math.floor((this.system.attributs.pui.value + this.system.attributs.tre.value) / 2) + talentBonus + this.system.sante.vigueurmodifier
       if (vigueur != this.system.sante.vigueur) {
         this.update({ 'system.sante.vigueur': vigueur })
       }
     }
-
     super.prepareDerivedData()
   }
 
   /* -------------------------------------------- */
   _preUpdate(changed, options, user) {
-
+    if (changed?.system?.sante?.etat && changed?.system?.sante?.etat != this.system.sante.etat) {
+      setTimeout(() => {
+        this.processCombativite(changed.system.sante)
+      }, 800)
+    }
     super._preUpdate(changed, options, user);
   }
 
+  /* -------------------------------------------- */
+  _onUpdate(data, options, user) {
+    super._onUpdate(data, options, user);
+  }
   /* -------------------------------------------- */
   getItemById(id) {
     let item = this.items.find(item => item.id == id);
     if (item) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
     }
     return item;
   }
@@ -281,7 +307,7 @@ export class HawkmoonActor extends Actor {
   checkAttribut(attribut, minLevel) {
     let attr = this.system.attributs.find(at => at.labelnorm == attribut.toLowerCase())
     if (attr && attr.value >= minLevel) {
-      return { isValid: true, attr: duplicate(attr) }
+      return { isValid: true, attr: foundry.utils.duplicate(attr) }
     }
     return { isValid: false }
   }
@@ -289,11 +315,11 @@ export class HawkmoonActor extends Actor {
   checkAttributOrCompetenceLevel(compName, minLevel) {
     let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase() && i.system.niveau >= minLevel)
     if (comp) {
-      return { isValid: true, item: duplicate(comp) }
+      return { isValid: true, item: foundry.utils.duplicate(comp) }
     } else {
       for (let attrKey in this.system.attributs) {
         if (this.system.attributs[attrKey].label.toLowerCase() == compName.toLowerCase() && this.system.attributs[attrKey].value >= minLevel) {
-          return { isValid: true, item: duplicate(this.system.attributs[attrKey]) }
+          return { isValid: true, item: foundry.utils.duplicate(this.system.attributs[attrKey]) }
         }
       }
     }
@@ -303,7 +329,7 @@ export class HawkmoonActor extends Actor {
   addCompetenceBonus(compName, bonus, baCost) {
     let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase())
     if (comp) {
-      comp = duplicate(comp)
+      comp = foundry.utils.duplicate(comp)
       comp.system.bonus = bonus
       comp.system.baCost = baCost
       return { isValid: true, item: comp }
@@ -382,13 +408,45 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   getBonusDegats() {
-    return 0; 
+    return 0;
+  }
+
+  /* -------------------------------------------- */
+  changeEtatCombativite(value) {
+    if (value === "vaincu") {
+      value = 200
+    }
+    let sante = foundry.utils.duplicate(this.system.sante)
+    sante.etat += Number(value)
+    sante.etat = Math.max(sante.etat, 0)
+    sante.etat = Math.min(sante.etat, this.system.sante.nbcombativite)
+    this.update({ 'system.sante': sante })
+    if (sante.etat == this.system.sante.nbcombativite) {
+      ChatMessage.create({ content: `<strong>${this.name} est vaincu !</strong>` })
+    }
+    // Duplicated ! this.processCombativite(sante)
+  }
+
+  /* -------------------------------------------- */
+  processCombativite(sante) {
+    sante = sante || foundry.utils.duplicate(this.system.sante)
+    // Gestion des états affaibli et très affaibli
+    if (sante.etat == this.system.sante.nbcombativite - 2 || sante.etat == this.system.sante.nbcombativite - 1) {
+      if (sante.etat == this.system.sante.nbcombativite - 2 && this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "encaissement")) {
+        ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Encaissement. Pensez à les ajouter à la fin de la scène !</strong>` })
+      } else if (sante.etat == this.system.sante.nbcombativite - 1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) {
+        ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Vaillant. Pensez à les ajouter à la fin de la scène !</strong>` })
+      } else {
+        ChatMessage.create({ content: `<strong>${this.name} subit 2 adversités rouge !</strong>` })
+        this.incDecAdversite("rouge", 2)
+      }
+    }
   }
 
   /* -------------------------------------------- */
   async equipGear(equipmentId) {
     let item = this.items.find(item => item.id == equipmentId);
-    if (item && item.system.data) {
+    if (item?.system?.data) {
       let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
@@ -398,13 +456,13 @@ export class HawkmoonActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)));
+      subActors.push(foundry.utils.duplicate(game.actors.get(id)));
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.system.subactors);
+    let subActors = foundry.utils.duplicate(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
@@ -426,9 +484,10 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   async incDecAdversite(adv, incDec = 0) {
-    let adversite = duplicate(this.system.adversite)
+    let adversite = foundry.utils.duplicate(this.system.adversite)
     adversite[adv] += Number(incDec)
     adversite[adv] = Math.max(adversite[adv], 0)
+    adversite[adv] = Math.min(adversite[adv], 20)
     this.update({ 'system.adversite': adversite })
   }
   /* -------------------------------------------- */
@@ -437,34 +496,34 @@ export class HawkmoonActor extends Actor {
     if (objetQ) {
       let newQ = objetQ.system.quantite + incDec
       newQ = Math.max(newQ, 0)
-      const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
+      await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
     }
   }
 
   /* -------------------------------------------- */
   computeRichesse() {
     let valueSC = 0
-    for(let monnaie of this.items) {
+    for (let monnaie of this.items) {
       if (monnaie.type == "monnaie") {
-        valueSC += Number(monnaie.system.prixsc) * Number(monnaie.system.quantite) 
+        valueSC += Number(monnaie.system.prixsc) * Number(monnaie.system.quantite)
       }
     }
-    return HawkmoonUtility.computeMonnaieDetails( valueSC)
+    return HawkmoonUtility.computeMonnaieDetails(valueSC)
   }
 
   /* -------------------------------------------- */
   computeValeurEquipement() {
     let valueSC = 0
-    for(let equip of this.items) {
+    for (let equip of this.items) {
       if (equip.type == "equipement" || equip.type == "arme" || equip.type == "protection") {
-        valueSC += Number(equip.system.prixsc) * Number(equip.system.quantite ?? 1) 
-        valueSC += (Number(equip.system.prixca) * Number(equip.system.quantite ?? 1)) * 20 
-        valueSC += (Number(equip.system.prixpo) * Number(equip.system.quantite ?? 1)) * 400 
+        valueSC += Number(equip.system.prixsc) * Number(equip.system.quantite ?? 1)
+        valueSC += (Number(equip.system.prixca) * Number(equip.system.quantite ?? 1)) * 20
+        valueSC += (Number(equip.system.prixpo) * Number(equip.system.quantite ?? 1)) * 400
       }
     }
-    return HawkmoonUtility.computeMonnaieDetails( valueSC)
+    return HawkmoonUtility.computeMonnaieDetails(valueSC)
   }
-  
+
   /* -------------------------------------------- */
   getCompetence(compId) {
     return this.items.get(compId)
@@ -473,7 +532,7 @@ export class HawkmoonActor extends Actor {
   /* -------------------------------------------- */
   async setPredilectionUsed(compId, predIdx) {
     let comp = this.items.get(compId)
-    let pred = duplicate(comp.system.predilections)
+    let pred = foundry.utils.duplicate(comp.system.predilections)
     pred[predIdx].used = true
     await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'system.predilections': pred }])
   }
@@ -484,18 +543,35 @@ export class HawkmoonActor extends Actor {
     return init || -1
   }
 
+  /* -------------------------------------------- */
+  getBestAttackValue() {
+    let attackList = this.items.filter(item => (item.type == "arme" || item.type == "talent") && item.system.equipped)
+    let maxOff = 0
+    let bestArme
+    for (let arme of attackList) {
+      if (arme.type == "arme") {
+        arme = this.prepareArme(arme)
+      }
+      if (arme.system.totalOffensif > maxOff) {
+        maxOff = arme.system.totalOffensif
+        bestArme = foundry.utils.duplicate(arme)
+      }
+    }
+    return bestArme
+  }
+
   /* -------------------------------------------- */
   getBestDefenseValue() {
     let defenseList = this.items.filter(item => (item.type == "arme") && item.system.equipped)
     let maxDef = 0
     let bestArme
     for (let arme of defenseList) {
-      if (arme.type == "arme" ) {
+      if (arme.type == "arme") {
         arme = this.prepareArme(arme)
       }
       if (arme.system.totalDefensif > maxDef) {
         maxDef = arme.system.totalDefensif
-        bestArme = duplicate(arme)
+        bestArme = foundry.utils.duplicate(arme)
       }
     }
     return bestArme
@@ -510,7 +586,7 @@ export class HawkmoonActor extends Actor {
         for (let auto of talent.system.automations) {
           if (auto.eventtype === "prepare-roll") {
             if (auto.competence.toLowerCase() == competence.name.toLowerCase()) {
-              talent = duplicate(talent)
+              talent = foundry.utils.duplicate(talent)
               talent.system.bonus = auto.bonus
               talent.system.baCost = auto.baCost
               talents.push(talent)
@@ -541,22 +617,34 @@ export class HawkmoonActor extends Actor {
     rollData.nbBA = this.system.bonneaventure.actuelle
     rollData.nbAdversites = this.getTotalAdversite()
     rollData.talents = []
+    rollData.attrKey2 = "none"
+    rollData.coupDevastateur = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used)
+    rollData.hasAmbidextre = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "ambidextre")
+    rollData.hasFeinte = this.system.bonneaventure.actuelle > 0 && this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "feinte")
+    rollData.isMonte = this.system.combat.monte
+    rollData.config = game.system.hawkmoon.config
 
     if (attrKey) {
       rollData.attrKey = attrKey
       if (attrKey != "tochoose") {
         rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + this.system.attributs[attrKey].labelnorm + ".webp"
-        rollData.attr = duplicate(this.system.attributs[attrKey])
+        rollData.attr = foundry.utils.duplicate(this.system.attributs[attrKey])
       }
     }
     if (compId) {
-      rollData.competence = duplicate(this.items.get(compId) || {})
-      rollData.maitrises = rollData.competence.system.predilections.filter(p => p.maitrise)
+      rollData.competence = foundry.utils.duplicate(this.items.get(compId) || {})
+      let maitrises = [{ key: "none", label: "Aucune" }]
+      rollData.competence.system.predilections.forEach(function (item) {
+        if (item.maitrise) {
+          maitrises.push({ key: item.id, label: item.name });
+        }
+      })
+      rollData.maitrises = maitrises // rollData.competence.system.predilections.filter(p => p.maitrise)
       rollData.actionImg = rollData.competence?.img
       rollData.talents = this.searchRelevantTalents(rollData.competence)
     }
     if (compName) {
-      rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
+      rollData.competence = foundry.utils.duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
       rollData.actionImg = rollData.competence?.img
     }
     return rollData
@@ -564,11 +652,10 @@ export class HawkmoonActor extends Actor {
 
   /* -------------------------------------------- */
   async rollAttribut(attrKey, isInit = false) {
-    let rollData = this.getCommonRollData(attrKey)    
-    rollData.multiplier = (isInit)? 1 : 2
+    let rollData = this.getCommonRollData(attrKey)
+    rollData.multiplier = (isInit) ? 1 : 2
     rollData.isInit = isInit
-    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
-    rollDialog.render(true)
+    await HawkmoonRollDialog.create(this, rollData)
   }
 
   /* -------------------------------------------- */
@@ -576,50 +663,137 @@ export class HawkmoonActor extends Actor {
     let rollData = this.getCommonRollData(attrKey, compId)
     rollData.multiplier = 1 // Attr multiplier, always 1 in competence mode
     console.log("RollDatra", rollData)
-    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
-    rollDialog.render(true)
+    await HawkmoonRollDialog.create(this, rollData)
   }
 
   /* -------------------------------------------- */
   async rollArmeOffensif(armeId) {
     let arme = this.items.get(armeId)
+    if (!arme.system.equipped) {
+      ui.notifications.warn("Cette arme doit être équipée pour pouvoir attaquer !")
+      return
+    }
     if (arme.type == "arme") {
       arme = this.prepareArme(arme)
     }
+    if (!arme.system.competence) {
+      ui.notifications.warn("Aucune compétence trouvée pour cette arme !")
+      return
+    }
     let rollData = this.getCommonRollData(arme.system.attrKey, arme.system.competence._id)
     rollData.arme = arme
+    rollData.isCombat = true
+    rollData.isTir = arme.system.isDistance || false
     HawkmoonUtility.updateWithTarget(rollData)
     console.log("ARME!", rollData)
-    let rollDialog = await HawkmoonRollDialog.create(this, rollData)
-    rollDialog.render(true)
+    await HawkmoonRollDialog.create(this, rollData)
+  }
+  /* -------------------------------------------- */
+  async rollAssommer() {
+    let rollData = this.getCommonRollData("pui", undefined, "Filouterie")
+    rollData.assomer = true
+    rollData.conditionsCommunes = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    await HawkmoonRollDialog.create(this, rollData)
+  }
+  /* -------------------------------------------- */
+  async rollCoupBas() {
+    let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
+    rollData.coupBas = true
+    rollData.conditionsCommunes = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    await HawkmoonRollDialog.create(this, rollData)
+  }
+  /* -------------------------------------------- */
+  async rollImmobiliser() {
+    let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
+    rollData.immobiliser = true
+    rollData.conditionsCommunes = true
+    rollData.cibleconsciente = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    await HawkmoonRollDialog.create(this, rollData)
+  }
+  /* -------------------------------------------- */
+  async rollRepousser() {
+    let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
+    rollData.repousser = true
+    rollData.conditionsCommunes = true
+    rollData.cibleconsciente = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    await HawkmoonRollDialog.create(this, rollData)
+  }
+  /* -------------------------------------------- */
+  async rollDesengager() {
+    let rollData = this.getCommonRollData("adr", undefined, "Mouvements")
+    rollData.desengager = true
+    rollData.conditionsCommunes = true
+    HawkmoonUtility.updateWithTarget(rollData)
+    await HawkmoonRollDialog.create(this, rollData)
   }
 
   /* -------------------------------------------- */
-  async rollArmeDegats(armeId, targetVigueur = undefined) {
+  async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) {
     let arme = this.items.get(armeId)
+    if (!arme.system.equipped) {
+      ui.notifications.warn("Cette arme doit être équipée pour pouvoir infliger des dégâts !")
+      return
+    }
     if (arme.type == "arme") {
       arme = this.prepareArme(arme)
     }
-    console.log("DEGATS", arme)
-    let roll = new Roll( "1d10+"+arme.system.totalDegats).roll({ async: false })
+    console.log("DEGATS", arme, targetVigueur, rollDataInput)
+    let roll
+    let bonus = 0
+    let bonus2 = 0
+
+    if (rollDataInput?.applyCoupDevastateur) {
+      bonus2 = Math.floor(this.system.attributs.pui.value / 2)
+      let talent = this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "coup dévastateur")
+      this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }])
+    }
+
+    if (rollDataInput?.isHeroique) {
+      if (rollDataInput?.attaqueCharge) {
+        bonus = 5
+      }
+      if (rollDataInput?.chargeCavalerie) {
+        bonus = 6
+      }
+      roll = await new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll()
+    } else {
+      if (rollDataInput?.attaqueCharge) {
+        bonus = 3
+      }
+      if (rollDataInput?.chargeCavalerie) {
+        bonus = 4
+      }
+      roll = await new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll()
+    }
     await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
-    let nbEtatPerdus = 0 
+    let nbEtatPerdus = 0
     if (targetVigueur) {
       nbEtatPerdus = Math.floor(roll.total / targetVigueur)
     }
+    //console.log(roll)
     let rollData = {
       arme: arme,
       finalResult: roll.total,
+      formula: roll.formula,
       alias: this.name,
       actorImg: this.img,
       actorId: this.id,
+      defenderTokenId: rollDataInput?.defenderTokenId,
       actionImg: arme.img,
       targetVigueur: targetVigueur,
       nbEtatPerdus: nbEtatPerdus
     }
     HawkmoonUtility.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-degats-result.html`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-degats-result.hbs`, rollData)
     })
 
+    if (rollDataInput?.defenderTokenId && nbEtatPerdus) {
+      HawkmoonUtility.applyCombativite(rollDataInput, nbEtatPerdus)
+    }
+
   }
 }

modules/hawkmoon-automation.js

@@ -14,10 +14,10 @@ export class HawkmoonAutomation {
     this.__objectTypes = { }
     
     Object.entries(game.data.model.Actor).forEach(kv => { 
-      this.__objectTypes[kv[0]] = duplicate(kv[1])
+      this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1])
     })
     Object.entries(game.data.model.Item).forEach(kv => { 
-      this.__objectTypes[kv[0]] = duplicate(kv[1])
+      this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1])
     })
   }
 

modules/hawkmoon-combat.js

@@ -6,9 +6,9 @@ export class HawkmoonCombat extends Combat {
   /* -------------------------------------------- */
   async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
     ids = typeof ids === "string" ? [ids] : ids;
-    for (let cId = 0; cId < ids.length; cId++) {
-      const c = this.combatants.get(ids[cId]);
-      //console.log("Init for combattant", c )
+    for (let cId of ids) {
+      const c = this.combatants.get(cId);
+      console.log("Init for combattant", c, ids)
       let id = c._id || c.id
       let initValue = c.actor ? c.actor.getInitiativeScore() : 0
       await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initValue } ]);
@@ -21,5 +21,4 @@ export class HawkmoonCombat extends Combat {
   _onUpdate(changed, options, userId) {
   }
 
-
 }

modules/hawkmoon-commands.js

@@ -1,7 +1,7 @@
 /* -------------------------------------------- */
 
 import { HawkmoonUtility } from "./hawkmoon-utility.js";
-import { HawkmoonRollDialog } from "./hawkmoon-roll-dialog.js";
+import { HawkmoonRollDialog } from "./applications/hawkmoon-roll-dialog.mjs";
 
 /* -------------------------------------------- */
 export class HawkmoonCommands {
@@ -106,18 +106,17 @@ export class HawkmoonCommands {
   static _chatAnswer(msg, content) {
     msg.whisper = [game.user.id];
     msg.content = content;
-    ChatMessage.create(msg);    
+    ChatMessage.create(msg);
   }
 
   /* -------------------------------------------- */
   async poolRoll( msg) {
     let rollData = HawkmoonUtility.getBasicRollData()
-    rollData.alias = "Dice Pool Roll", 
+    rollData.alias = "Dice Pool Roll",
     rollData.mode  = "generic"
     rollData.title = `Dice Pool Roll`;
-    
-    let rollDialog = await HawkmoonRollDialog.create( this, rollData);
-    rollDialog.render( true );
+
+    await HawkmoonRollDialog.create( this, rollData);
   }
 
 }

modules/hawkmoon-config.js

@@ -0,0 +1,143 @@
+export const HAWKMOON_CONFIG = {
+
+  optionsDifficulte: [
+    { key: "0", label: "Aucune/Inconnue" },
+    { key: "5", label: "Facile (5)" },
+    { key: "6", label: "(6)" },
+    { key: "7", label: "(7)" },
+    { key: "8", label: "(8)" },
+    { key: "9", label: "(9)" },
+    { key: "10", label: "Moyenne (10)" },
+    { key: "11", label: "(11)" },
+    { key: "12", label: "(12)" },
+    { key: "13", label: "(13)" },
+    { key: "14", label: "(14)" },
+    { key: "15", label: "Ardue (15)" },
+    { key: "16", label: "(16)" },
+    { key: "17", label: "(17)" },
+    { key: "18", label: "(18)" },
+    { key: "19", label: "(19)" },
+    { key: "20", label: "Hasardeuse (20)" },
+    { key: "21", label: "(21)" },
+    { key: "22", label: "(22)" },
+    { key: "23", label: "(23)" },
+    { key: "24", label: "(24)" },
+    { key: "25", label: "Insensée (25)" },
+    { key: "26", label: "(26)" },
+    { key: "27", label: "(27)" },
+    { key: "28", label: "(28)" },
+    { key: "29", label: "(29)" },
+    { key: "30", label: "Pure Folie (30)" }
+  ],
+  optionsDistanceTir: [
+    { key: "porteecourte", label: "Courte ({protectionDefenseur}+5)" },
+    { key: "porteemoyenne", label: "Moyenne ({protectionDefenseur}+9)" },
+    { key: "porteelongue", label: "Longue ({protectionDefenseur}+14)" }
+  ],
+  optionsBonusMalus: [
+    { key: "-10", label: "-10" },
+    { key: "-9", label: "-9" },
+    { key: "-8", label: "-8" },
+    { key: "-7", label: "-7" },
+    { key: "-6", label: "-6" },
+    { key: "-5", label: "-5" },
+    { key: "-4", label: "-4" },
+    { key: "-3", label: "-3" },
+    { key: "-2", label: "-2" },
+    { key: "-1", label: "-1" },
+    { key: "0", label: "0" },
+    { key: "1", label: "+1" },
+    { key: "2", label: "+2" },
+    { key: "3", label: "+3" },
+    { key: "4", label: "+4" },
+    { key: "5", label: "+5" },
+    { key: "6", label: "+6" },
+    { key: "7", label: "+7" },
+    { key: "8", label: "+8" },
+    { key: "9", label: "+9" },
+    { key: "10", label: "+10" }
+  ],
+  optionsTailleCible: [
+    { key: "normal", label: "Normal (SD+0)" },
+    { key: "main", label: "Main (SD+10)" },
+    { key: "enfant", label: "Enfant (SD+3)" },
+    { key: "maison", label: "Maison (SD-10)" }
+  ],
+  optionsCouvert: [
+    { key: "aucun", label: "Aucun" },
+    { key: "leger", label: "Léger (SD+5)" },
+    { key: "complet", label: "Quasi complet (SD+10)" }
+  ],
+  optionsTireurDeplacement: [
+    { key: "immobile", label: "Immobile (SD+0)" },
+    { key: "lent", label: "Lent (SD+3)" },
+    { key: "rapide", label: "Rapide (SD+5)" }
+  ],
+  optionsSoutiens: [
+    { key: "0", label: "Aucun" },
+    { key: "1", label: "Un soutien (+3)" },
+    { key: "2", label: "Deux soutiens (+4)" },
+    { key: "3", label: "Trois soutiens (+5)" }
+  ],
+  optionsStatutResistant: [
+    { key: "commun", label: "Commun" },
+    { key: "clandestin", label: "Clandestin" },
+    { key: "insurge", label: "Insurgé" }
+  ],
+  optionsTypeArme: [
+    {key: "contact", label: "Arme de contact"},
+    {key: "contactjet", label: "Arme de contact et de Jet"},
+    {key: "jet", label: "Arme de Jet"},
+    {key: "tir", label: "Arme de Tir"}
+  ],
+  optionsArtefactBranche: [
+    {key: "alchimie", label: "Alchimie"},
+    {key: "biologie", label: "Biologie"},
+    {key: "electricite", label: "Electricité"},
+    {key: "mecanique", label: "Mécanique"},
+    {key: "scienceesprit", label: "Science de l'Esprit"}
+  ],
+  optionsArtefactBranche2: [
+    {key: "none", label: "Aucune"},
+    {key: "alchimie", label: "Alchimie"},
+    {key: "biologie", label: "Biologie"},
+    {key: "electricite", label: "Electricité"},
+    {key: "mecanique", label: "Mécanique"},
+    {key: "scienceesprit", label: "Science de l'Esprit"}
+  ],
+  optionsTypeContact: [
+    {key: "contact", label: "Contact"},
+    {key: "allie", label: "Allié"}
+  ],
+  optionsTypeMutation: [
+    {key: "tares_communes", label: "Tares et Malformations communes"},
+    {key: "evolutions_communes", label: "Evolutions communes"},
+    {key: "tares_rares", label: "Tares et Malformations rares"},
+    {key: "evolutions_rares", label: "Evolutions rares"},
+    {key: "tares_majeures", label: "Tares et Maformations majeures"},
+    {key: "evolutions_majeures", label: "Evolutions majeures"},
+    {key: "tares_except", label: "Tares et Malformations exceptionnelles"},
+    {key: "evolutions_except", label: "Evolutions exceptionnelles"}
+  ],
+  optionsTypeTalent: [
+    {key: "personnage", label: "Personnage"},
+    {key: "cellule", label: "Cellule"},
+    {key: "traitespece", label: "Trait d'espèce"}
+  ],
+  optionsUseTalent: [
+    {key: "permanent", label: "Permanent"},
+    {key: "sceance", label: "Une fois par scéance"},
+    {key: "scenario", label: "Une fois par scénario"},
+    {key: "jour", label: "Une fois par jour"},
+    {key: "unique", label: "Unique"}
+  ],
+  optionsAutomationEvent: [
+    {key: "on-drop", label: "Drop sur l'acteur"},
+    {key: "prepare-roll", label: "Préparation d'un jet"},
+    {key: "bonus-permanent", label: "Bonus permanent"}
+  ],
+  optionsBonusPermanent: [
+    {key: "vigueur", label: "Vigueur"},
+    {key: "bonus-defensif", label: "Bonus au Seuil de Défense"}
+  ]
+}

modules/hawkmoon-hud.js

@@ -22,9 +22,9 @@ export class HawkmoonTokenHud {
 
     const hudData = { actor: actor }
 
-    const controlIconActions = html.find('.control-icon[data-action=combat]');
+    const controlIconActions = $(html).find('.control-icon[data-action=combat]');
     // initiative
-    await HawkmoonTokenHud._configureSubMenu(controlIconActions, 'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html', hudData,
+    await HawkmoonTokenHud._configureSubMenu(controlIconActions, 'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.hbs', hudData,
       (event) => {
         let adversite = event.currentTarget.attributes['data-action-index'].value
         let value = Number(event.currentTarget.attributes['data-action-value'].value)
@@ -34,7 +34,7 @@ export class HawkmoonTokenHud {
 
   /* -------------------------------------------- */
   static async addTokenHudExtensions(app, html, tokenId) {
-    const controlIconCombat  = html.find('.control-icon[data-action=combat]')
+    const controlIconCombat  = $(html).find('.control-icon[data-action=combat]')
     if (controlIconCombat.length>0 ) {
       HawkmoonTokenHud.addExtensionHud(app, html, tokenId);
     }
@@ -42,11 +42,11 @@ export class HawkmoonTokenHud {
 
   /* -------------------------------------------- */
   static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
-    const hud = $(await renderTemplate(template, hudData))
+    const hud = $(await foundry.applications.handlebars.renderTemplate(template, hudData))
     const list = hud.find('div.hawkmoon-hud-list')
-    
+
     HawkmoonTokenHud._toggleHudListActive(hud, list);
-    
+
     hud.find('img.hawkmoon-hud-togglebutton').click(event => HawkmoonTokenHud._toggleHudListActive(hud, list));
     list.find('.hawkmoon-hud-adversite').click(onMenuItem);
 

modules/hawkmoon-item.js

@@ -13,6 +13,7 @@ export const defaultItemImg = {
     artefact: "systems/fvtt-hawkmoon-cyd/assets/icons/artefact.webp",  
     contact: "systems/fvtt-hawkmoon-cyd/assets/icons/contacts.webp",  
     ressource: "systems/fvtt-hawkmoon-cyd/assets/icons/ressources.webp",  
+    mutation: "systems/fvtt-hawkmoon-cyd/assets/icons/mutation.webp",  
 }
 
 /**

modules/hawkmoon-main.js

@@ -9,15 +9,19 @@
 /* -------------------------------------------- */
 // Import Modules
 import { HawkmoonActor } from "./hawkmoon-actor.js";
-import { HawkmoonItemSheet } from "./hawkmoon-item-sheet.js";
-import { HawkmoonActorSheet } from "./hawkmoon-actor-sheet.js";
-import { HawkmoonCreatureSheet } from "./hawkmoon-creature-sheet.js";
-import { HawkmoonCelluleSheet } from "./hawkmoon-cellule-sheet.js";
+
 import { HawkmoonUtility } from "./hawkmoon-utility.js";
 import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonItem } from "./hawkmoon-item.js";
 import { HawkmoonAutomation } from "./hawkmoon-automation.js";
 import { HawkmoonTokenHud } from "./hawkmoon-hud.js";
+import { HAWKMOON_CONFIG } from "./hawkmoon-config.js";
+
+// Import DataModels
+import * as models from "./models/index.mjs";
+
+// Import AppV2 Item Sheets
+import * as sheets from "./applications/sheets/_module.mjs";
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -32,7 +36,7 @@ Hooks.once("init", async function () {
   HawkmoonUtility.preloadHandlebarsTemplates()
 
   /* -------------------------------------------- */
-  // Set an initiative formula for the system 
+  // Set an initiative formula for the system
   CONFIG.Combat.initiative = {
     formula: "1d10",
     decimals: 1
@@ -47,21 +51,59 @@ Hooks.once("init", async function () {
   // Define custom Entity classes
   CONFIG.Combat.documentClass = HawkmoonCombat
   CONFIG.Actor.documentClass = HawkmoonActor
+  CONFIG.Actor.dataModels = {
+    personnage: models.PersonnageDataModel,
+    cellule: models.CelluleDataModel,
+    creature: models.CreatureDataModel
+  }
+
   CONFIG.Item.documentClass = HawkmoonItem
+  CONFIG.Item.dataModels = {
+    talent: models.TalentDataModel,
+    historique: models.HistoriqueDataModel,
+    profil: models.ProfilDataModel,
+    competence: models.CompetenceDataModel,
+    arme: models.ArmeDataModel,
+    protection: models.ProtectionDataModel,
+    monnaie: models.MonnaieDataModel,
+    equipement: models.EquipementDataModel,
+    artefact: models.ArtefactDataModel,
+    ressource: models.RessourceDataModel,
+    contact: models.ContactDataModel,
+    mutation: models.MutationDataModel
+  }
+
+  CONFIG.HAWKMOON = HAWKMOON_CONFIG
+
   game.system.hawkmoon = {
     HawkmoonUtility,
-    HawkmoonAutomation
+    HawkmoonAutomation,
+    config: HAWKMOON_CONFIG,
+    models,
+    sheets
   }
 
   /* -------------------------------------------- */
   // Register sheet application classes
-  Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonActorSheet, { types: ["personnage"], makeDefault: true })
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCreatureSheet, { types: ["creature"], makeDefault: true })
-  Actors.registerSheet("fvtt-hawkmoon-cyd", HawkmoonCelluleSheet, { types: ["cellule"], makeDefault: true });
+  foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonPersonnageSheet, { types: ["personnage"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonCreatureSheet, { types: ["creature"], makeDefault: true })
+  foundry.documents.collections.Actors.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonCelluleSheet, { types: ["cellule"], makeDefault: true });
 
-  Items.unregisterSheet("core", ItemSheet);
-  Items.registerSheet("fvtt-hawkmoon-cyd", HawkmoonItemSheet, { makeDefault: true })
+  // Register AppV2 Item Sheets
+  foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonTalentSheet, { types: ["talent"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonCompetenceSheet, { types: ["competence"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonArmeSheet, { types: ["arme"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonProtectionSheet, { types: ["protection"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonHistoriqueSheet, { types: ["historique"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonProfilSheet, { types: ["profil"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonEquipementSheet, { types: ["equipement"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonMonnaieSheet, { types: ["monnaie"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonArtefactSheet, { types: ["artefact"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonRessourceSheet, { types: ["ressource"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonContactSheet, { types: ["contact"], makeDefault: true })
+  foundry.documents.collections.Items.registerSheet("fvtt-hawkmoon-cyd", sheets.HawkmoonMutationSheet, { types: ["mutation"], makeDefault: true })
 
   HawkmoonUtility.init()
   HawkmoonAutomation.init()
@@ -74,36 +116,51 @@ function welcomeMessage() {
   ChatMessage.create({
     user: game.user.id,
     whisper: [game.user.id],
-    content: `<div id="welcome-message-Hawkmoon"><span class="rdd-roll-part">
-    <strong>Bienvenue dans Hawkmoon et le troisième Millénaire !</strong>
-    <p>Les livres de Hawkmoon sont nécessaires pour jouer : https://www.titam-france.fr</p>
-    <p>Hawkmoon est jeude rôle publié par Titam France/Sombres projets, tout les droits leur appartiennent.<p>
-    ` });
+    content: `
+    <div class="hawkmoon-chat-result">
+      <div class="chat-result-header">
+        <img class="actor-icon" src="systems/fvtt-hawkmoon-cyd/assets/logos/hawkmoon_logo.webp" alt="Hawkmoon" />
+        <div class="header-info">
+          <h4 class="actor-name">Bienvenue dans Hawkmoon !</h4>
+          <div class="action-title">
+            <i class="fas fa-book-open"></i>
+            Le Troisième Millénaire
+          </div>
+        </div>
+      </div>
+
+      <div class="result-details">
+        <div class="details-section">
+          <h5 class="section-title"><i class="fas fa-info-circle"></i> Informations importantes</h5>
+          <div class="description-content">
+            <p><strong>Les livres de Hawkmoon sont nécessaires pour jouer.</strong></p>
+            <p>Hawkmoon est un jeu de rôle publié par <strong>Titam France / Sombres projets</strong>, tous les droits leur appartiennent.</p>
+          </div>
+        </div>
+
+        <div class="details-section">
+          <h5 class="section-title"><i class="fas fa-users"></i> Support & Communauté</h5>
+          <div class="description-content">
+            <p>Système développé par <strong>LeRatierBretonnien</strong></p>
+            <p>Support disponible sur le <a href="https://discord.gg/pPSDNJk" target="_blank" style="color: #d4af37; text-decoration: underline;">Discord FR de Foundry VTT</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    `
+  });
 }
 
 /* -------------------------------------------- */
-// Register world usage statistics
-function registerUsageCount(registerKey) {
-  if (game.user.isGM) {
-    game.settings.register(registerKey, "world-key", {
-      name: "Unique world key",
-      scope: "world",
-      config: false,
-      default: "",
-      type: String
-    });
-
-    let worldKey = game.settings.get(registerKey, "world-key")
-    if (worldKey == undefined || worldKey == "") {
-      worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey)
+async function importDefaultScene() {
+  let exists = game.scenes.find(j => j.name == "Accueil");
+  if (!exists) {
+    const scenes = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.scenes")
+    let newDocuments = scenes.filter(i => i.name == "Accueil");
+    if (newDocuments) {
+      await game.scenes.documentClass.create(newDocuments);
+      game.scenes.find(i => i.name == "Accueil").activate();
     }
-    // Simple API counter
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-    //$.ajaxSetup({
-    //headers: { 'Access-Control-Allow-Origin': '*' }
-    //})
-    $.ajax(regURL)
   }
 }
 
@@ -123,14 +180,16 @@ Hooks.once("ready", function () {
     });
   }
 
-  registerUsageCount('fvtt-hawkmoon-cyd')
+  import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter => {
+    console.log("ClassCounter loaded", moduleCounter)
+    moduleCounter.ClassCounter.registerUsageCount()
+  }).catch(err =>
+    console.log("No stats available, giving up.")
+  )
+
+  importDefaultScene()
   welcomeMessage()
 
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
 });
 
 /* -------------------------------------------- */
@@ -146,4 +205,3 @@ Hooks.on("chatMessage", (html, content, msg) => {
   }
   return true;
 });
-

modules/hawkmoon-roll-dialog.js

@@ -1,80 +0,0 @@
-import { HawkmoonUtility } from "./hawkmoon-utility.js";
-
-export class HawkmoonRollDialog extends Dialog {
-
-  /* -------------------------------------------- */
-  static async create(actor, rollData ) {
-
-    let options = { classes: ["HawkmoonDialog"], width: 320, height: 'fit-content', 'z-index': 99999 };
-    let html = await renderTemplate('systems/fvtt-hawkmoon-cyd/templates/roll-dialog-generic.html', rollData);
-
-    return new HawkmoonRollDialog(actor, rollData, html, options );
-  }
-
-  /* -------------------------------------------- */
-  constructor(actor, rollData, html, options, close = undefined) {
-    let conf = {
-      title: "Test de Capacité",
-      content: html,
-      buttons: { 
-        rolld10: {
-            icon: '<i class="fas fa-check"></i>',
-            label: "Lancer 1d10",
-            callback: () => { this.roll("d10") } 
-          },
-          rolld20: {
-            icon: '<i class="fas fa-check"></i>',
-            label: "Lancer 1d20",
-            callback: () => { this.roll("d20") } 
-          },
-          cancel: {
-            icon: '<i class="fas fa-times"></i>',
-            label: "Annuler",
-            callback: () => { this.close() }
-        } },
-      close: close
-    }
-
-    super(conf, options);
-
-    this.actor = actor
-    this.rollData = rollData
-  }
-
-  /* -------------------------------------------- */
-  roll ( dice) {
-    this.rollData.mainDice = dice
-    HawkmoonUtility.rollHawkmoon( this.rollData )
-  }
-
-
-  /* -------------------------------------------- */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    var dialog = this;
-    function onLoad() {
-    }
-    $(function () { onLoad(); });
-    
-    html.find('#modificateur').change(async (event) =>  {
-      this.rollData.modificateur = Number(event.currentTarget.value)
-    })
-    html.find('#difficulte').change(async (event) =>  {
-      this.rollData.difficulte = Number(event.currentTarget.value)
-    })
-    html.find('#attrKey').change(async (event) =>  {
-      this.rollData.attrKey = String(event.currentTarget.value)
-    })    
-    html.find('#select-maitrise').change(async (event) =>  {
-      this.rollData.maitriseId = String(event.currentTarget.value)
-    })
-    html.find('#competence-talents').change((event) => {
-      this.rollData.selectedTalents = $('#competence-talents').val()      
-    })
-    html.find('#bonus-malus-context').change((event) => {
-      this.rollData.bonusMalusContext = Number(event.currentTarget.value)      
-    })
-    
-  }
-}

modules/hawkmoon-utility.js

@@ -2,6 +2,12 @@
 import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonCommands } from "./hawkmoon-commands.js";
 
+/* -------------------------------------------- */
+const __distanceDifficulte = { "porteecourte": 5, "porteemoyenne": 9, "porteelongue": 14 }
+const __tireurDeplacement = { immobile: 0, lent: 3, rapide: 5 }
+const __cibleCouvert = { aucun: 0, leger: 5, complet: 10 }
+const __tailleCible = { normal: 0, main: 10, enfant: 3, maison: -10 }
+
 /* -------------------------------------------- */
 export class HawkmoonUtility {
 
@@ -9,8 +15,7 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => HawkmoonUtility.chatListeners(html))
-    Hooks.on("getChatLogEntryContext", (html, options) => HawkmoonUtility.chatRollMenu(html, options))
-
+    Hooks.on("getChatMessageContextOptions", (html, options) => HawkmoonUtility.chatRollMenu(html, options))
     Hooks.on("getCombatTrackerEntryContext", (html, options) => {
       HawkmoonUtility.pushInitiativeOptions(html, options);
     })
@@ -61,6 +66,13 @@ export class HawkmoonUtility {
 
   }
 
+  /* -------------------------------------------- */
+  static sortArrayObjectsByName(myArray) {
+    myArray.sort((a, b) => {
+      return a.name.localeCompare(b.name);
+    })
+  }
+
   /* -------------------------------------------- */
   static getModificateurOptions() {
     let opt = []
@@ -92,15 +104,53 @@ export class HawkmoonUtility {
     return this.skills
   }
 
+  /* -------------------------------------------- */
+  static updatePauseLogo(html) {
+    let logoPause = "systems/fvtt-hawkmoon-cyd/assets/logos/" + game.settings.get("fvtt-hawkmoon-cyd", "hawkmoon-pause-logo") + ".webp"
+    console.log("Hawkmoon | Updating pause logo to:", logoPause)
+
+    // Supprimer l'ancien style s'il existe
+    let oldStyle = document.getElementById('hawkmoon-pause-logo-override')
+    if (oldStyle) {
+      oldStyle.remove()
+    }
+
+    // Injecter une règle CSS pour override le logo
+    let styleSheet = document.createElement('style')
+    styleSheet.id = 'hawkmoon-pause-logo-override'
+    styleSheet.textContent = `#pause>img { content: url(${logoPause}) !important; }`
+    document.head.appendChild(styleSheet)
+
+    console.log("Hawkmoon | Logo CSS rule injected")
+  }
+
   /* -------------------------------------------- */
   static async ready() {
     const skills = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.skills")
     this.skills = skills.map(i => i.toObject())
 
     // Setup pause logo
-    let logoPause = "systems/fvtt-hawkmoon-cyd/assets/logos/" + game.settings.get("fvtt-hawkmoon-cyd", "hawkmoon-pause-logo") + ".webp"
-    let logoImg = document.querySelector('#pause').children[0]
-    logoImg.setAttribute('style', `content: url(${logoPause})`)
+    this.updatePauseLogo()
+
+    game.system.hawkmoon.config.listeNiveauSkill = this.createDirectOptionList(0, 10)
+    game.system.hawkmoon.config.listeNiveauCreature = this.createDirectOptionList(0, 35)
+    game.system.hawkmoon.config.listeNiveauContact = this.createDirectOptionList(1, 3)
+  }
+
+  /* -------------------------------------------- */
+  static createDirectOptionList(min, max) {
+    let options = {};
+    for (let i = min; i <= max; i++) {
+      options[`${i}`] = `${i}`;
+    }
+    return options;
+  }
+  static createArrayOptionList(min, max) {
+    let options = [];
+    for (let i = min; i <= max; i++) {
+      options.push({ key: `${i}`, label: `${i}` });
+    }
+    return options;
   }
 
   /* -------------------------------------------- */
@@ -122,41 +172,48 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static async chatListeners(html) {
 
-    html.on("click", '.predilection-reroll', async event => {
+    $(html).on("click", '.predilection-reroll', async event => {
       let predIdx = $(event.currentTarget).data("predilection-index")
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       await actor.setPredilectionUsed(rollData.competence._id, predIdx)
-      rollData.competence = duplicate(actor.getCompetence(rollData.competence._id))
+      rollData.competence = foundry.utils.duplicate(actor.getCompetence(rollData.competence._id))
       HawkmoonUtility.rollHawkmoon(rollData)
     })
 
-    html.on("click", '.roll-chat-degat', async event => {
+    $(html).on("click", '.roll-chat-degat', async event => {
       let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
-      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
+      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
     })
+    $(html).on("click", '.roll-chat-degat-devastateur', async event => {
+      let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
+      let message = game.messages.get(messageId)
+      let rollData = message.getFlag("world", "hawkmoon-roll")
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
+      rollData.applyCoupDevastateur = true
+      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
+    })
+
   }
 
   /* -------------------------------------------- */
   static async preloadHandlebarsTemplates() {
 
     const templatePaths = [
-      'systems/fvtt-hawkmoon-cyd/templates/editor-notes-gm.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html',
-      'systems/fvtt-hawkmoon-cyd/templates/partial-automation.html',
-      'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html',
+      'systems/fvtt-hawkmoon-cyd/templates/editor-notes-gm.hbs',
+      'systems/fvtt-hawkmoon-cyd/templates/partial-item-header.hbs',
+      'systems/fvtt-hawkmoon-cyd/templates/partial-item-description.hbs',
+      'systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.hbs',
+      'systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.hbs',
+      'systems/fvtt-hawkmoon-cyd/templates/partial-automation.hbs',
+      'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.hbs',
     ]
-    return loadTemplates(templatePaths);
+    return foundry.applications.handlebars.loadTemplates(templatePaths);
   }
 
   /* -------------------------------------------- */
@@ -208,11 +265,14 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static getTarget() {
-    if (game.user.targets && game.user.targets.size == 1) {
+    console.log("getTarget - targets size:", game.user.targets?.size)
+    if (game.user.targets && game.user.targets.size >= 1) {
       for (let target of game.user.targets) {
-        return target;
+        console.log("getTarget - Returning target:", target.id)
+        return target; // Prendre la première cible si plusieurs
       }
     }
+    console.log("getTarget - No target found")
     return undefined;
   }
 
@@ -233,30 +293,19 @@ export class HawkmoonUtility {
 
     let id = rollData.rollId;
     let oldRollData = this.rollDataStore[id] || {};
-    let newRollData = mergeObject(oldRollData, rollData);
+    let newRollData = foundry.utils.mergeObject(oldRollData, rollData);
     this.rollDataStore[id] = newRollData;
   }
-  /* -------------------------------------------- */
-  static saveRollData(rollData) {
-    game.socket.emit("system.fvtt-hawkmoon-cyd", {
-      name: "msg_update_roll", data: rollData
-    }); // Notify all other clients of the roll    
-    this.updateRollData(rollData);
-  }
-
-  /* -------------------------------------------- */
-  static getRollData(id) {
-    return this.rollDataStore[id];
-  }
 
   /* -------------------------------------------- */
   static onSocketMesssage(msg) {
-    //console.log("SOCKET MESSAGE", msg.name, game.user.character.id, msg.data.defenderId);
-    if (msg.name == "msg_update_defense_state") {
-      this.updateDefenseState(msg.data.defenderId, msg.data.rollId);
-    }
-    if (msg.name == "msg_update_roll") {
-      this.updateRollData(msg.data);
+    if (msg.msg == "msg_apply_combativite") {
+      let defender = game.canvas.tokens.get(msg.data.defenderTokenId)?.actor
+      if (defender) {
+        defender.changeEtatCombativite(msg.data.value)
+      } else {
+        console.warn("HawkmoonUtility.onSocketMesssage : Impossible de trouver le token pour appliquer la combativité", msg.defenderTokenId)
+      }
     }
   }
 
@@ -290,10 +339,10 @@ export class HawkmoonUtility {
         switch (rollMode) {
           case "blindroll": //GM only
             blind = true;
-          case "gmroll": //GM + rolling player
+          case "gmroll": // GM + rolling player
             whisper = this.getUsers(user => user.isGM);
             break;
-          case "roll": //everybody
+          case "roll": // everybody
             whisper = this.getUsers(user => user.active);
             break;
           case "selfroll":
@@ -308,13 +357,13 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static computeMonnaieDetails(valueSC) {
     let po = Math.floor(valueSC / 400)
-    let pa = Math.floor((valueSC - (po*400)) / 20)
-    let sc = valueSC - (po*400) - (pa*20)
+    let pa = Math.floor((valueSC - (po * 400)) / 20)
+    let sc = valueSC - (po * 400) - (pa * 20)
     return {
-      po: po, pa: pa, sc: sc, valueSC: valueSC 
+      po, pa, sc, valueSC
     }
   }
-  
+
   /* -------------------------------------------- */
   static computeResult(rollData) {
     rollData.diceResult = rollData.roll.terms[0].results[0].result
@@ -330,15 +379,28 @@ export class HawkmoonUtility {
       }
     }
 
-    //console.log("Result : ", rollData)
+    //console.log("Result : ", rollData
+    this.computeResultQuality(rollData)
+  }
+
+  /* -------------------------------------------- */
+  static computeResultQuality(rollData) {
     if (rollData.difficulte > 0 && !rollData.isDramatique) {
       rollData.isSuccess = (rollData.finalResult >= rollData.difficulte)
       rollData.isHeroique = ((rollData.finalResult - rollData.difficulte) >= 10)
       rollData.isDramatique = ((rollData.finalResult - rollData.difficulte) <= -10)
     }
-
   }
 
+  /* -------------------------------------------- */
+  static applyCombativite(rollData, value) {
+    if (game.user.isGM) {
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.changeEtatCombativite(value)
+    } else {
+      game.socket.emit("system.fvtt-hawkmoon-cyd", { msg: "msg_apply_combativite", data: { defenderTokenId: rollData.defenderTokenId, value } });
+    }
+  }
   /* -------------------------------------------- */
   static async rollHawkmoon(rollData) {
 
@@ -348,7 +410,10 @@ export class HawkmoonUtility {
     }
     if (!rollData.attr) {
       rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
-      rollData.attr = duplicate(actor.system.attributs[rollData.attrKey])
+      rollData.attr = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey])
+    }
+    if (rollData.attrKey2 != "none") {
+      rollData.attr2 = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey2])
     }
 
     if (rollData.maitriseId != "none") {
@@ -360,7 +425,7 @@ export class HawkmoonUtility {
 
     //console.log("BEFORE COMP", rollData)
     if (rollData.competence) {
-      rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => pred.acquise && !pred.maitrise && !pred.used) || [])
+      rollData.predilections = foundry.utils.duplicate(rollData.competence.system.predilections || [])
       let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
       rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}`
 
@@ -381,9 +446,56 @@ export class HawkmoonUtility {
           }
         }
       }
-      rollData.diceFormula += `+${rollData.bonusMalusContext}`
+    } else if (rollData.attr2) {
+      rollData.diceFormula += `+${rollData.attr.value}+${rollData.attr2.value}+${rollData.modificateur}`
     } else {
-      rollData.diceFormula += `+${rollData.attr.value}*${rollData.multiplier}+${rollData.modificateur}+${rollData.bonusMalusContext}`
+      rollData.diceFormula += `+${rollData.attr.value}*${rollData.multiplier}+${rollData.modificateur}`
+    }
+
+    // Bonus arme naturelle en défense
+    if (rollData.bonusArmeNaturelle) {
+      rollData.diceFormula += `+${rollData.bonusArmeNaturelle}`
+    }
+    if (rollData.attaquantsMultiples) {
+      rollData.diceFormula += `+3`
+    }
+    if (rollData.hasAmbidextre) {
+      if (rollData.ambidextre1) {
+        rollData.diceFormula += `-3`
+      } else if (rollData.ambidextre2) {
+        rollData.diceFormula += `-6`
+      }
+    }
+    if (rollData.defenseurAuSol) {
+      rollData.diceFormula += `+3`
+    }
+    if (rollData.defenseurAveugle) {
+      rollData.diceFormula += `+10`
+    }
+    if (rollData.defenseurDeDos) {
+      rollData.diceFormula += `+5`
+    }
+    if (rollData.defenseurRestreint) {
+      rollData.diceFormula += `+3`
+    }
+    if (rollData.defenseurImmobilise) {
+      rollData.diceFormula += `+5`
+    }
+    if (rollData.soutiens > 0) { // 1 soutien = +3, 2 soutiens = +4, 3 soutiens = +5
+      rollData.diceFormula += `+${rollData.soutiens + 2}`
+    }
+
+    if (rollData.arme?.system.isDistance) {
+      rollData.difficulte = __distanceDifficulte[rollData.distanceTir]
+      rollData.difficulte += __tireurDeplacement[rollData.tireurDeplacement]
+      rollData.difficulte += __cibleCouvert[rollData.cibleCouvert]
+      rollData.difficulte += __tailleCible[rollData.tailleCible]
+      rollData.difficulte += rollData.cibleDeplace ? 3 : 0
+      rollData.difficulte += rollData.cibleCaC ? 3 : 0
+      rollData.difficulte += rollData.protectionDefenseur
+    }
+    if (rollData.attaqueDesarme) {
+      rollData.difficulte += 10
     }
 
     // Ajout adversités
@@ -393,9 +505,12 @@ export class HawkmoonUtility {
       rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}`
     }
 
-    let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
+    // Gestion de la feinte éventuelle
+    rollData.nbCombativitePerdu = 1
+
+    let myRoll = await new Roll(rollData.diceFormula).roll()
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = myRoll
+    rollData.roll = foundry.utils.duplicate(myRoll)
     console.log(">>>> ", myRoll)
 
     rollData.finalResult = myRoll.total
@@ -403,34 +518,66 @@ export class HawkmoonUtility {
     if (rollData.isInit) {
       actor.setFlag("world", "last-initiative", rollData.finalResult)
     }
+    if (rollData.feinte) {
+      actor.changeBonneAventure(-1)
+      if (rollData.isHeroique) {
+        rollData.nbCombativitePerdu = "vaincu"
+      } else if (rollData.isSuccess) {
+        rollData.nbCombativitePerdu = 2
+      }
+    }
 
     this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.hbs`, rollData)
     }, rollData)
 
+    if ((rollData.coupBas || rollData.arme) && rollData.isSuccess && rollData.defenderTokenId) {
+      this.applyCombativite(rollData, rollData.nbCombativitePerdu)
+    }
+    if (rollData.coupBas && rollData.isSuccess && rollData.defenderTokenId) {
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.incDecAdversite("bleue", -2)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static getCombativiteList(nbActivite) {
+    let list = [{ value: String(0), label: "Combatif" }]
+    for (let i = 1; i < nbActivite - 2; i++) {
+      list.push({ value: String(i), label: "Eprouvé " + i })
+    }
+    list[nbActivite - 2] = { value: String(nbActivite - 2), label: "Affaibli" }
+    list[nbActivite - 1] = { value: String(nbActivite - 1), label: "Très Affaibli" }
+    list[nbActivite] = { value: String(nbActivite), label: "Vaincu" }
+    return list
   }
 
   /* -------------------------------------------- */
   static async bonusRollHawkmoon(rollData) {
     rollData.bonusFormula = rollData.addedBonus
+    console.log("Bonus Roll Hawkmoon", rollData.bonusFormula)
 
-    let bonusRoll = new Roll(rollData.bonusFormula).roll({ async: false })
-    await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
-    rollData.bonusRoll = bonusRoll
+    if (!Number(rollData.bonusFormula)) {
+      let bonusRoll = await new Roll(rollData.bonusFormula).roll()
+      await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
+      rollData.bonusRoll = foundry.utils.duplicate(bonusRoll)
+      rollData.finalResult += Number(rollData.bonusRoll.total)
+    } else {
+      rollData.finalResult += Number(rollData.bonusFormula)
+      console.log("Bonus Roll Hawkmoon 2", rollData.finalResult)
+    }
 
-    rollData.finalResult += rollData.bonusRoll.total
-
-    this.computeResult(rollData)
+    this.computeResultQuality(rollData)
 
     this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.hbs`, rollData)
     }, rollData)
 
   }
 
   /* -------------------------------------------- */
   static getUsers(filter) {
-    return game.users.filter(filter).map(user => user.data._id);
+    return game.users.filter(filter).map(user => user._id);
   }
 
   /* -------------------------------------------- */
@@ -450,7 +597,7 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = duplicate(chatOptions);
+    let chatGM = foundry.utils.duplicate(chatOptions);
     chatGM.whisper = this.getUsers(user => user.isGM);
     chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -506,21 +653,43 @@ export class HawkmoonUtility {
         break;
     }
     chatOptions.alias = chatOptions.alias || name
+
+    // Ajouter le flag directement dans les options pour éviter les problèmes de timing
+    if (rollData) {
+      chatOptions.flags = { world: { "hawkmoon-roll": rollData } }
+    }
+
     let msg = await ChatMessage.create(chatOptions)
-    console.log("=======>", rollData)
-    msg.setFlag("world", "hawkmoon-roll", rollData)
   }
 
   /* -------------------------------------------- */
   static getBasicRollData() {
     let rollData = {
-      rollId: randomID(16),
+      rollId: foundry.utils.randomID(16),
       rollMode: game.settings.get("core", "rollMode"),
       modificateursOptions: this.getModificateurOptions(),
       pointAmeOptions: this.getPointAmeOptions(),
       difficulte: 0,
-      modificateur: 0,
-      bonusMalusContext: 0
+      modificateur: "0",
+      bonusArmeNaturelle: 0,
+      defenseurAveugle: false,
+      defenseurDeDos: false,
+      defenseurAuSol: false,
+      defenseurRestreint: false,
+      defenseurImmobilise: false,
+      tailleCible: "normal",
+      tireurDeplacement: "immobile",
+      cibleCouvert: "aucun",
+      distanceTir: "porteemoyenne",
+      cibleDeplace: false,
+      cibleCaC: false,
+      attaqueCharge: false,
+      attaqueDesarme: false,
+      attaqueAmbidextre1: false,
+      attaqueAmbidextre2: false,
+      chargeCavalerie: false,
+      contenir: false,
+      soutiens: 0
     }
     return rollData
   }
@@ -528,16 +697,50 @@ export class HawkmoonUtility {
   /* -------------------------------------------- */
   static updateWithTarget(rollData) {
     let target = HawkmoonUtility.getTarget()
+    console.log("updateWithTarget - Current target:", target)
+    console.log("updateWithTarget - Existing defenderTokenId:", rollData.defenderTokenId)
     if (target) {
       rollData.defenderTokenId = target.id
+      console.log("updateWithTarget - Set defenderTokenId to:", rollData.defenderTokenId)
+    }
+    // Utiliser la cible déjà enregistrée si aucune cible n'est actuellement sélectionnée
+    if (rollData.defenderTokenId) {
       let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      console.log("updateWithTarget - Defender actor:", defender.name)
       rollData.armeDefense = defender.getBestDefenseValue()
+      console.log("updateWithTarget - armeDefense:", rollData.armeDefense)
+      rollData.armeAttaqueDefenseur = defender.getBestAttackValue()
       rollData.targetVigueur = defender.getVigueur()
-      if (rollData.armeDefense) {
+      rollData.protectionDefenseur = defender.getProtection()
+      if (rollData.immobiliser || rollData.repousser) {
+        let combatValues = defender.getCombatValues()
+        rollData.difficulte = combatValues.defenseTotal + (rollData.armeDefense && rollData.cibleconsciente ? 5 : 0)
+      } else if (rollData.coupBas) {
+        let combatValues = defender.getCombatValues()
+        rollData.difficulte = combatValues.defenseTotal
+      } else if (rollData.assomer) {
+        rollData.difficulte = 3 + (defender.system.attributs.tre.value * 2)
+      } else if (rollData.desengager) {
+        rollData.difficulte = rollData.armeAttaqueDefenseur?.system?.totalOffensif || 0;
+      } else if (rollData.armeDefense) {
         rollData.difficulte = rollData.armeDefense.system.totalDefensif
+        console.log("updateWithTarget - Calculated difficulte from armeDefense:", rollData.difficulte)
+        if (rollData.arme && !rollData.desengager && !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune) {
+          if (rollData.armeDefense.system.armenaturelle || rollData.armeDefense.system.armefortune) {
+            rollData.bonusArmeNaturelle = 3
+          }
+        }
+      } else if (rollData.arme?.system.isDistance) {
+        // Pour les armes à distance, calculer la difficulté de base (protection + distance par défaut)
+        const distanceValues = { "porteecourte": 5, "porteemoyenne": 9, "porteelongue": 14 }
+        rollData.difficulte = rollData.protectionDefenseur + distanceValues[rollData.distanceTir || "porteemoyenne"]
+        console.log("updateWithTarget - Calculated difficulte for ranged:", rollData.difficulte, "= protection", rollData.protectionDefenseur, "+ distance", distanceValues[rollData.distanceTir || "porteemoyenne"])
       } else {
+        console.log("updateWithTarget - No armeDefense found!")
         ui.notifications.warn("Aucune arme de défense équipée, difficulté manuelle à positionner.")
       }
+    } else {
+      console.log("updateWithTarget - No defenderTokenId, skipping target calculations")
     }
   }
 
@@ -548,11 +751,11 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static applyBonneAventureRoll(li, changed, addedBonus) {
-    let msgId = li.data("message-id")
+    let msgId = $(li).data("message-id")
     let msg = game.messages.get(msgId)
     if (msg) {
       let rollData = msg.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       actor.changeBonneAventure(changed)
       rollData.isReroll = true
       rollData.textBonus = "Bonus de Points d'Aventure"
@@ -567,11 +770,11 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static applyEclatRoll(li, changed, addedBonus) {
-    let msgId = li.data("message-id")
+    let msgId = $(li).data("message-id")
     let msg = game.messages.get(msgId)
     if (msg) {
       let rollData = msg.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       actor.changeEclat(changed)
       rollData.isReroll = true
       rollData.textBonus = "Bonus d'Eclat"
@@ -588,15 +791,15 @@ export class HawkmoonUtility {
   static chatRollMenu(html, options) {
     let canApply = li => canvas.tokens.controlled.length && li.find(".hawkmoon-roll").length
     let canApplyBA = function (li) {
-      let message = game.messages.get(li.attr("data-message-id"))
+      let message = game.messages.get($(li).attr("data-message-id"))
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getBonneAventure() > 0)
     }
     let canApplyPE = function (li) {
-      let message = game.messages.get(li.attr("data-message-id"))
+      let message = game.messages.get($(li).attr("data-message-id"))
       let rollData = message.getFlag("world", "hawkmoon-roll")
-      let actor = this.getActorFromRollData(rollData)
+      let actor = HawkmoonUtility.getActorFromRollData(rollData)
       return (!rollData.isReroll && actor.getEclat() > 0)
     }
     options.push(
@@ -620,7 +823,7 @@ export class HawkmoonUtility {
         name: "Relancer le dé (1 point d'Eclat)",
         icon: "<i class='fas fa-user-plus'></i>",
         condition: canApply && canApplyPE,
-        callback: li => HawkmoonUtility.applyEclatRoll(li, -3, "reroll")
+        callback: li => HawkmoonUtility.applyEclatRoll(li, -1, "reroll")
       }
     )
     return options
@@ -628,25 +831,25 @@ export class HawkmoonUtility {
 
   /* -------------------------------------------- */
   static async confirmDelete(actorSheet, li) {
-    let itemId = li.data("item-id");
-    let msgTxt = "<p>Are you sure to remove this Item ?";
+    let itemId = li.dataset.itemId;
+    let msgTxt = "<p>Etes vous certain de vouloir supprimer cet item ?";
     let buttons = {
       delete: {
         icon: '<i class="fas fa-check"></i>',
-        label: "Yes, remove it",
+        label: "Oui !",
         callback: () => {
           actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
-          li.slideUp(200, () => actorSheet.render(false));
+          actorSheet.render(false);
         }
       },
       cancel: {
         icon: '<i class="fas fa-times"></i>',
-        label: "Cancel"
+        label: "Non"
       }
     }
     msgTxt += "</p>";
     let d = new Dialog({
-      title: "Confirm removal",
+      title: "Confirmer la suppression",
       content: msgTxt,
       buttons: buttons,
       default: "cancel"
@@ -665,7 +868,6 @@ export class HawkmoonUtility {
       console.log(entryData)
       htmlTab += `<tr><td>@UUID[Compendium.${compName}.${entryData._id}]{${entryData.name}}</td>`
       htmlTab += `<td>${entryData.system.description}</td>`;
-      //htmlTab += `<td>${entryData.system.resumebonus}</td>`;
       htmlTab += "</tr>\n";
     }
     htmlTab += "</table>";

modules/models/arme.mjs

@@ -0,0 +1,31 @@
+/**
+ * Data model pour les armes
+ */
+export default class ArmeDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      prixpo: new fields.NumberField({ initial: 0, integer: true }),
+      prixca: new fields.NumberField({ initial: 0, integer: true }),
+      prixsc: new fields.NumberField({ initial: 0, integer: true }),
+      rarete: new fields.NumberField({ initial: 0, integer: true }),
+      quantite: new fields.NumberField({ initial: 1, integer: true }),
+      equipped: new fields.BooleanField({ initial: false }),
+      typearme: new fields.StringField({ initial: "" }),
+      armenaturelle: new fields.BooleanField({ initial: false }),
+      armefortune: new fields.BooleanField({ initial: false }),
+      bonusmaniementoff: new fields.NumberField({ initial: 0, integer: true }),
+      seuildefense: new fields.NumberField({ initial: 0, integer: true }),
+      onlevelonly: new fields.BooleanField({ initial: false }),
+      degats: new fields.StringField({ initial: "" }),
+      deuxmains: new fields.BooleanField({ initial: false }),
+      percearmure: new fields.BooleanField({ initial: false }),
+      percearmurevalue: new fields.NumberField({ initial: 0, integer: true }),
+      courte: new fields.NumberField({ initial: 0, integer: true }),
+      moyenne: new fields.NumberField({ initial: 0, integer: true }),
+      longue: new fields.NumberField({ initial: 0, integer: true }),
+      tr: new fields.NumberField({ initial: 0, integer: true })
+    };
+  }
+}

modules/models/artefact.mjs

@@ -0,0 +1,28 @@
+/**
+ * Data model pour les artefacts
+ */
+export default class ArtefactDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      prixpo: new fields.NumberField({ initial: 0, integer: true }),
+      prixca: new fields.NumberField({ initial: 0, integer: true }),
+      prixsc: new fields.NumberField({ initial: 0, integer: true }),
+      rarete: new fields.NumberField({ initial: 0, integer: true }),
+      quantite: new fields.NumberField({ initial: 1, integer: true }),
+      equipped: new fields.BooleanField({ initial: false }),
+      complexite: new fields.NumberField({ initial: 0, integer: true }),
+      branche: new fields.StringField({ initial: "" }),
+      branche2: new fields.StringField({ initial: "none" }),
+      dureerealisation: new fields.StringField({ initial: "" }),
+      tempsroute: new fields.StringField({ initial: "" }),
+      effetdejeu: new fields.StringField({ initial: "" }),
+      defautcourant: new fields.StringField({ initial: "" }),
+      autrescarac: new fields.StringField({ initial: "" }),
+      avantagespossibles: new fields.StringField({ initial: "" }),
+      avantages: new fields.StringField({ initial: "" }),
+      competences: new fields.StringField({ initial: "" })
+    };
+  }
+}

modules/models/base-item.mjs

@@ -0,0 +1,53 @@
+/**
+ * Template de base pour tous les items
+ */
+export class BaseItemModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" })
+    };
+  }
+}
+
+/**
+ * Template pour les équipements de base
+ */
+export class BaseEquipItemModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      prixpo: new fields.NumberField({ initial: 0, integer: true }),
+      prixca: new fields.NumberField({ initial: 0, integer: true }),
+      prixsc: new fields.NumberField({ initial: 0, integer: true }),
+      rarete: new fields.NumberField({ initial: 0, integer: true }),
+      quantite: new fields.NumberField({ initial: 1, integer: true }),
+      equipped: new fields.BooleanField({ initial: false })
+    };
+  }
+}
+
+/**
+ * Template pour l'automatisation
+ */
+export class AutomationItemModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      isautomated: new fields.BooleanField({ initial: false }),
+      automations: new fields.ArrayField(
+        new fields.SchemaField({
+          id: new fields.StringField({ initial: "" }),
+          eventtype: new fields.StringField({ initial: "on-drop" }),
+          name: new fields.StringField({ initial: "" }),
+          bonusname: new fields.StringField({ initial: "vigueur" }),
+          bonus: new fields.NumberField({ initial: 0, integer: true }),
+          competence: new fields.StringField({ initial: "" }),
+          minLevel: new fields.NumberField({ initial: 0, integer: true }),
+          baCost: new fields.NumberField({ initial: 0, integer: true })
+        }),
+        { initial: [] }
+      )
+    };
+  }
+}

modules/models/cellule.mjs

@@ -0,0 +1,15 @@
+/**
+ * Data model pour les cellules
+ */
+export default class CelluleDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      notoriete: new fields.NumberField({ initial: 0, integer: true }),
+      resistance: new fields.NumberField({ initial: 0, integer: true }),
+      developpement: new fields.NumberField({ initial: 0, integer: true }),
+      members: new fields.ArrayField(new fields.StringField(), { initial: [] }),
+      description: new fields.HTMLField({ initial: "" })
+    };
+  }
+}

modules/models/competence.mjs

@@ -0,0 +1,27 @@
+/**
+ * Data model pour les compétences
+ */
+export default class CompetenceDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      niveau: new fields.NumberField({ initial: 0, integer: true }),
+      attribut1: new fields.StringField({ initial: "" }),
+      attribut2: new fields.StringField({ initial: "" }),
+      attribut3: new fields.StringField({ initial: "" }),
+      doublebonus: new fields.BooleanField({ initial: false }),
+      predilections: new fields.ArrayField(
+        new fields.SchemaField({
+          id: new fields.StringField({ initial: "" }),
+          name: new fields.StringField({ initial: "" }),
+          description: new fields.StringField({ initial: "" }),
+          acquise: new fields.BooleanField({ initial: false }),
+          maitrise: new fields.BooleanField({ initial: false }),
+          used: new fields.BooleanField({ initial: false })
+        }),
+        { initial: [] }
+      )
+    };
+  }
+}

modules/models/contact.mjs

@@ -0,0 +1,14 @@
+/**
+ * Data model pour les contacts
+ */
+export default class ContactDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      contacttype: new fields.StringField({ initial: "" }),
+      niveau: new fields.StringField({ initial: "" }),
+      pointdev: new fields.NumberField({ initial: 0, integer: true }),
+      description: new fields.HTMLField({ initial: "" })
+    };
+  }
+}

modules/models/creature.mjs

@@ -0,0 +1,97 @@
+/**
+ * Data model pour les créatures
+ */
+export default class CreatureDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      // Template biodata
+      biodata: new fields.SchemaField({
+        name: new fields.StringField({ initial: "" }),
+        age: new fields.NumberField({ initial: 0, integer: true }),
+        poids: new fields.StringField({ initial: "" }),
+        taille: new fields.StringField({ initial: "" }),
+        cheveux: new fields.StringField({ initial: "" }),
+        sexe: new fields.StringField({ initial: "" }),
+        yeux: new fields.StringField({ initial: "" }),
+        description: new fields.HTMLField({ initial: "" }),
+        habitat: new fields.HTMLField({ initial: "" }),
+        notes: new fields.HTMLField({ initial: "" }),
+        statut: new fields.StringField({ initial: "" }),
+        gmnotes: new fields.HTMLField({ initial: "" }),
+        statutresistant: new fields.StringField({ initial: "commun" })
+      }),
+      // Template core
+      subactors: new fields.ArrayField(new fields.StringField(), { initial: [] }),
+      attributs: new fields.SchemaField({
+        adr: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Adresse" }),
+          labelnorm: new fields.StringField({ initial: "adresse" }),
+          abbrev: new fields.StringField({ initial: "adr" }),
+          value: new fields.NumberField({ initial: 1, integer: true })
+        }),
+        pui: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Puissance" }),
+          labelnorm: new fields.StringField({ initial: "puissance" }),
+          abbrev: new fields.StringField({ initial: "pui" }),
+          value: new fields.NumberField({ initial: 1, integer: true })
+        }),
+        cla: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Clairvoyance" }),
+          labelnorm: new fields.StringField({ initial: "clairvoyance" }),
+          abbrev: new fields.StringField({ initial: "cla" }),
+          value: new fields.NumberField({ initial: 1, integer: true })
+        }),
+        pre: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Présence" }),
+          labelnorm: new fields.StringField({ initial: "presence" }),
+          abbrev: new fields.StringField({ initial: "pre" }),
+          value: new fields.NumberField({ initial: 0, integer: true })
+        }),
+        tre: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Trempe" }),
+          labelnorm: new fields.StringField({ initial: "trempe" }),
+          abbrev: new fields.StringField({ initial: "tre" }),
+          value: new fields.NumberField({ initial: 0, integer: true })
+        })
+      }),
+      bonneaventure: new fields.SchemaField({
+        base: new fields.NumberField({ initial: 0, integer: true }),
+        actuelle: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      experience: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      eclat: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      sante: new fields.SchemaField({
+        vigueur: new fields.NumberField({ initial: 0, integer: true }),
+        etat: new fields.NumberField({ initial: 0, integer: true }),
+        vigueurmodifier: new fields.NumberField({ initial: 0, integer: true }),
+        nbcombativite: new fields.NumberField({ initial: 5, integer: true })
+      }),
+      adversite: new fields.SchemaField({
+        bleue: new fields.NumberField({ initial: 0, integer: true }),
+        rouge: new fields.NumberField({ initial: 0, integer: true }),
+        noire: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      vitesse: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      combat: new fields.SchemaField({
+        initbonus: new fields.NumberField({ initial: 0, integer: true }),
+        vitessebonus: new fields.NumberField({ initial: 0, integer: true }),
+        bonusdegats: new fields.NumberField({ initial: 0, integer: true }),
+        attaquebonus: new fields.NumberField({ initial: 0, integer: true }),
+        defensebonus: new fields.NumberField({ initial: 0, integer: true }),
+        defensetotale: new fields.BooleanField({ initial: false }),
+        monte: new fields.BooleanField({ initial: false })
+      }),
+      // Propriétés spécifiques aux créatures
+      ressources: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      })
+    };
+  }
+}

modules/models/equipement.mjs

@@ -0,0 +1,17 @@
+/**
+ * Data model pour l'équipement
+ */
+export default class EquipementDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      prixpo: new fields.NumberField({ initial: 0, integer: true }),
+      prixca: new fields.NumberField({ initial: 0, integer: true }),
+      prixsc: new fields.NumberField({ initial: 0, integer: true }),
+      rarete: new fields.NumberField({ initial: 0, integer: true }),
+      quantite: new fields.NumberField({ initial: 1, integer: true }),
+      equipped: new fields.BooleanField({ initial: false })
+    };
+  }
+}

modules/models/historique.mjs

@@ -0,0 +1,12 @@
+/**
+ * Data model pour les historiques
+ */
+export default class HistoriqueDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      bonusmalus: new fields.StringField({ initial: "" })
+    };
+  }
+}

modules/models/index.mjs

@@ -0,0 +1,23 @@
+/**
+ * Index des DataModels pour Hawkmoon CYD
+ * Ce fichier centralise tous les exports des modèles de données
+ */
+
+// Modèles d'items
+export { default as TalentDataModel } from './talent.mjs';
+export { default as HistoriqueDataModel } from './historique.mjs';
+export { default as ProfilDataModel } from './profil.mjs';
+export { default as CompetenceDataModel } from './competence.mjs';
+export { default as ArmeDataModel } from './arme.mjs';
+export { default as ProtectionDataModel } from './protection.mjs';
+export { default as MonnaieDataModel } from './monnaie.mjs';
+export { default as EquipementDataModel } from './equipement.mjs';
+export { default as ArtefactDataModel } from './artefact.mjs';
+export { default as RessourceDataModel } from './ressource.mjs';
+export { default as ContactDataModel } from './contact.mjs';
+export { default as MutationDataModel } from './mutation.mjs';
+
+// Modèles d'acteurs
+export { default as PersonnageDataModel } from './personnage.mjs';
+export { default as CelluleDataModel } from './cellule.mjs';
+export { default as CreatureDataModel } from './creature.mjs';

modules/models/monnaie.mjs

@@ -0,0 +1,17 @@
+/**
+ * Data model pour les monnaies
+ */
+export default class MonnaieDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      prixpo: new fields.NumberField({ initial: 0, integer: true }),
+      prixca: new fields.NumberField({ initial: 0, integer: true }),
+      prixsc: new fields.NumberField({ initial: 0, integer: true }),
+      rarete: new fields.NumberField({ initial: 0, integer: true }),
+      quantite: new fields.NumberField({ initial: 1, integer: true }),
+      equipped: new fields.BooleanField({ initial: false })
+    };
+  }
+}

modules/models/mutation.mjs

@@ -0,0 +1,14 @@
+/**
+ * Data model pour les mutations
+ */
+export default class MutationDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      mutationcategorie: new fields.StringField({ initial: "tares_communes" }),
+      hascomplexite: new fields.BooleanField({ initial: false }),
+      complexite: new fields.NumberField({ initial: 0, integer: true })
+    };
+  }
+}

modules/models/personnage.mjs

@@ -0,0 +1,93 @@
+/**
+ * Data model pour les personnages
+ */
+export default class PersonnageDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      // Template biodata
+      biodata: new fields.SchemaField({
+        name: new fields.StringField({ initial: "" }),
+        age: new fields.NumberField({ initial: 0, integer: true }),
+        poids: new fields.StringField({ initial: "" }),
+        taille: new fields.StringField({ initial: "" }),
+        cheveux: new fields.StringField({ initial: "" }),
+        sexe: new fields.StringField({ initial: "" }),
+        yeux: new fields.StringField({ initial: "" }),
+        description: new fields.HTMLField({ initial: "" }),
+        habitat: new fields.HTMLField({ initial: "" }),
+        notes: new fields.HTMLField({ initial: "" }),
+        statut: new fields.StringField({ initial: "" }),
+        gmnotes: new fields.HTMLField({ initial: "" }),
+        statutresistant: new fields.StringField({ initial: "commun" })
+      }),
+      // Template core
+      subactors: new fields.ArrayField(new fields.StringField(), { initial: [] }),
+      attributs: new fields.SchemaField({
+        adr: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Adresse" }),
+          labelnorm: new fields.StringField({ initial: "adresse" }),
+          abbrev: new fields.StringField({ initial: "adr" }),
+          value: new fields.NumberField({ initial: 1, integer: true })
+        }),
+        pui: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Puissance" }),
+          labelnorm: new fields.StringField({ initial: "puissance" }),
+          abbrev: new fields.StringField({ initial: "pui" }),
+          value: new fields.NumberField({ initial: 1, integer: true })
+        }),
+        cla: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Clairvoyance" }),
+          labelnorm: new fields.StringField({ initial: "clairvoyance" }),
+          abbrev: new fields.StringField({ initial: "cla" }),
+          value: new fields.NumberField({ initial: 1, integer: true })
+        }),
+        pre: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Présence" }),
+          labelnorm: new fields.StringField({ initial: "presence" }),
+          abbrev: new fields.StringField({ initial: "pre" }),
+          value: new fields.NumberField({ initial: 0, integer: true })
+        }),
+        tre: new fields.SchemaField({
+          label: new fields.StringField({ initial: "Trempe" }),
+          labelnorm: new fields.StringField({ initial: "trempe" }),
+          abbrev: new fields.StringField({ initial: "tre" }),
+          value: new fields.NumberField({ initial: 0, integer: true })
+        })
+      }),
+      bonneaventure: new fields.SchemaField({
+        base: new fields.NumberField({ initial: 0, integer: true }),
+        actuelle: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      experience: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      eclat: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      sante: new fields.SchemaField({
+        vigueur: new fields.NumberField({ initial: 0, integer: true }),
+        etat: new fields.NumberField({ initial: 0, integer: true }),
+        vigueurmodifier: new fields.NumberField({ initial: 0, integer: true }),
+        nbcombativite: new fields.NumberField({ initial: 5, integer: true })
+      }),
+      adversite: new fields.SchemaField({
+        bleue: new fields.NumberField({ initial: 0, integer: true }),
+        rouge: new fields.NumberField({ initial: 0, integer: true }),
+        noire: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      vitesse: new fields.SchemaField({
+        value: new fields.NumberField({ initial: 0, integer: true })
+      }),
+      combat: new fields.SchemaField({
+        initbonus: new fields.NumberField({ initial: 0, integer: true }),
+        vitessebonus: new fields.NumberField({ initial: 0, integer: true }),
+        bonusdegats: new fields.NumberField({ initial: 0, integer: true }),
+        attaquebonus: new fields.NumberField({ initial: 0, integer: true }),
+        defensebonus: new fields.NumberField({ initial: 0, integer: true }),
+        defensetotale: new fields.BooleanField({ initial: false }),
+        monte: new fields.BooleanField({ initial: false })
+      })
+    };
+  }
+}

modules/models/profil.mjs

@@ -0,0 +1,23 @@
+/**
+ * Data model pour les profils
+ */
+export default class ProfilDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      exemples: new fields.StringField({ initial: "" }),
+      attribut1: new fields.StringField({ initial: "" }),
+      attribut2: new fields.StringField({ initial: "" }),
+      attribut3: new fields.StringField({ initial: "" }),
+      competences: new fields.StringField({ initial: "" }),
+      talentsinitie: new fields.StringField({ initial: "" }),
+      prerequisaguerri: new fields.StringField({ initial: "" }),
+      talentsaguerri: new fields.StringField({ initial: "" }),
+      prerequismaitre: new fields.StringField({ initial: "" }),
+      talentsmaitre: new fields.StringField({ initial: "" }),
+      celluleinfo: new fields.StringField({ initial: "" }),
+      equipement: new fields.StringField({ initial: "" })
+    };
+  }
+}

modules/models/protection.mjs

@@ -0,0 +1,19 @@
+/**
+ * Data model pour les protections
+ */
+export default class ProtectionDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      prixpo: new fields.NumberField({ initial: 0, integer: true }),
+      prixca: new fields.NumberField({ initial: 0, integer: true }),
+      prixsc: new fields.NumberField({ initial: 0, integer: true }),
+      rarete: new fields.NumberField({ initial: 0, integer: true }),
+      quantite: new fields.NumberField({ initial: 1, integer: true }),
+      equipped: new fields.BooleanField({ initial: false }),
+      protection: new fields.NumberField({ initial: 0, integer: true }),
+      adversitepoids: new fields.NumberField({ initial: 0, integer: true })
+    };
+  }
+}

modules/models/ressource.mjs

@@ -0,0 +1,12 @@
+/**
+ * Data model pour les ressources
+ */
+export default class RessourceDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      pointdev: new fields.NumberField({ initial: 0, integer: true }),
+      description: new fields.HTMLField({ initial: "" })
+    };
+  }
+}

modules/models/talent.mjs

@@ -0,0 +1,30 @@
+/**
+ * Data model pour les talents
+ */
+export default class TalentDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      isautomated: new fields.BooleanField({ initial: false }),
+      automations: new fields.ArrayField(
+        new fields.SchemaField({
+          id: new fields.StringField({ initial: "" }),
+          eventtype: new fields.StringField({ initial: "on-drop" }),
+          name: new fields.StringField({ initial: "" }),
+          bonusname: new fields.StringField({ initial: "vigueur" }),
+          bonus: new fields.NumberField({ initial: 0, integer: true }),
+          competence: new fields.StringField({ initial: "" }),
+          minLevel: new fields.NumberField({ initial: 0, integer: true }),
+          baCost: new fields.NumberField({ initial: 0, integer: true })
+        }),
+        { initial: [] }
+      ),
+      talenttype: new fields.StringField({ initial: "" }),
+      utilisation: new fields.StringField({ initial: "" }),
+      prerequis: new fields.StringField({ initial: "" }),
+      resumebonus: new fields.StringField({ initial: "" }),
+      used: new fields.BooleanField({ initial: false })
+    };
+  }
+}

packs/aides-de-jeu/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000377

packs/aides-de-jeu/LOG

@@ -0,0 +1,8 @@
+2026/01/09-17:40:07.997473 7f1c563fe6c0 Recovering log #375
+2026/01/09-17:40:08.091717 7f1c563fe6c0 Delete type=0 #375
+2026/01/09-17:40:08.091792 7f1c563fe6c0 Delete type=3 #373
+2026/01/09-17:44:28.072757 7f1c54bfb6c0 Level-0 table #380: started
+2026/01/09-17:44:28.072827 7f1c54bfb6c0 Level-0 table #380: 0 bytes OK
+2026/01/09-17:44:28.079432 7f1c54bfb6c0 Delete type=0 #378
+2026/01/09-17:44:28.105106 7f1c54bfb6c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2026/01/09-17:44:28.117150 7f1c54bfb6c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)

packs/aides-de-jeu/LOG.old

@@ -0,0 +1,8 @@
+2026/01/08-08:15:08.713116 7f93ea7fc6c0 Recovering log #371
+2026/01/08-08:15:08.722804 7f93ea7fc6c0 Delete type=3 #369
+2026/01/08-08:15:08.722873 7f93ea7fc6c0 Delete type=0 #371
+2026/01/08-08:28:05.068912 7f93e9ffb6c0 Level-0 table #376: started
+2026/01/08-08:28:05.068957 7f93e9ffb6c0 Level-0 table #376: 0 bytes OK
+2026/01/08-08:28:05.106033 7f93e9ffb6c0 Delete type=0 #374
+2026/01/08-08:28:05.217659 7f93e9ffb6c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
+2026/01/08-08:28:05.217719 7f93e9ffb6c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)