feat: améliorer les fiches (tests PNJ/créature, message de jet, compétences, créatures)

templates/actor/actor-npc-sheet.hbs

@@ -221,6 +221,7 @@
             {{> "systems/vermine2047/templates/actor/parts/npc-skill-category.hbs" 
               categoryKey=key 
               categoryLabel=(concat "VERMINE.skill_category." key)
+              skills=@root.system.skills
             }}
           {{/if}}
         {{/each}}

templates/actor/appv2/character-abilities.hbs

@@ -55,7 +55,7 @@
             >
             {{/if}}
           </h4>
-          {{#each @root.system.skills as |skill skey|}}
+          {{#each (sortedSkills @root.system.skills) as |skill skey|}}
 
             {{#if (eq skill.category sckey) }}
               <div class="ability flexrow ">
@@ -79,12 +79,10 @@
                       data-action="addSpecialty"
                     ></i>
                   {{/ifgt}}
-                  {{#each skill.specialties as |spe ind|}}
+                  {{#each @root.specialties as |spe|}}
                     {{#ife spe.system.skill skey}}
-                      <i
-                        class="specialty"
-                        data-tooltip="spécialité utilisable"
-                      >{{spe.name}}</i>
+                      <span class="specialty" data-tooltip="spécialité utilisable"
+                        >{{spe.name}}<sup>{{spe.system.level}}</sup></span>
                     {{/ife}}
                   {{/each}}
                 </div>

templates/actor/appv2/character-equipment.hbs

@@ -1,90 +1,4 @@
 <div class="tab equipment sheet-part" data-group="sheet" data-tab="equipment">
-  <div class="grid grid-2col">
-    <div>
-      <ol class="items-list">
-        <li class="item flexrow items-header">
-          <div
-            class="item-name"
-            style="flex:4;"
-          >{{ localize
-            'IDENTITY.name'}}</div>
-          <div class="item-quantity">{{ localize 'VERMINE.qty'}}</div>
-          <div class="item-weight">{{ localize 'VERMINE.weight'}}</div>
-          <div class="item-controls">
-            {{#if isEditMode}}
-            <a
-              class="item-control item-create"
-              title="Create item"
-              data-action="create"
-              data-type="item"
-            ><i class="fas fa-plus"></i></a>
-            {{/if}}
-          </div>
-        </li>
-        {{#each gear as |item id|}}
-          <li
-            class="item flexrow flex-group-center"
-            data-item-id="{{item._id}}"
-          >
-            <div
-              class="item-name"
-              style="flex:4;"
-            >
-              <div class="item-image">
-                <a
-                  class="item-control item-edit"
-                  data-action="edit"
-                  data-item-id="{{item._id}}"
-                  data-roll-type="item"
-                ><img
-                    src="{{item.img}}"
-                    title="{{item.name}}"
-                    width="24"
-                    height="24"
-                  /></a>
-              </div>
-              <a
-                class="item-control item-edit"
-                data-action="edit"
-                data-item-id="{{item._id}}"
-                data-tooltip="Edit Item"
-              >{{item.name}} </a>
-
-              {{#if item.system.damages.value}}
-                /
-                <span data-tooltip="{{item.damagedLabel}}">{{{item.damagedIcon}}}</span>
-              {{/if}}
-
-            </div>
-            <div>
-              <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">
-                {{item.system.quantity}}
-              </a>
-            </div>
-            <div>
-              <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">
-                {{item.system.weight}}
-              </a>
-            </div>
-            <div class="item-controls">
-              {{#if @root.isEditMode}}
-              <a
-                class="item-control item-delete"
-                data-action="delete"
-                data-item-id="{{item._id}}"
-                title="Delete Item"
-              ><i class="fas fa-trash"></i></a>
-              {{/if}}
-            </div>
-          </li>
-        {{/each}}
-      </ol>
-    </div>
-    <div>
-      <h4>{{ localize 'IDENTITY.notes'}}</h4>
-      {{formInput systemFields.equipment.fields.description enriched=enrichedEquipmentNotes value=system.equipment.description name="system.equipment.description" toggled=true}}
-    </div>
-  </div>
   <div class="weapons">
     <h4>{{localize 'ITEMS.weapons'}}</h4>
     {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
@@ -93,4 +7,87 @@
     <h4>{{localize 'ITEMS.defenses'}}</h4>
     {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
   </div>
+  <div class="objects">
+    <h4>{{localize 'ITEMS.items'}}</h4>
+    <ol class="items-list">
+      <li class="item flexrow items-header">
+        <div
+          class="item-name"
+          style="flex:4;"
+        >{{ localize
+          'IDENTITY.name'}}</div>
+        <div class="item-quantity">{{ localize 'VERMINE.qty'}}</div>
+        <div class="item-weight">{{ localize 'VERMINE.weight'}}</div>
+        <div class="item-controls">
+          <a
+            class="item-control item-create"
+            title="Create item"
+            data-action="create"
+            data-type="item"
+          ><i class="fas fa-plus"></i></a>
+        </div>
+      </li>
+      {{#each gear as |item id|}}
+        <li
+          class="item flexrow flex-group-center"
+          data-item-id="{{item._id}}"
+        >
+          <div
+            class="item-name"
+            style="flex:4;"
+          >
+            <div class="item-image">
+              <a
+                class="item-control item-edit"
+                data-action="edit"
+                data-item-id="{{item._id}}"
+                data-roll-type="item"
+              ><img
+                  src="{{item.img}}"
+                  title="{{item.name}}"
+                  width="24"
+                  height="24"
+                /></a>
+            </div>
+            <a
+              class="item-control item-edit"
+              data-action="edit"
+              data-item-id="{{item._id}}"
+              data-tooltip="Edit Item"
+            >{{item.name}} </a>
+
+            {{#if item.system.damages.value}}
+              /
+              <span data-tooltip="{{item.damagedLabel}}">{{{item.damagedIcon}}}</span>
+            {{/if}}
+
+          </div>
+          <div>
+            <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">
+              {{item.system.quantity}}
+            </a>
+          </div>
+          <div>
+            <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">
+              {{item.system.weight}}
+            </a>
+          </div>
+          <div class="item-controls">
+            {{#if @root.isEditMode}}
+            <a
+              class="item-control item-delete"
+              data-action="delete"
+              data-item-id="{{item._id}}"
+              title="Delete Item"
+            ><i class="fas fa-trash"></i></a>
+            {{/if}}
+          </div>
+        </li>
+      {{/each}}
+    </ol>
+  </div>
+  <div class="equipment-notes">
+    <h4>{{ localize 'IDENTITY.notes'}}</h4>
+    {{formInput systemFields.equipment.fields.description enriched=enrichedEquipmentNotes value=system.equipment.description name="system.equipment.description" toggled=true}}
+  </div>
 </div>

templates/actor/appv2/creature-stats.hbs

@@ -1,5 +1,12 @@
 <div class="tab stats sheet-part" data-group="sheet" data-tab="stats">
   <h3>{{ localize 'VERMINE.base_values' }}</h3>
+
+  {{!-- Total attaque (lancable) --}}
+  <div class="mdb align-center">
+    <h4>{{ localize 'VERMINE.total_attack' }}</h4>
+    <a class="rollable" data-type="creature-attack" data-label="attack" title="{{ localize 'VERMINE.roll' }}">{{ system.computed.attack }}<i class="fas fa-dice-d10"></i></a>
+  </div>
+
   <section class="grid grid-3col gap-md">
     <div class="mdb">
       <h4 class="align-center">{{ localize 'ADVERSITY.pattern' }}: {{ patternLabel }}</h4>
@@ -16,12 +23,12 @@
     <div class="mdb">
       <h4 class="align-center">{{ localize 'ADVERSITY.size' }}: {{ sizeLabel }}</h4>
       <ul class="unstyled">
-        <li>{{ localize 'ADVERSITY.attack' }}: {{ creatureSizeLevel "attack" system.size.value }}</li>
-        <li>{{ localize 'ADVERSITY.vigor' }}: {{ creatureSizeLevel "vigor" system.size.value }}</li>
+        <li>{{ localize 'ADVERSITY.attack' }}: {{ sizeCumulative.attack }}</li>
+        <li>{{ localize 'ADVERSITY.vigor' }}: {{ sizeCumulative.vigor }}</li>
         <li>{{ localize 'ADVERSITY.wounds' }}:
-          {{ creatureSizeLevel "minorWound" system.size.value }}/
-          {{ creatureSizeLevel "majorWound" system.size.value }}/
-          {{ creatureSizeLevel "deadlyWound" system.size.value }}
+          {{ sizeCumulative.minorWound }}/
+          {{ sizeCumulative.majorWound }}/
+          {{ sizeCumulative.deadlyWound }}
         </li>
       </ul>
     </div>

templates/actor/appv2/npc-characteristics.hbs

@@ -6,7 +6,7 @@
     <h4 class="ability-category-header">{{ localize 'VERMINE.ability_category.physical' }}</h4>
     <div class="grid grid-2col">
       <div class="ability-item">
-        <label for="system.abilities.vigor.value">{{ localize 'ABILITIES.vigor.name' }}</label>
+        <label for="system.abilities.vigor.value" class="resource-label rollable" data-type="ability" data-label="vigor">{{ localize 'ABILITIES.vigor.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.vigor.value" value="{{system.abilities.vigor.value}}" min="{{system.abilities.vigor.min}}" max="{{system.abilities.vigor.max}}" data-dtype="Number"/>
@@ -15,7 +15,7 @@
         </div>
       </div>
       <div class="ability-item">
-        <label for="system.abilities.health.value">{{ localize 'ABILITIES.health.name' }}</label>
+        <label for="system.abilities.health.value" class="resource-label rollable" data-type="ability" data-label="health">{{ localize 'ABILITIES.health.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.health.value" value="{{system.abilities.health.value}}" min="{{system.abilities.health.min}}" max="{{system.abilities.health.max}}" data-dtype="Number"/>
@@ -31,7 +31,7 @@
     <h4 class="ability-category-header">{{ localize 'VERMINE.ability_category.manual' }}</h4>
     <div class="grid grid-2col">
       <div class="ability-item">
-        <label for="system.abilities.precision.value">{{ localize 'ABILITIES.precision.name' }}</label>
+        <label for="system.abilities.precision.value" class="resource-label rollable" data-type="ability" data-label="precision">{{ localize 'ABILITIES.precision.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.precision.value" value="{{system.abilities.precision.value}}" min="{{system.abilities.precision.min}}" max="{{system.abilities.precision.max}}" data-dtype="Number"/>
@@ -40,7 +40,7 @@
         </div>
       </div>
       <div class="ability-item">
-        <label for="system.abilities.reflexes.value">{{ localize 'ABILITIES.reflexes.name' }}</label>
+        <label for="system.abilities.reflexes.value" class="resource-label rollable" data-type="ability" data-label="reflexes">{{ localize 'ABILITIES.reflexes.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.reflexes.value" value="{{system.abilities.reflexes.value}}" min="{{system.abilities.reflexes.min}}" max="{{system.abilities.reflexes.max}}" data-dtype="Number"/>
@@ -56,7 +56,7 @@
     <h4 class="ability-category-header">{{ localize 'VERMINE.ability_category.mental' }}</h4>
     <div class="grid grid-2col">
       <div class="ability-item">
-        <label for="system.abilities.knowledge.value">{{ localize 'ABILITIES.knowledge.name' }}</label>
+        <label for="system.abilities.knowledge.value" class="resource-label rollable" data-type="ability" data-label="knowledge">{{ localize 'ABILITIES.knowledge.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.knowledge.value" value="{{system.abilities.knowledge.value}}" min="{{system.abilities.knowledge.min}}" max="{{system.abilities.knowledge.max}}" data-dtype="Number"/>
@@ -65,7 +65,7 @@
         </div>
       </div>
       <div class="ability-item">
-        <label for="system.abilities.perception.value">{{ localize 'ABILITIES.perception.name' }}</label>
+        <label for="system.abilities.perception.value" class="resource-label rollable" data-type="ability" data-label="perception">{{ localize 'ABILITIES.perception.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.perception.value" value="{{system.abilities.perception.value}}" min="{{system.abilities.perception.min}}" max="{{system.abilities.perception.max}}" data-dtype="Number"/>
@@ -81,7 +81,7 @@
     <h4 class="ability-category-header">{{ localize 'VERMINE.ability_category.social' }}</h4>
     <div class="grid grid-2col">
       <div class="ability-item">
-        <label for="system.abilities.will.value">{{ localize 'ABILITIES.will.name' }}</label>
+        <label for="system.abilities.will.value" class="resource-label rollable" data-type="ability" data-label="will">{{ localize 'ABILITIES.will.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.will.value" value="{{system.abilities.will.value}}" min="{{system.abilities.will.min}}" max="{{system.abilities.will.max}}" data-dtype="Number"/>
@@ -90,7 +90,7 @@
         </div>
       </div>
       <div class="ability-item">
-        <label for="system.abilities.empathy.value">{{ localize 'ABILITIES.empathy.name' }}</label>
+        <label for="system.abilities.empathy.value" class="resource-label rollable" data-type="ability" data-label="empathy">{{ localize 'ABILITIES.empathy.name' }}</label>
         <div class="ability-control">
           {{#if isEditMode}}
           <input type="range" name="system.abilities.empathy.value" value="{{system.abilities.empathy.value}}" min="{{system.abilities.empathy.min}}" max="{{system.abilities.empathy.max}}" data-dtype="Number"/>

templates/actor/appv2/npc-skills.hbs

@@ -27,6 +27,7 @@
         {{> "systems/vermine2047/templates/actor/parts/npc-skill-category.hbs"
           categoryKey=key
           categoryLabel=(concat "VERMINE.skill_category." key)
+          skills=@root.system.skills
         }}
       {{/ife}}
     {{/each}}

templates/actor/character/character-features.hbs

@@ -48,7 +48,7 @@
             {{/ife}}
           >
         </h4>
-        {{#each @root.system.skills as |skill skey|}}
+        {{#each (sortedSkills @root.system.skills) as |skill skey|}}
 
           {{#if (eq skill.category sckey) }}
             <div class="ability flexrow ">
@@ -70,14 +70,16 @@
                     data-tooltip="ajout de spécialité"
                   ></i>
                 {{/ifgt}}
-                {{#each skill.specialties as |spe ind|}}
+                {{#if @root.specialties}}
+                {{#each @root.specialties as |spe|}}
                   {{#ife spe.system.skill skey}}
-                    <i
+                    <span
                       class="specialty"
                       data-tooltip="spécialité utilisable"
-                    >{{spe.name}}</i>
+                    >{{spe.name}}<sup>{{spe.system.level}}</sup></span>
                   {{/ife}}
                 {{/each}}
+                {{/if}}
               </div>
               <select
                 name="system.skills.{{skey}}.value"

templates/actor/parts/actor-defenses.hbs

@@ -15,6 +15,7 @@
         data-type="defense"
         data-action="create"
       ><i class="fas fa-plus"></i></a>
+      <a style="visibility:hidden;" aria-hidden="true"><i class="fas fa-trash"></i></a>
     </div>
   </li>
   {{#each defenses as |item id|}}

templates/actor/parts/actor-weapons.hbs

@@ -9,6 +9,8 @@
     <div class="item-controls">
       <a class="item-control item-create" title="Create item"
         data-type="weapon" data-action="create"><i class="fas fa-plus"></i></a>
+      <a style="visibility:hidden;" aria-hidden="true"><i class="fas fa-trash"></i></a>
+      <a style="visibility:hidden;" aria-hidden="true"><i class="fas fa-edit"></i></a>
     </div>
   </li>
   {{#each weapons as |item id|}}

templates/actor/parts/npc-skill-category.hbs

@@ -2,8 +2,8 @@
 <div class="skill-category">
   <h4>{{ localize categoryLabel }}</h4>
   <div class="grid grid-2col">
-    {{#each system.skills as |skill key|}}
-      {{#ife skill.category categoryKey}}
+    {{#each (sortedSkills skills) as |skill key|}}
+      {{#ife skill.category ../categoryKey}}
         {{> "systems/vermine2047/templates/actor/parts/npc-skill-item.hbs" skill=skill key=key}}
       {{/ife}}
     {{/each}}

templates/actor/parts/npc-skill-item.hbs

@@ -1,6 +1,6 @@
 <div class="skill-item">
-  <label for="system.skills.{{key}}.value" title="{{ localize (concat 'SKILLS.' key) }} - {{ localize (concat 'VERMINE.rarity_' skill.rarity) }}">
-    {{ localize (concat 'SKILLS.' key) }}
+  <label for="system.skills.{{key}}.value" class="resource-label rollable" data-type="skill" data-label="{{key}}" title="{{ smarttlk 'SKILLS' key 'name' }} - {{ localize (concat 'VERMINE.rarity_' skill.rarity) }}">
+    {{ smarttlk 'SKILLS' key 'name' }}
     {{#if skill.rarity}}
       <span class="rarity-badge rarity-{{skill.rarity}}" title="{{ localize (concat 'VERMINE.rarity_' skill.rarity) }}">
         {{skill.rarity}}