Divers petits fixs

templates/actor-personnage-sheet-v18.hbs

@@ -188,7 +188,7 @@
         {{#if equippedWeapons.length}}
           {{#each equippedWeapons as |item|}}
             <article class="item-card" data-item-id="{{item.id}}" draggable="true">
-              <div><strong>{{item.name}}</strong><div>{{localize "TYPES.Item.arme"}} - {{item.system.damage}}</div></div>
+              <div><strong>{{item.name}}</strong><div>{{localize "TYPES.Item.arme"}} - {{item.displayDamage}}</div></div>
               <div class="item-controls"><button type="button" data-action="useWeapon" data-item-id="{{item.id}}">Attaque</button><button type="button" data-action="resolveWeaponDamage" data-item-id="{{item.id}}">Dégâts</button><button type="button" data-action="toggleEquipped" data-item-id="{{item.id}}">Retirer</button></div>
             </article>
           {{/each}}
@@ -198,101 +198,100 @@
       </div>
     </section>
 
-    <div class="sheet-grid sheet-grid-2">
-      <section class="sheet-card ledger-card">
-        <div class="section-title-row">
-          <h2>{{localize "LESOUBLIES.ui.magie"}}</h2>
-          <button type="button" data-action="createItem" data-type="sortilege">+ {{localize "TYPES.Item.sortilege"}}</button>
+    <section class="sheet-card ledger-card reserve-card">
+      <div class="section-title-row">
+        <h2>{{localize "LESOUBLIES.labels.threadReserves"}}</h2>
+        <button type="button" data-action="openThreadHarvest">Récolte de fils</button>
+      </div>
+      <div class="reserve-grid">
+        <div class="reserve-panel">
+          <h3>{{localize "LESOUBLIES.labels.personalReserve"}}</h3>
+          <div class="field-row">
+            <label>{{localize "LESOUBLIES.labels.threadSonges"}}</label>
+            <input name="system.reserves.songesThreads" type="number" value="{{system.reserves.songesThreads}}" {{#if isPlayMode}}disabled{{/if}} />
+          </div>
+          <div class="field-row">
+            <label>{{localize "LESOUBLIES.labels.threadCauchemar"}}</label>
+            <input name="system.reserves.cauchemarThreads" type="number" value="{{system.reserves.cauchemarThreads}}" {{#if isPlayMode}}disabled{{/if}} />
+          </div>
+          <div class="field-row">
+            <label>{{localize "LESOUBLIES.labels.emptyGlobes"}}</label>
+            <input name="system.reserves.emptyGlobes" type="number" value="{{system.reserves.emptyGlobes}}" {{#if isPlayMode}}disabled{{/if}} />
+          </div>
         </div>
-        <div class="item-list">
-          {{#each spells as |item|}}
-            <article class="item-card" data-item-id="{{item.id}}" draggable="true">
-              <div>
-                <strong>{{item.name}}</strong>
-                <div>{{item.system.tradition}} / {{item.system.polarity}} / coût {{item.system.cost}}</div>
-              </div>
-              <div class="item-controls">
-                <button type="button" data-action="useSpell" data-item-id="{{item.id}}">Activer</button>
-                <button type="button" data-action="editItem" data-item-id="{{item.id}}">Edit</button>
-                <button type="button" data-action="deleteItem" data-item-id="{{item.id}}">Delete</button>
-              </div>
-            </article>
-          {{/each}}
-        </div>
-      </section>
 
-      <section class="sheet-card ledger-card reserve-card">
-        <div class="section-title-row">
-          <h2>{{localize "LESOUBLIES.labels.threadReserves"}}</h2>
-          <button type="button" data-action="openThreadHarvest">Récolte de fils</button>
-        </div>
-        <div class="reserve-grid">
-          <div class="reserve-panel">
-            <h3>{{localize "LESOUBLIES.labels.personalReserve"}}</h3>
+        <div class="reserve-panel reserve-panel--company">
+          <h3>{{localize "LESOUBLIES.labels.companyReserve"}}</h3>
+          {{#if derived.compagnie}}
             <div class="field-row">
               <label>{{localize "LESOUBLIES.labels.threadSonges"}}</label>
-              <input name="system.reserves.songesThreads" type="number" value="{{system.reserves.songesThreads}}" {{#if isPlayMode}}disabled{{/if}} />
+              <span>{{derived.companyReserves.songesThreads}}</span>
             </div>
             <div class="field-row">
               <label>{{localize "LESOUBLIES.labels.threadCauchemar"}}</label>
-              <input name="system.reserves.cauchemarThreads" type="number" value="{{system.reserves.cauchemarThreads}}" {{#if isPlayMode}}disabled{{/if}} />
+              <span>{{derived.companyReserves.cauchemarThreads}}</span>
             </div>
             <div class="field-row">
               <label>{{localize "LESOUBLIES.labels.emptyGlobes"}}</label>
-              <input name="system.reserves.emptyGlobes" type="number" value="{{system.reserves.emptyGlobes}}" {{#if isPlayMode}}disabled{{/if}} />
+              <span>{{derived.companyReserves.emptyGlobes}}</span>
             </div>
-          </div>
 
-          <div class="reserve-panel reserve-panel--company">
-            <h3>{{localize "LESOUBLIES.labels.companyReserve"}}</h3>
-            {{#if derived.compagnie}}
-              <div class="field-row">
-                <label>{{localize "LESOUBLIES.labels.threadSonges"}}</label>
-                <span>{{derived.companyReserves.songesThreads}}</span>
-              </div>
-              <div class="field-row">
-                <label>{{localize "LESOUBLIES.labels.threadCauchemar"}}</label>
-                <span>{{derived.companyReserves.cauchemarThreads}}</span>
-              </div>
-              <div class="field-row">
-                <label>{{localize "LESOUBLIES.labels.emptyGlobes"}}</label>
-                <span>{{derived.companyReserves.emptyGlobes}}</span>
-              </div>
-
-              <div class="transfer-list">
-                <div class="transfer-row" data-transfer-row>
-                  <strong>{{localize "LESOUBLIES.labels.threadSonges"}}</strong>
-                  <input type="number" min="1" value="1" data-transfer-amount />
-                  <div class="item-controls">
-                    <button type="button" data-action="transferThread" data-direction="toCompany" data-resource-key="songesThreads">{{localize "LESOUBLIES.labels.toCompany"}}</button>
-                    <button type="button" data-action="transferThread" data-direction="toActor" data-resource-key="songesThreads">{{localize "LESOUBLIES.labels.toActor"}}</button>
-                  </div>
-                </div>
-                <div class="transfer-row" data-transfer-row>
-                  <strong>{{localize "LESOUBLIES.labels.threadCauchemar"}}</strong>
-                  <input type="number" min="1" value="1" data-transfer-amount />
-                  <div class="item-controls">
-                    <button type="button" data-action="transferThread" data-direction="toCompany" data-resource-key="cauchemarThreads">{{localize "LESOUBLIES.labels.toCompany"}}</button>
-                    <button type="button" data-action="transferThread" data-direction="toActor" data-resource-key="cauchemarThreads">{{localize "LESOUBLIES.labels.toActor"}}</button>
-                  </div>
-                </div>
-                <div class="transfer-row" data-transfer-row>
-                  <strong>{{localize "LESOUBLIES.labels.emptyGlobes"}}</strong>
-                  <input type="number" min="1" value="1" data-transfer-amount />
-                  <div class="item-controls">
-                    <button type="button" data-action="transferThread" data-direction="toCompany" data-resource-key="emptyGlobes">{{localize "LESOUBLIES.labels.toCompany"}}</button>
-                    <button type="button" data-action="transferThread" data-direction="toActor" data-resource-key="emptyGlobes">{{localize "LESOUBLIES.labels.toActor"}}</button>
-                  </div>
+            <div class="transfer-list">
+              <div class="transfer-row" data-transfer-row>
+                <strong>{{localize "LESOUBLIES.labels.threadSonges"}}</strong>
+                <input type="number" min="1" value="1" data-transfer-amount />
+                <div class="item-controls">
+                  <button type="button" data-action="transferThread" data-direction="toCompany" data-resource-key="songesThreads">{{localize "LESOUBLIES.labels.toCompany"}}</button>
+                  <button type="button" data-action="transferThread" data-direction="toActor" data-resource-key="songesThreads">{{localize "LESOUBLIES.labels.toActor"}}</button>
                 </div>
               </div>
-            {{else}}
-              <p class="help-text">Liez une compagnie pour gérer une réserve commune de fils et de globes.</p>
-            {{/if}}
-          </div>
+              <div class="transfer-row" data-transfer-row>
+                <strong>{{localize "LESOUBLIES.labels.threadCauchemar"}}</strong>
+                <input type="number" min="1" value="1" data-transfer-amount />
+                <div class="item-controls">
+                  <button type="button" data-action="transferThread" data-direction="toCompany" data-resource-key="cauchemarThreads">{{localize "LESOUBLIES.labels.toCompany"}}</button>
+                  <button type="button" data-action="transferThread" data-direction="toActor" data-resource-key="cauchemarThreads">{{localize "LESOUBLIES.labels.toActor"}}</button>
+                </div>
+              </div>
+              <div class="transfer-row" data-transfer-row>
+                <strong>{{localize "LESOUBLIES.labels.emptyGlobes"}}</strong>
+                <input type="number" min="1" value="1" data-transfer-amount />
+                <div class="item-controls">
+                  <button type="button" data-action="transferThread" data-direction="toCompany" data-resource-key="emptyGlobes">{{localize "LESOUBLIES.labels.toCompany"}}</button>
+                  <button type="button" data-action="transferThread" data-direction="toActor" data-resource-key="emptyGlobes">{{localize "LESOUBLIES.labels.toActor"}}</button>
+                </div>
+              </div>
+            </div>
+          {{else}}
+            <p class="help-text">Liez une compagnie pour gérer une réserve commune de fils et de globes.</p>
+          {{/if}}
         </div>
-        <p class="help-text">Les dépenses en fils rendent automatiquement autant de globes vides à la réserve utilisée.</p>
-      </section>
-    </div>
+      </div>
+      <p class="help-text">Les dépenses en fils rendent automatiquement autant de globes vides à la réserve utilisée.</p>
+    </section>
+
+    <section class="sheet-card ledger-card">
+      <div class="section-title-row">
+        <h2>{{localize "LESOUBLIES.ui.magie"}}</h2>
+        <button type="button" data-action="createItem" data-type="sortilege">+ {{localize "TYPES.Item.sortilege"}}</button>
+      </div>
+      <div class="item-list">
+        {{#each spells as |item|}}
+          <article class="item-card" data-item-id="{{item.id}}" draggable="true">
+            <div>
+              <strong>{{item.name}}</strong>
+              <div>{{item.system.tradition}} / {{item.system.polarity}} / coût {{item.system.cost}}</div>
+            </div>
+            <div class="item-controls">
+              <button type="button" data-action="useSpell" data-item-id="{{item.id}}">Activer</button>
+              <button type="button" data-action="editItem" data-item-id="{{item.id}}">Edit</button>
+              <button type="button" data-action="deleteItem" data-item-id="{{item.id}}">Delete</button>
+            </div>
+          </article>
+        {{/each}}
+      </div>
+    </section>
+
   </section>
 
   <section class="sheet-tab {{tabs.equipment.cssClass}}" data-tab="equipment">
@@ -308,7 +307,7 @@
         <div class="item-list">
         {{#each weapons as |item|}}
           <article class="item-card" data-item-id="{{item.id}}" draggable="true">
-            <div><strong>{{item.name}}</strong><div>{{localize "TYPES.Item.arme"}} - {{item.system.damage}}{{#if item.system.equipped}} - Équipée{{/if}}</div></div>
+            <div><strong>{{item.name}}</strong><div>{{localize "TYPES.Item.arme"}} - {{item.displayDamage}}{{#if item.system.equipped}} - Équipée{{/if}}</div></div>
             <div class="item-controls"><button type="button" data-action="toggleEquipped" data-item-id="{{item.id}}">{{#if item.system.equipped}}Retirer{{else}}Équiper{{/if}}</button><button type="button" data-action="editItem" data-item-id="{{item.id}}">Edit</button><button type="button" data-action="deleteItem" data-item-id="{{item.id}}">Delete</button></div>
           </article>
         {{/each}}