From a5e17b8276e226b50e7a38452c4e4e258842af43 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Thu, 29 Sep 2022 10:59:47 +0200
Subject: [PATCH] Fix #71 : Display perk text

---
 templates/chat-perk-activated.html     |  4 ++--
 templates/chat-perk-ready.html         |  4 ++--
 templates/npc-sheet.html               | 10 +++++-----
 templates/partial-actor-equipment.html |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/chat-perk-activated.html b/templates/chat-perk-activated.html
index d9dca5d..adbc30f 100644
--- a/templates/chat-perk-activated.html
+++ b/templates/chat-perk-activated.html
@@ -5,8 +5,8 @@
   {{/if}}
   <div>{{name}} has just activated the Perk: {{perk.name}}.</div>
   
-  {{#if (count perk.data.activatedtext)}}
-  <div>{{perk.data.activatedtext}}</div>
+  {{#if (count perk.system.activatedtext)}}
+  <div>{{perk.system.activatedtext}}</div>
   {{/if}}
 
 </div>
diff --git a/templates/chat-perk-ready.html b/templates/chat-perk-ready.html
index 5e44619..ce7894d 100644
--- a/templates/chat-perk-ready.html
+++ b/templates/chat-perk-ready.html
@@ -5,8 +5,8 @@
   {{/if}}
   <div>{{name}} has just deactivated the Perk: {{perk.name}}, make sure to manually delete all Effects provided by this Perk from Targets.</div>
   
-  {{#if (count perk.data.deactivatedtext)}}
-  <div>{{perk.data.deactivatedtext}}</div>
+  {{#if (count perk.system.deactivatedtext)}}
+  <div>{{perk.system.deactivatedtext}}</div>
   {{/if}}
 
 </div>
diff --git a/templates/npc-sheet.html b/templates/npc-sheet.html
index 172e10b..22197c2 100644
--- a/templates/npc-sheet.html
+++ b/templates/npc-sheet.html
@@ -47,7 +47,7 @@
                 <li class="item flexrow list-item" data-item-id="{{trait.id}}">
                   <img class="sheet-competence-img" src="{{trait.img}}"/>
                   <span class="competence-label">{{trait.name}}</span>
-                  <span class="competence-label">{{trait.data.data.type}}</span>
+                  <span class="competence-label">{{trait.system.type}}</span>
                   <div class="item-controls">
                     <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>
@@ -103,17 +103,17 @@
               <img class="sheet-competence-img" src="{{weapon.img}}"/>
               <span class="stat-label">{{weapon.name}}</span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Worn">{{#if weapon.data.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Worn">{{#if weapon.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>
               </div>
             </li>
             <li class="item stat flexrow list-item stats-table" data-armure-id="{{weapon.id}}" data-item-id="{{weapon.id}}">
-              {{#each weapon.data.data.weaponstats as |weaponstat statkey|}}
+              {{#each weapon.system.weaponstats as |weaponstat statkey|}}
               <ul>
                 <li class="item stat flexrow list-item" data-item-id="{{weapon.id}}" data-stat-id={{statkey}}><span class="stat-label weapon-label"><a name="{{weapon.name}}">Attack with {{weaponstat.name}}</a></span>
                 </li>
-                <li>{{> "systems/fvtt-fragged-kingdom/templates/weapon-stats-section.html" stats=weaponstat.data.statstotal isfinal=false header=true}}
+                <li>{{> "systems/fvtt-fragged-kingdom/templates/weapon-stats-section.html" stats=weaponstat.system.statstotal isfinal=false header=true}}
                 </li>
               </ul>
               {{/each}}
@@ -151,7 +151,7 @@
               <span class="equipement-label">{{equip.name}}</span>
               <span class="equipement-label">{{equip.type}}</span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Worn">{{#if equip.data.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <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>
                 <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>
diff --git a/templates/partial-actor-equipment.html b/templates/partial-actor-equipment.html
index bd6a544..a5177cf 100644
--- a/templates/partial-actor-equipment.html
+++ b/templates/partial-actor-equipment.html
@@ -24,7 +24,7 @@
     {{/if}}
   </span>
   <span class="item-field-label-short">
-    {{#if equip.data.iscontainer}}
+    {{#if equip.system.iscontainer}}
       {{equip.system.contentsEnc}}
     {{else}}
       {{mul equip.system.weight equip.system.quantity}}
@@ -32,7 +32,7 @@
   </span>
   <span class="item-field-label-medium">
     {{#if equip.system.idrDice}}
-    <a class="roll-idr" data-dice-value="{{equip.data.idrDice}}">{{equip.system.idrDice}}</a>
+    <a class="roll-idr" data-dice-value="{{equip.system.idrDice}}">{{equip.system.idrDice}}</a>
     {{else}}
     &nbsp;-&nbsp;
     {{/if}}