add generalized item html embedding handler

Author: moo-man

module.json

@@ -2,7 +2,7 @@
   "id": "warhammer-lib",
   "title": "Warhammer Library",
   "description": "Common code used by the various Warhammer Systems",
-  "version": "2.3.2",
+  "version": "2.4.0",
   "authors": [{"name": "Moo Man", "id": "Moo Man", "discord": "moo.man"}],
   "scripts" : ["warhammer-lib.js"],
   "styles" : [{"src": "warhammer.css", "layer" : "system"}],
@@ -50,5 +50,5 @@
   },
   "socket": true,
   "manifest": "https://github.com/moo-man/WarhammerLibrary-FVTT/releases/latest/download/module.json",
-  "download": "https://github.com/moo-man/WarhammerLibrary-FVTT/releases/download/2.3.2/warhammer-lib.zip"
+  "download": "https://github.com/moo-man/WarhammerLibrary-FVTT/releases/download/2.4.0/warhammer-lib.zip"
 }

src/apps/roll-dialogV2.js

@@ -125,6 +125,13 @@ export default class WarhammerRollDialogV2 extends HandlebarsApplicationMixin(Ap
         dialogData.data.speaker.alias = actor.prototypeToken.name;
         dialogData.data.targets = (context.skipTargets) ? [] : context.targets || Array.from(game.user.targets).filter(t => t.document.id != dialogData.data.speaker.token); // Remove self from targets
         delete context.targets;
+
+        // Used by scripts to store data and then pass onto the test
+        if (!context.flags)
+        {
+            context.flags = {};
+        }
+        
         if (actor && !actor?.token)
         {
             // getSpeaker retrieves tokens even if this sheet isn't a token's sheet

src/document/item.js

@@ -389,4 +389,24 @@ export class WarhammerItem extends WarhammerDocumentMixin(Item)
 
         return new SelectChoices(choices);
     }
+
+    /**
+     * 
+     * @inheritdoc
+     * @param {object} config Configuration for embedding behavior, changes for each system/type
+     */
+    async toEmbed(config, options={})
+    {
+        if (this.system.toEmbed)
+        {
+            let embed = await this.system.toEmbed(config, options);
+            embed.classList.add(`${game.system.id}-embed`, this.type);
+            return embed;
+        }
+        else 
+        {
+            return super.toEmbed(config, options);
+        }
+    }
+
 }

src/document/table.js

@@ -8,9 +8,10 @@ export class WarhammerRollTable extends RollTable
         let separator = config.separator || "";
         console.log(config, options);
 
-        return $(await foundry.applications.ux.TextEditor.implementation.enrichHTML(`<table class="${game.system.id} embedded">
+        return $(await foundry.applications.ux.TextEditor.implementation.enrichHTML(`<div class="table-container">${config.description == "top" ? this.description : ""}<table class="${game.system.id} embedded">
         <thead>
         <tr class="title"><td colspan="2">@UUID[${this.uuid}]{${this.name}}</td></tr>
+        <tr class="description"><td colspan="2">
         <tr class="subheader">
             <td class="formula">${this.formula}</td>
             <td class="label">${config.label}</td>
@@ -41,6 +42,6 @@ export class WarhammerRollTable extends RollTable
     }).join("")}
 
         </tbody>
-    </table>`, options))[0];
+    </table>${config.description == "bottom" ? this.description : ""}</div>`, options))[0];
     }
 }

src/model/components/choices.js

@@ -70,6 +70,12 @@ export class ChoiceModel extends foundry.abstract.DataModel
         let option;
         if (data.documentName == "Item")        
         {
+            let restrictions = this.schema.options.restrictType;
+            if (restrictions?.length > 0 && !restrictions.includes(data.type))
+            {
+                ui.notifications.error("WH.Error.WrongChoiceOptionType", {localize : true, format : {types : restrictions.join(", ")}});
+                throw new Error(game.i18n.format("WH.Error.WrongChoiceOptionType", {types : restrictions.join(", ")}));
+            }
             option = this._createDocumentOption(data);
         }
         else if (data.documentName == "ActiveEffect")
@@ -188,7 +194,12 @@ export class ChoiceModel extends foundry.abstract.DataModel
         }
         else if (option.type == "placeholder")
         {
-            return foundry.utils.mergeObject({name : option.name}, systemConfig().placeholderItemData);
+            let data = foundry.utils.mergeObject({name : option.name}, systemConfig().placeholderItemData);
+            if (this.schema.options.restrictType?.length)
+            {
+                data.type = this.schema.options.restrictType[0];
+            }
+            return data;
         }
         else if (["id", "uuid"].includes(option.idType))
         {
@@ -390,7 +401,12 @@ export class ChoiceModel extends foundry.abstract.DataModel
         return this._displayOptions(this.structure);
     }
 
-    _displayOptions(structure)
+    get textDisplayWithLinks() 
+    {
+        return this._displayOptions(this.structure, {links : true});
+    }
+
+    _displayOptions(structure, displayOptions={})
     {
 
         if (!structure)
@@ -400,7 +416,15 @@ export class ChoiceModel extends foundry.abstract.DataModel
 
         if (structure.type == "option")
         {
-            return this.options.find(i => i.id == structure.id).name;
+            let option = this.options.find(i => i.id == structure.id);
+            if (displayOptions.links && option.idType == "uuid")
+            {
+                return `@UUID[${option.documentId}]{${option.name}}`;
+            }
+            else 
+            {
+                return option.name;
+            }
         }
         else if (structure.type == "and" || structure.type == "or")
         {

src/system/tooltips.js

@@ -89,12 +89,19 @@ export class BaseDialogTooltips
     }
 
     // Resets a field's values to the provided value
-    set(type, value, source)
+    set(type, value, source, replace=false)
     {
         let field = this[`_${type}`];
         if (field && value && source)
         {
-            field.list = [{value, source, set: true}].concat(field.list);
+            if (replace)
+            {
+                field.list = [{value, source, set: true}];
+            }
+            else 
+            {
+                field.list = [{value, source, set: true}].concat(field.list);
+            }
         }
     }
 

static/assets/marker.png

@@ -162,7 +162,8 @@
             "NoTargetedActors": "No targeted Actors!",
             "NoTargets": "No targeted Actors!",
             "NotValidChoiceType": "Not a valid choice",
-            "NoDrawingsToConvert" : "No Drawings to Convert!"
+            "NoDrawingsToConvert" : "No Drawings to Convert!",
+            "WrongChoiceOptionType" : "This type of Item isn't allowed. Allowed Types: {types}"
         },
         "ErrorNoZones": "No Zones to select. Add Regions to the Scene to create Zones.",
         "ErrorUnableToFindEffect": "Unable to find effect to apply.",

static/lang/en.json

@@ -42,4 +42,10 @@
         justify-content: space-evenly;
 
       }
+}
+
+.journal-sheet {
+    .toc .level4 .page-title {
+        text-indent: calc(3 * var(--level-indent));
+    }
 }