Properties from pack

Editable functionalities (hide icons)

system/scripts/actors/base-sheet.js

@@ -87,6 +87,13 @@ export class BaseSheetL5r5e extends ActorSheet {
             event.target.select();
         });
 
+        // Toggle
+        // html.find(".toggle-on-click").on("click", (event) => {
+        //     const elmt = $(event.currentTarget).data("toggle");
+        //     const tgt = html.find("." + elmt);
+        //     tgt.hasClass('toggle-active') ? tgt.removeClass('toggle-active') : tgt.addClass('toggle-active');
+        // });
+
         // *** Items : edit, delete ***
         ["item", "peculiarity", "technique", "advancement"].forEach((type) => {
             html.find(`.${type}-edit`).on("click", (event) => {

system/scripts/items/advancement-sheet.js

@@ -20,10 +20,9 @@ export class AdvancementSheetL5r5e extends ItemSheetL5r5e {
         });
     }
 
-    getData() {
+    async getData() {
-        const sheetData = super.getData();
+        const sheetData = await super.getData();
 
-        sheetData.data.dtypes = ["String", "Number", "Boolean"];
         sheetData.data.subTypesList = AdvancementSheetL5r5e.types;
         sheetData.data.skillsList = game.l5r5e.HelpersL5r5e.getSkillsList(true);
 

system/scripts/items/item-sheet.js

@@ -14,7 +14,7 @@ export class ItemSheetL5r5e extends ItemSheet {
         });
     }
 
-    getData() {
+    async getData() {
         const sheetData = super.getData();
 
         sheetData.data.dtypes = ["String", "Number", "Boolean"];
@@ -22,7 +22,7 @@ export class ItemSheetL5r5e extends ItemSheet {
         sheetData.data.techniquesList = game.l5r5e.HelpersL5r5e.getTechniquesList();
 
         // Prepare Properties (id/name => object)
-        this._prepareProperties(sheetData);
+        await this._prepareProperties(sheetData);
 
         return sheetData;
     }
@@ -31,21 +31,26 @@ export class ItemSheetL5r5e extends ItemSheet {
      * Prepare properties list
      * @private
      */
-    _prepareProperties(sheetData) {
+    async _prepareProperties(sheetData) {
         sheetData.data.propertiesList = [];
+
         if (Array.isArray(sheetData.data.properties)) {
             const props = [];
-            sheetData.data.properties.forEach((e) => {
+            for (const property of sheetData.data.properties) {
-                const obj = game.items.get(e.id);
+                let item = game.items.get(property.id);
-                // remove item if not found (probably a deleted item)
+                if (item) {
-                if (!obj) {
+                    // Live item
-                    return;
+                    sheetData.data.propertiesList.push(item);
+                    props.push({ id: property.id, name: item.name });
+                } else {
+                    // Pack item
+                    item = await game.packs.get("l5r5e.Properties").getEntry(property.id);
+                    if (item) {
+                        sheetData.data.propertiesList.push(item);
+                        props.push({ id: item._id, name: item.name });
+                    }
+                }
             }
-                sheetData.data.propertiesList.push(obj);
-
-                // update name if referenced object was rename
-                props.push({ id: e.id, name: obj.name });
-            });
             sheetData.data.properties = props;
         }
     }
@@ -67,6 +72,13 @@ export class ItemSheetL5r5e extends ItemSheet {
             event.target.select();
         });
 
+        // Toggle
+        // html.find(".toggle-on-click").on("click", (event) => {
+        //     const elmt = $(event.currentTarget).data("toggle");
+        //     const tgt = html.find("." + elmt);
+        //     tgt.hasClass('toggle-active') ? tgt.removeClass('toggle-active') : tgt.addClass('toggle-active');
+        // });
+
         // Delete a property
         html.find(`.property-delete`).on("click", (event) => {
             const li = $(event.currentTarget).parents(".property");

system/scripts/items/peculiarity-sheet.js

@@ -21,10 +21,9 @@ export class PeculiaritySheetL5r5e extends ItemSheetL5r5e {
         });
     }
 
-    getData() {
+    async getData() {
-        const sheetData = super.getData();
+        const sheetData = await super.getData();
 
-        sheetData.data.dtypes = ["String", "Number", "Boolean"];
         sheetData.data.subTypesList = PeculiaritySheetL5r5e.types;
 
         return sheetData;

system/scripts/items/weapon-sheet.js

@@ -16,9 +16,8 @@ export class WeaponSheetL5r5e extends ItemSheetL5r5e {
         });
     }
 
-    getData() {
+    async getData() {
-        const sheetData = super.getData();
+        const sheetData = await super.getData();
-        sheetData.data.dtypes = ["String", "Number", "Boolean"];
 
         // Martial skills only
         sheetData.data.skills = Array.from(L5R5E.skills)

system/templates/actors/character/narrative.html

@@ -17,7 +17,7 @@
             <ul class="item-list">
                 {{#each actor.items as |item id|}}
                     {{#ifCond '["distinction","passion"]' 'includes' item.data.peculiarity_type}}
-                        {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id }}
+                        {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../editable }}
                     {{/ifCond}}
                 {{/each}}
             </ul>
@@ -29,7 +29,7 @@
             <ul class="item-list">
                 {{#each actor.items as |item id|}}
                 {{#ifCond '["adversity","anxiety"]' 'includes' item.data.peculiarity_type}}
-                        {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id }}
+                        {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../editable }}
                     {{/ifCond}}
                 {{/each}}
             </ul>

system/templates/actors/character/techniques.html

@@ -18,7 +18,7 @@
         <ul class="item-list">
             {{#each actor.items as |item id|}}
                 {{#ifCond item.type '==' 'technique'}}
-                    {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item }}
+                    {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../editable }}
                 {{/ifCond}}
             {{/each}}
         </ul>

system/templates/actors/npc/narrative.html

@@ -3,7 +3,7 @@
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond '["distinction","passion"]' 'includes' item.data.peculiarity_type}}
-                {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id }}
+                {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../editable }}
             {{/ifCond}}
         {{/each}}
     </ul>
@@ -13,7 +13,7 @@
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond '["adversity","anxiety"]' 'includes' item.data.peculiarity_type}}
-                {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id }}
+                {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../editable }}
             {{/ifCond}}
         {{/each}}
     </ul>

system/templates/actors/npc/techniques.html

@@ -7,7 +7,7 @@
         <ul class="item-list">
             {{#each actor.items as |item id|}}
                 {{#ifCond item.type '==' 'technique'}}
-                    {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item }}
+                    {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../editable }}
                 {{/ifCond}}
             {{/each}}
         </ul>

system/templates/items/advancement/advancement-entry.html

@@ -2,8 +2,10 @@
     <ul class="item-header advancement-controls">
         <li class="item-img"><img src="{{advancement.img}}" title="{{advancement.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{ advancement.name }}</li>
+        {{#if editable}}
         <li class="item-control advancement-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li class="item-control advancement-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <div class="item-description">{{{ advancement.data.description }}}</div>
 </li>

system/templates/items/armor/armor-entry.html

@@ -6,8 +6,10 @@
             <i class="fas fa-tint" title="{{ localize 'l5r5e.armors.type' }} {{ localize 'l5r5e.armors.physical' }}"> {{item.data.armor.physical}}</i>
             <i class="fas fa-bolt" title="{{ localize 'l5r5e.armors.type' }} {{ localize 'l5r5e.armors.supernatural' }}"> {{item.data.armor.supernatural}}</i>
         </li>
+        {{#if editable}}
         <li class="item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li class="item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <ul class="item-properties">
         {{#each item.data.properties as |property id|}}

system/templates/items/armor/armors.html

@@ -3,7 +3,7 @@
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond item.type '==' 'armor'}}
-                {{> 'systems/l5r5e/templates/items/armor/armor-entry.html' item=item id=id }}
+                {{> 'systems/l5r5e/templates/items/armor/armor-entry.html' item=item id=id editable=../editable }}
             {{/ifCond}}
         {{/each}}
     </ul>

system/templates/items/item/item-entry.html

@@ -2,8 +2,10 @@
     <ul class="item-header item-control">
         <li class="item-img"><img src="{{item.img}}" title="{{item.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{ item.name }} <sub>x{{ item.data.quantity }}</sub></li>
+        {{#if editable}}
         <li class="item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li class="item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <ul class="item-properties">
         {{#each item.data.properties as |property id|}}

system/templates/items/item/items.html

@@ -3,7 +3,7 @@
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond item.type '==' 'item'}}
-                {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id }}
+                {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id editable=../editable }}
             {{/ifCond}}
         {{/each}}
     </ul>

system/templates/items/peculiarity/peculiarity-entry.html

@@ -2,8 +2,10 @@
     <ul class="item-header peculiarity-controls">
         <li class="item-img"><img src="{{peculiarity.img}}" title="{{peculiarity.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{ peculiarity.name }}</li>
+        {{#if editable}}
         <li class="item-control peculiarity-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li class="item-control peculiarity-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <div class="item-description">{{{ peculiarity.data.description }}}</div>
 </li>

system/templates/items/property/properties.html

@@ -3,7 +3,7 @@
     <ul class="item-list">
         {{#each properties as |item id|}}
 <!--            {{#ifCond item.type '==' 'property'}}-->
-                {{> 'systems/l5r5e/templates/items/property/property-entry.html' item=item id=id }}
+                {{> 'systems/l5r5e/templates/items/property/property-entry.html' item=item id=id editable=../editable }}
 <!--            {{/ifCond}}-->
         {{/each}}
     </ul>

system/templates/items/property/property-entry.html

@@ -2,7 +2,9 @@
     <ul class="property-header property-control">
         <li class="property-img"><img src="{{item.img}}" title="{{item.name}}" width="32px" height="32px"/></li>
         <li class="property-name">{{ item.name }}</li>
+        {{#if editable}}
         <li class="property-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <div class="item-description">{{{ item.data.description }}}</div>
 </li>

system/templates/items/technique/technique-entry.html

@@ -2,8 +2,10 @@
     <ul class="item-header technique-controls">
         <li class="item-img"><img src="{{technique.img}}" title="{{technique.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{ technique.name }}</li>
+        {{#if editable}}
         <li class="item-control technique-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li class="item-control technique-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <div class="item-description">{{{ technique.data.description }}}</div>
 </li>

system/templates/items/weapon/weapon-entry.html

@@ -7,8 +7,10 @@
             <i class="fas fa-tint" title="{{ localize 'l5r5e.weapons.damage' }}"> {{item.data.damage}}</i>
             <i class="fas fa-skull" title="{{ localize 'l5r5e.weapons.deadliness' }}"> {{item.data.deadliness}}</i>
         </li>
+        {{#if editable}}
         <li class="item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li class="item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
+        {{/if}}
     </ul>
     <ul class="item-properties">
         {{#each item.data.properties as |property id|}}

system/templates/items/weapon/weapons.html

@@ -3,7 +3,7 @@
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond item.type '==' 'weapon'}}
-                {{> 'systems/l5r5e/templates/items/weapon/weapon-entry.html' item=item id=id }}
+                {{> 'systems/l5r5e/templates/items/weapon/weapon-entry.html' item=item id=id editable=../editable }}
             {{/ifCond}}
         {{/each}}
     </ul>