v0.1.2

finishing for version 0.0.7
Co-Authored-By: erebus <erebus@rikspolisen.se>
Co-Committed-By: erebus <erebus@rikspolisen.se>

module/actors/actor-sheet.js

@@ -154,13 +154,13 @@ export class ActorSheetKH extends ActorSheet {
                 icon: '<i class="far dice"></i>',
                 callback: (li) => {
                     let itemId = li.data("itemId");
-                    let _item = this.actor.items.find((element) => element._id == itemId);
+                    let _item = this.actor.items.find((element) => element.id == itemId);
 
                     // Retrieve skill based on name
-                    let skill = this.actor.items.find((element) => element.name === _item.data.data.skill.value);
+                    let skill = this.actor.items.find((element) => element.name === _item.data.skill.value);
 
                     let skillName = skill.name
-                    let skillValue = skill.data.data.value
+                    let skillValue = skill.data.value
                     let showValue = false
 
                     if(this.actor.data.type === "character") {
@@ -186,10 +186,10 @@ export class ActorSheetKH extends ActorSheet {
                 icon: '<i class="far dice"></i>',
                 callback: (li) => {
                     let itemId = li.data("itemId");
-                    let _item = this.actor.items.find((element) => element._id == itemId);
+                    let _item = this.actor.items.find((element) => element.id == itemId);
 
                     let skillName = _item.name
-                    let skillValue = _item.data.data.value
+                    let skillValue = _item.data.value
                     let showValue = false
 
                     if(this.actor.data.type === "character") {
@@ -214,14 +214,14 @@ export class ActorSheetKH extends ActorSheet {
                 name: game.i18n.localize("MENU.SHOWROLLDIALOG"),
                 icon: '<i class="far dice"></i>',
                 callback: (li) => {
-                    let itemId = li.data("itemId");
-                    let _item = this.actor.items.find((element) => element._id == itemId);
+                    let itemId = li.data("item-id");
+                    let _item = this.actor.items.find((element) => element.id == itemId);
 
                     if (!_item) {
                         _item = game.items.get(itemId);
 
                         if (!_item) {
-                            console.log("IMPORT ERROR")
+                            console.log("IMPORT ERROR 1")
                             return
                         }
                     }
@@ -233,7 +233,7 @@ export class ActorSheetKH extends ActorSheet {
                         showValue = true
                     }
 
-                    switch (_item.data.data.difficulty.value) {
+                    switch (_item.data.difficulty.value) {
                         case "simple":
                             difficulty = 5
                             break;
@@ -248,24 +248,24 @@ export class ActorSheetKH extends ActorSheet {
                             break;
                     }
 
-                    if(_item.data.data.roll.value === "roll" || _item.data.data.roll.value === "attackroll") {
+                    if(_item.data.roll.value === "roll" || _item.data.roll.value === "attackroll") {
                         // Retrieve skill based on name
-                        let skill = this.actor.items.find((element) => element.name === _item.data.data.roll.skill);
+                        let skill = this.actor.items.find((element) => element.name === _item.data.roll.skill);
 
                         let skillName = _item.name
-                        let skillValue = skill.data.data.value
+                        let skillValue = skill.data.value
 
                         if(this.actor.data.type === "character") {
                             skillName = _item.name + " (" + skill.name + ")"
                         }
 
                         this.khRoller.rollSkillDialogInChat(skillName, skillValue, showValue, this.actor, difficulty)
-                    } else if(_item.data.data.roll.value === "opposite") {
+                    } else if(_item.data.roll.value === "opposite") {
                         // Retrieve skill based on name
-                        let skill = this.actor.items.find((element) => element.name === _item.data.data.roll.skill);
+                        let skill = this.actor.items.find((element) => element.name === _item.data.roll.skill);
 
                         let skillName = _item.name
-                        let skillValue = skill.data.data.value
+                        let skillValue = skill.data.value
 
                         if(this.actor.data.type === "character") {
                             skillName = _item.name + " (" + skill.name + ")"
@@ -274,62 +274,62 @@ export class ActorSheetKH extends ActorSheet {
                         let opposite = []
                         // Retrieve skill based on name
 
-                        if(_item.data.data.roll.oppositeskill !== "") {
-                            let skill1 = this.actor.items.find((element) => element.name === _item.data.data.roll.oppositeskill);
+                        if(_item.data.roll.oppositeskill !== "") {
+                            let skill1 = this.actor.items.find((element) => element.name === _item.data.roll.oppositeskill);
                             opposite.push(skill1.name)
                         }
 
-                        if(_item.data.data.roll.oppositeskilltwo !== "") {
-                            let skill2 = this.actor.items.find((element) => element.name === _item.data.data.roll.oppositeskilltwo);
+                        if(_item.data.roll.oppositeskilltwo !== "") {
+                            let skill2 = this.actor.items.find((element) => element.name === _item.data.roll.oppositeskilltwo);
                             opposite.push(skill2.name)
                         }
 
                         this.khRoller.rollSkillDialogInChat(skillName, skillValue, showValue, this.actor, difficulty, opposite)
-                    } else if(_item.data.data.roll.value === "ritual") {
+                    } else if(_item.data.roll.value === "ritual") {
                         let skills = []
 
-                        if(_item.data.data.roll.ritual.skillone !== "") {
-                            let skill1 = this.actor.items.find((element) => element.name === _item.data.data.roll.ritual.skillone);
+                        if(_item.data.roll.ritual.skillone !== "") {
+                            let skill1 = this.actor.items.find((element) => element.name === _item.data.roll.ritual.skillone);
 
                             skills.push({
                                 name: skill1.name,
-                                value: skill1.data.data.value
+                                value: skill1.data.value
                             });
                         }
 
-                        if(_item.data.data.roll.ritual.skilltwo !== "") {
-                            let skill2 = this.actor.items.find((element) => element.name === _item.data.data.roll.ritual.skilltwo);
+                        if(_item.data.roll.ritual.skilltwo !== "") {
+                            let skill2 = this.actor.items.find((element) => element.name === _item.data.roll.ritual.skilltwo);
 
                             skills.push({
                                 name: skill2.name,
-                                value: skill2.data.data.value
+                                value: skill2.data.value
                             });
                         }
 
-                        if(_item.data.data.roll.ritual.skillthree !== "") {
-                            let skill3 = this.actor.items.find((element) => element.name === _item.data.data.roll.ritual.skillthree);
+                        if(_item.data.roll.ritual.skillthree !== "") {
+                            let skill3 = this.actor.items.find((element) => element.name === _item.data.roll.ritual.skillthree);
 
                             skills.push({
                                 name: skill3.name,
-                                value: skill3.data.data.value
+                                value: skill3.data.value
                             });
                         }
 
-                        if(_item.data.data.roll.ritual.skillfour !== "") {
-                            let skill4 = this.actor.items.find((element) => element.name === _item.data.data.roll.ritual.skillfour);
+                        if(_item.data.roll.ritual.skillfour !== "") {
+                            let skill4 = this.actor.items.find((element) => element.name === _item.data.roll.ritual.skillfour);
 
                             skills.push({
                                 name: skill4.name,
-                                value: skill4.data.data.value
+                                value: skill4.data.value
                             });
                         }
 
-                        if(_item.data.data.roll.ritual.skillfive !== "") {
-                            let skill5 = this.actor.items.find((element) => element.name === _item.data.data.roll.ritual.skillfive);
+                        if(_item.data.roll.ritual.skillfive !== "") {
+                            let skill5 = this.actor.items.find((element) => element.name === _item.data.roll.ritual.skillfive);
 
                             skills.push({
                                 name: skill5.name,
-                                value: skill5.data.data.value
+                                value: skill5.data.value
                             });
                         }
 
@@ -388,6 +388,7 @@ export class ActorSheetKH extends ActorSheet {
         ]);
 
         html.find(".feature").click(async (ev) => {
+            console.log("feature")
             const featureName = $(ev.currentTarget).data("feature");
             const featureValue = this.actor.data.data.feature[featureName].value;
             if (featureName === "one") {
@@ -406,7 +407,7 @@ export class ActorSheetKH extends ActorSheet {
         html.find(".item-delete").click((ev) => {
             let parent = $(ev.currentTarget).data("parent")
             const li = $(ev.currentTarget).parents(parent);
-            const item = this.actor.getOwnedItem(li.data("itemId"));
+            const item = this.actor.items.get(li.data("itemId"));
 
             if(item) {
                 if (item.type === "armor") {
@@ -417,10 +418,10 @@ export class ActorSheetKH extends ActorSheet {
 
                         this.actor.items.map((i) => {
                             if (i.type === "armor") {
-                                if (i._id !== item._id && i.data.data.equipable.equipped && i.data?.data?.modifications) {
-                                    for (let k of Object.keys(i.data.data.modifications)) {
-                                        if (i.data.data.modifications[k].modtype === "init") {
-                                            initValue = i.data.data.modifications[k].value;
+                                if (i.id !== item.id && i.data.equipable.equipped && i.data?.data?.modifications) {
+                                    for (let k of Object.keys(i.data.modifications)) {
+                                        if (i.data.modifications[k].modtype === "init") {
+                                            initValue = i.data.modifications[k].value;
                                         }
                                     }
                                 }
@@ -434,23 +435,26 @@ export class ActorSheetKH extends ActorSheet {
                 }
             }
 
-            this.actor.deleteOwnedItem(li.data("itemId"));
+            this.actor.deleteEmbeddedDocuments("Item", [li.data("itemId")]);
+
+            //this.actor.deleteOwnedItem(li.data("itemId"));
 
             li.slideUp(200, () => this.render(false));
         });
 
         // Edit Inventory Item
         html.find(".item-edit").click(async (ev) => {
+            console.log("item-edit")
             let parent = $(ev.currentTarget).data("parent")
             let li = $(ev.currentTarget).parents(parent);
             let itemId = li.data("itemId");
-            let item = this.actor.getOwnedItem(itemId);
+            let item = this.actor.items.get(itemId);
 
             if (!item) {
                 item = game.items.get(itemId);
 
                 if (!item) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 2")
                 }
             }
 
@@ -463,13 +467,13 @@ export class ActorSheetKH extends ActorSheet {
         html.find(".roll-spell-cost").click((ev) => {
             const li = $(ev.currentTarget).parents(".item-spell");
             let itemId = li.data("itemId");
-            let spell = this.actor.getOwnedItem(itemId);
+            let spell = this.actor.items.get(itemId);
 
             if (!spell) {
                 spell = game.items.get(itemId);
 
                 if (!spell) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 3")
                     return
                 }
             }
@@ -486,14 +490,14 @@ export class ActorSheetKH extends ActorSheet {
 
         html.find(".roll-spell-skill").click((ev) => {
             const li = $(ev.currentTarget).parents(".item-spell");
-            let itemId = li.data("itemId");
-            let spell = this.actor.getOwnedItem(itemId);
+            let itemId = li.data("item-id");
+            let spell = this.actor.items.get(itemId);
 
             if (!spell) {
                 spell = game.items.get(itemId);
 
                 if (!spell) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 4")
                     return
                 }
             }
@@ -614,8 +618,8 @@ export class ActorSheetKH extends ActorSheet {
         /* Roll skill */
         html.find(".roll-skill").click((ev) => {
             const li = $(ev.currentTarget).parents(".item-skill");
-            let itemId = li.data("itemId");
-            let _item = this.actor.items.find((element) => element._id == itemId);
+            let itemId = li.data("item-id");
+            let _item = this.actor.items.find((element) => element.id === itemId);
 
             let skillName = _item.name
             let skillValue = _item.data.data.value
@@ -632,13 +636,13 @@ export class ActorSheetKH extends ActorSheet {
         html.find(".roll-weapon-skill").click((ev) => {
             const li = $(ev.currentTarget).parents(".item-weapon");
             let itemId = li.data("itemId");
-            let weapon = this.actor.getOwnedItem(itemId);
+            let weapon = this.actor.items.get(itemId);
 
             if (!weapon) {
                 weapon = game.items.get(itemId);
 
                 if (!weapon) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 5")
                     return
                 }
             }
@@ -661,13 +665,13 @@ export class ActorSheetKH extends ActorSheet {
         html.find(".roll-damage").click((ev) => {
             const li = $(ev.currentTarget).parents(".item-weapon");
             let itemId = li.data("itemId");
-            let weapon = this.actor.getOwnedItem(itemId);
+            let weapon = this.actor.items.get(itemId);
 
             if (!weapon) {
                 weapon = game.items.get(itemId);
 
                 if (!weapon) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 6")
                     return
                 }
             }
@@ -686,13 +690,13 @@ export class ActorSheetKH extends ActorSheet {
         html.find(".roll-armor").click((ev) => {
             const li = $(ev.currentTarget).parents(".item");
             let itemId = li.data("itemId");
-            let armor = this.actor.getOwnedItem(itemId);
+            let armor = this.actor.items.get(itemId);
 
             if (!armor) {
                 armor = game.items.get(itemId);
 
                 if (!armor) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 7")
                     return
                 }
             }
@@ -747,13 +751,13 @@ export class ActorSheetKH extends ActorSheet {
         html.find(".roll-attack-damage").click((ev) => {
             const li = $(ev.currentTarget).parents(".item-attack");
             let itemId = li.data("itemId");
-            let weapon = this.actor.getOwnedItem(itemId);
+            let weapon = this.actor.items.get(itemId);
 
             if (!weapon) {
                 weapon = game.items.get(itemId);
 
                 if (!weapon) {
-                    console.log("IMPORT ERROR")
+                    console.log("IMPORT ERROR 8")
                     return
                 }
             }
@@ -807,6 +811,12 @@ export class ActorSheetKH extends ActorSheet {
 
         // Add or Remove relationship
         html.find(".learning-control").click(this._onClickLearningControl.bind(this));
+        html.find(".learning-delete").click(async (event) => {
+            event.preventDefault();
+            const a = event.currentTarget.closest(".learning");
+            const id = a.dataset["attribute"];
+            this.object.update({ "data.learning": { ["-=" + id]: null } });
+        });
         html.find(".learning-click").click(this._onClickLearingLearned.bind(this));
 
         /* Hjältarnas Tid specefic */
@@ -818,6 +828,7 @@ export class ActorSheetKH extends ActorSheet {
     }
 
     async _onClickLearingLearned(event) {
+        console.log("_onClickLearingLearned")
         event.stopPropagation();
         const li1 = $(event.currentTarget);
         const li2 = $(event.currentTarget).parents(".learning");
@@ -837,13 +848,11 @@ export class ActorSheetKH extends ActorSheet {
 
     async _onClickLearningControl(event) {
         event.preventDefault();
-        const a = event.currentTarget;
-        const action = a.dataset.action;
-        const attrs = this.object.data.data.learning;
-        const form = this.form;
+        const action = event.currentTarget.dataset.action;
 
         // Add new modification
         if (action === "create") {
+            const form = this.form;
             const nk = new Date().getTime();
             let newKey = document.createElement("div");
 
@@ -853,41 +862,43 @@ export class ActorSheetKH extends ActorSheet {
             await this._onSubmit(event);
         }
 
+        /*
         // Remove existing modification
         else if (action === "delete") {
-            const li = a.closest(".learning");
-            li.parentElement.removeChild(li);
-            await this._onSubmit(event);
+            const a = eventan>.currentTarget.closest(".learning");
+            const id = a.dataset["attribute"];
+            this.object.update({ "data.learning": { ["-=" + id]: null } });
         }
+        */
     }
 
     async _onClickRelationshipControl(event) {
+        console.log("_onClickRelationshipControl")
         event.preventDefault();
-        const a = event.currentTarget;
-        const action = a.dataset.action;
-        const attrs = this.object.data.data.relationships;
-        const form = this.form;
+        const action = event.currentTarget.dataset.action;
 
         // Add new modification
         if (action === "create") {
+            const form = this.form;
             const nk = new Date().getTime();
             let newKey = document.createElement("div");
 
             newKey.innerHTML = `<input class="relation-key" type="text" name="data.relationships.attr${nk}.key" value="attr${nk}" style="display: none;" /><input class="relation-key" type="text" name="data.relationships.attr${nk}.value" value="" style="display: none;" />`;
 
             form.appendChild(newKey);
-            await this._onSubmit(event);
         }
 
         // Remove existing modification
         else if (action === "delete") {
-            const li = a.closest(".relation");
-            li.parentElement.removeChild(li);
-            await this._onSubmit(event);
+            const ability = $(event.currentTarget).closest(".relation").data("attribute");
+            await this.object.update({ "data.relationships": { ["-=" + ability]: null } });
         }
+
+        await this._onSubmit(event);
     }
 
     async _onClickRelationshipUsed(event) {
+        console.log("_onClickRelationshipUsed")
         event.stopPropagation();
 
         const li = $(event.currentTarget).parents(".relation");
@@ -905,8 +916,9 @@ export class ActorSheetKH extends ActorSheet {
     }
 
     async _toggleEquippedItem(event) {
+    console.log("_toggleEquippedItem")
         const li = $(event.currentTarget);
-        const item = this.actor.getOwnedItem(li.data("itemId"));
+        const item = this.actor.items.get(li.data("itemId"));
         const actor = this.actor;
 
         if(item) {
@@ -918,7 +930,7 @@ export class ActorSheetKH extends ActorSheet {
 
                     actor.items.map((i) => {
                         if(i.type === "armor") {
-                            if(i._id !== item._id && i.data.data.equipable.equipped && i.data?.data?.modifications) {
+                            if(i.id !== item.id && i.data.data.equipable.equipped && i.data?.data?.modifications) {
                                 for(let k of Object.keys(i.data.data.modifications)) {
                                     if(i.data.data.modifications[k].modtype === "init") {
                                         initValue = i.data.data.modifications[k].value;
@@ -949,28 +961,30 @@ export class ActorSheetKH extends ActorSheet {
     }
 
     async _increaseQuantity(event) {
+        console.log("_increaseQuantity")
         event.stopPropagation();
 
         const li = $(event.currentTarget).parents(".item");
         let itemId = li.data("itemId");
-        let item = this.actor.getOwnedItem(itemId);
+        let item = this.actor.items.get(itemId);
 
         if (!item) {
-            console.log("IMPORT ERROR")
+            console.log("IMPORT ERROR 9")
         }
 
         item.update({ ["data.quantity.value"]: item.data.data.quantity.value + 1 });
     }
 
     async _decreaseQuantity(event) {
+        console.log("_decreaseQuantity")
         event.stopPropagation();
 
         const li = $(event.currentTarget).parents(".item");
         let itemId = li.data("itemId");
-        let item = this.actor.getOwnedItem(itemId);
+        let item = this.actor.items.get(itemId);
 
         if (!item) {
-            console.log("IMPORT ERROR")
+            console.log("IMPORT ERROR 10")
         }
 
         let count = item.data.data.quantity.value - 1 > 0 ? item.data.data.quantity.value - 1 : 0;
@@ -979,25 +993,27 @@ export class ActorSheetKH extends ActorSheet {
     }
 
     async _onChangeSkillValue(event) {
+        console.log("_decreaseQuantity")
         event.preventDefault();
 
         const itemId = $(event.currentTarget).data("item-id");
-        let _item = this.actor.items.find((element) => element._id == itemId);
+        let _item = this.actor.items.find((element) => element.id == itemId);
 
         if (_item) {
             let update = {
-                _id: _item._id,
+                _id: _item.id,
                 data: { value: $(event.currentTarget).val() },
             };
-            await this.actor.updateEmbeddedEntity("OwnedItem", update);
+            await this.actor.updateEmbeddedDocuments("Item", [update]);
         }
     }
 
     async _onClickSkill(event) {
+        console.log("_onClickSkill")
         event.preventDefault();
 
         const itemId = $(event.currentTarget).data("item-id");
-        let _item = this.actor.items.find((element) => element._id == itemId);
+        let _item = this.actor.items.find((element) => element.id == itemId);
 
         if (_item) {
             let newVal = true;
@@ -1007,10 +1023,10 @@ export class ActorSheetKH extends ActorSheet {
             }
 
             let update = {
-                _id: _item._id,
+                _id: _item.id,
                 data: { used: newVal },
             };
-            await this.actor.updateEmbeddedEntity("OwnedItem", update);
+            await this.actor.updateEmbeddedDocuments("Item", [update]);
         }
     }
 
@@ -1026,14 +1042,15 @@ export class ActorSheetKH extends ActorSheet {
      * @private
      */
     async _itemDetailsToChat(itemId) {
-        let item = this.actor.getOwnedItem(itemId);
+        console.log("_itemDetailsToChat")
+        let item = this.actor.items.get(itemId);
 
         if (!item) {
             item = game.items.get(itemId);
         }
 
         if (!item) {
-            console.log("IMPORT ERROR")
+            console.log("IMPORT ERROR 11")
             return
         }
 
@@ -1041,11 +1058,11 @@ export class ActorSheetKH extends ActorSheet {
         const html = await renderTemplate("systems/kopparhavet/templates/chat/item-card.html", itemDetails);
 
         const messageData = {
-            user: game.user._id,
+            user: game.user.id,
             type: CONST.CHAT_MESSAGE_TYPES.OTHER,
             content: html,
             speaker: {
-                actor: this.actor._id,
+                actor: this.actor.id,
                 token: this.actor.token,
                 alias: this.actor.name,
             },

module/helpers/actor-helper.js

@@ -13,8 +13,8 @@ export default class ActorHelpers {
         }, {});
 
         // Remove modifications which are no longer used
-        if (this.object.data?.data?.relationships) {
-            for (let k of Object.keys(this.object.data.data.relationships)) {
+        if (this.object.data?.relationships) {
+            for (let k of Object.keys(this.object.data.relationships)) {
                 if (!relationships.hasOwnProperty(k)) relationships[`-=${k}`] = null;
             }
         }
@@ -36,8 +36,8 @@ export default class ActorHelpers {
         }, {});
 
         // Remove modifications which are no longer used
-        if (this.object.data?.data?.learning) {
-            for (let k of Object.keys(this.object.data.data.learning)) {
+        if (this.object.data?.learning) {
+            for (let k of Object.keys(this.object.data.learning)) {
                 if (!learning.hasOwnProperty(k)) learning[`-=${k}`] = null;
             }
         }

module/helpers/dice-helper.js

@@ -4,11 +4,11 @@ export default class KHDiceRoller {
 
         const roll = new Roll(formula);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let rollData = {
             name: "SPELL.COST",
-            res: res,
+            res: roll,
             showFormula: true
         };
 
@@ -23,9 +23,9 @@ export default class KHDiceRoller {
         await roll.toMessage({
             create: true,
             content: html,
-            user: game.user._id,
+            user: game.user.id,
             speaker: {
-                actor: speaker._id,
+                actor: speaker.id,
                 token: speaker.token,
                 alias: speaker.name,
             },
@@ -37,11 +37,11 @@ export default class KHDiceRoller {
 
         const roll = new Roll(formula);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let rollData = {
             name: "ITEM.DAMAGE",
-            res: res,
+            res: roll,
             showFormula: true
         };
 
@@ -50,9 +50,9 @@ export default class KHDiceRoller {
         await roll.toMessage({
             create: true,
             content: html,
-            user: game.user._id,
+            user: game.user.id,
             speaker: {
-                actor: speaker._id,
+                actor: speaker.id,
                 token: speaker.token,
                 alias: speaker.name,
             },
@@ -68,11 +68,11 @@ export default class KHDiceRoller {
 
         const roll = new Roll(formula);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let rollData = {
             name: "ITEM.DEFENCE",
-            res: res,
+            res: roll,
             showFormula: true
         };
 
@@ -81,9 +81,9 @@ export default class KHDiceRoller {
         await roll.toMessage({
             create: true,
             content: html,
-            user: game.user._id,
+            user: game.user.id,
             speaker: {
-                actor: speaker._id,
+                actor: speaker.id,
                 token: speaker.token,
                 alias: speaker.name,
             },
@@ -93,7 +93,7 @@ export default class KHDiceRoller {
     async rollSkillInChat(skillName, skillValue, showValue, speaker, openclosed, opposite) {
         const roll = new Roll(`1d100`);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let computedName = skillName
 
@@ -120,13 +120,13 @@ export default class KHDiceRoller {
 
         let rollData = {
             name: computedName,
-            res: res,
+            res: roll,
             opposite: oppositeValue
         };
 
         if(skillValue > 0) {
-            let oneRes = Math.floor((res.total / 1) % 10);
-            let tenRes = Math.floor((res.total / 10) % 10);
+            let oneRes = Math.floor((roll.total / 1) % 10);
+            let tenRes = Math.floor((roll.total / 10) % 10);
 
             if(openclosed < 0) {
                 rollData.closed = Math.abs(openclosed)
@@ -143,7 +143,7 @@ export default class KHDiceRoller {
                 // roll is opened
                 rollData.success = true
             } else {
-                if (res.total <= skillValue) {
+                if (roll.total <= skillValue) {
                     rollData.success = true
                 } else {
                     rollData.failure = true
@@ -160,9 +160,9 @@ export default class KHDiceRoller {
         await roll.toMessage({
             create: true,
             content: html,
-            user: game.user._id,
+            user: game.user.id,
             speaker: {
-                actor: speaker._id,
+                actor: speaker.id,
                 token: speaker.token,
                 alias: speaker.name,
             },
@@ -295,7 +295,7 @@ export default class KHDiceRoller {
             totalrolls++
             const roll = new Roll(`1d100`);
 
-            let res = roll.roll();
+            await roll.evaluate();
 
             let skillName = skill.name
             let success = false
@@ -307,7 +307,7 @@ export default class KHDiceRoller {
 
             let rollData2 = {
                 name: skillName,
-                res: res,
+                res: roll,
             };
 
             if(openclosed < 0) {
@@ -319,7 +319,7 @@ export default class KHDiceRoller {
             }
 
             if(skill.value > 0) {
-                let oneRes = Math.floor((res.total / 1) % 10);
+                let oneRes = Math.floor((roll.total / 1) % 10);
                 //let tenRes = Math.floor((res.total / 10) % 10);
 
                 if(openclosed < 0 && oneRes !== 0 && Math.abs(openclosed) >= oneRes) {
@@ -330,7 +330,7 @@ export default class KHDiceRoller {
                     success = true
                     successes++
                 } else {
-                    if (res.total <= skill.value) {
+                    if (roll.total <= skill.value) {
                         success = true
                         successes++
                     } else {
@@ -343,7 +343,7 @@ export default class KHDiceRoller {
                 name: skillName,
                 failure: failure,
                 success: success,
-                result: res,
+                result: roll,
             })
 
             rollData2.success = success
@@ -354,9 +354,9 @@ export default class KHDiceRoller {
             await roll.toMessage({
                 create: true,
                 content: html,
-                user: game.user._id,
+                user: game.user.id,
                 speaker: {
-                    actor: speaker._id,
+                    actor: speaker.id,
                     token: speaker.token,
                     alias: speaker.name,
                 },
@@ -427,9 +427,9 @@ export default class KHDiceRoller {
         await ChatMessage.create({
             create: true,
             content: html,
-            user: game.user._id,
+            user: game.user.id,
             speaker: {
-                actor: speaker._id,
+                actor: speaker.id,
                 token: speaker.token,
                 alias: speaker.name,
             },

module/helpers/item-helpers.js

@@ -17,8 +17,8 @@ export default class ItemHelpers {
         }, {});
 
         // Remove modifications which are no longer used
-        if (this.object.data?.data?.modifications) {
-            for (let k of Object.keys(this.object.data.data.modifications)) {
+        if (this.object.data?.modifications) {
+            for (let k of Object.keys(this.object.data.modifications)) {
                 if (!modifications.hasOwnProperty(k)) modifications[`-=${k}`] = null;
             }
         }

module/items/item-sheet.js

@@ -28,7 +28,7 @@ export class ItemSheetKH extends ItemSheet {
         data.dtypes = ["String", "Number", "Boolean"];
 
         if (data?.data?.modifications) {
-            for (let attr of Object.values(data.data.modifications)) {
+            for (let attr of Object.values(data.modifications)) {
                 attr.isCheckbox = attr.dtype === "Boolean";
             }
         }
@@ -39,23 +39,32 @@ export class ItemSheetKH extends ItemSheet {
                 let skillList2
 
                 if(game.settings.get("kopparhavet", "gameSystem") === "hjaltarnas-tid") {
-                    skillList2 = await game.packs.get("kopparhavet.skills-ht").getContent();
+                    skillList2 = await game.packs.get("kopparhavet.skills-ht").getDocuments();
                 } else {
-                    skillList2 = await game.packs.get("kopparhavet.skills").getContent();
+                    skillList2 = await game.packs.get("kopparhavet.skills").getDocuments();
                 }
 
                 for (let item of skillList2) {
                     if(item.data.type === "skill" && item.data.data.type.value === "combat") {
-                        skillList.push(item)
+                        skillList.push(item.data)
                     }
                 }
 
                 // Retrieve any created skills as well
-                for (let item of game.items.entities) {
+                game.items.forEach((item) => {
                     if(item.data.type === "skill" && item.data.data.type.value === "combat") {
-                        skillList.push(item)
+                        skillList.push(item.data)
+                    }
+                });
+
+                /*
+                for (let item of game.items.entities) {
+                    if(item.data.type === "skill" && item.data.type.value === "combat") {
+                        skillList.push(item.data)
                     }
                 }
+                 */
+
                 this.position.width = 530;
                 this.position.height = 750;
                 break;
@@ -77,23 +86,33 @@ export class ItemSheetKH extends ItemSheet {
                 let skillList3
 
                 if(game.settings.get("kopparhavet", "gameSystem") === "hjaltarnas-tid") {
-                    skillList3 = await game.packs.get("kopparhavet.skills-ht").getContent();
+                    skillList3 = await game.packs.get("kopparhavet.skills-ht").getDocuments();
                 } else {
-                    skillList3 = await game.packs.get("kopparhavet.skills").getContent();
+                    skillList3 = await game.packs.get("kopparhavet.skills").getDocuments();
                 }
 
                 for (let item of skillList3) {
                     if(item.data.type === "skill") {
-                        skillList.push(item)
+                        skillList.push(item.data)
                     }
                 }
 
+                // Retrieve any created skills as well
+                game.items.forEach((item) => {
+                    if(item.data.type === "skill") {
+                        skillList.push(item.data)
+                    }
+                });
+
+                /*
                 // Retrieve any created skills as well
                 for (let item of game.items.entities) {
                     if(item.data.type === "skill") {
-                        skillList.push(item)
+                        skillList.push(item.data)
                     }
                 }
+                 */
+
                 this.position.width = 450;
                 this.position.height = 605;
                 break;
@@ -102,23 +121,32 @@ export class ItemSheetKH extends ItemSheet {
                 let skillList4
 
                 if(game.settings.get("kopparhavet", "gameSystem") === "hjaltarnas-tid") {
-                    skillList4 = await game.packs.get("kopparhavet.skills-ht").getContent();
+                    skillList4 = await game.packs.get("kopparhavet.skills-ht").getDocuments();
                 } else {
-                    skillList4 = await game.packs.get("kopparhavet.skills").getContent();
+                    skillList4 = await game.packs.get("kopparhavet.skills").getDocuments();
                 }
 
                 for (let item of skillList4) {
                     if(item.data.type === "skill" && item.data.data.type.value === "combat") {
-                        skillList.push(item)
+                        skillList.push(item.data)
                     }
                 }
 
+                // Retrieve any created skills as well
+                game.items.forEach((item) => {
+                    if(item.data.type === "skill" && item.data.data.type.value === "combat") {
+                        skillList.push(item.data)
+                    }
+                });
+
+                /*
                 // Retrieve any created skills as well
                 for (let item of game.items.entities) {
                     if(item.data.type === "skill" && item.data.data.type.value === "combat") {
-                        skillList.push(item)
+                        skillList.push(item.data)
                     }
                 }
+                 */
                 this.position.width = 530;
                 this.position.height = 750;
                 break;
@@ -146,11 +174,11 @@ export class ItemSheetKH extends ItemSheet {
             const clickedName = $(ev.currentTarget).data("name");
 
             if(clickedName === "equipped") {
-                const equppiedValue = this.item.data.data.equipable.equipped;
+                const equppiedValue = this.item.data.equipable.equipped;
 
                 this.item.update({ "data.equipped.equipped": !equppiedValue });
             } else {
-                const clickedValue = (this.item.data.data[clickedName].value == undefined ? false : this.item.data.data[clickedName].value);
+                const clickedValue = (this.item.data[clickedName].value == undefined ? false : this.item.data[clickedName].value);
                 let dataName = "data." + clickedName + ".value"
                 let tempData = {}
 
@@ -174,7 +202,7 @@ export class ItemSheetKH extends ItemSheet {
         event.preventDefault();
         const a = event.currentTarget;
         const action = a.dataset.action;
-        const attrs = this.object.data.data.modifications;
+        const attrs = this.object.data.modifications;
         const form = this.form;
 
         // Add new modification

module/items/item.js

@@ -27,7 +27,7 @@ export class ItemKH extends Item {
         const html = await renderTemplate("systems/kopparhavet/templates/chat/item-card.html", itemData);
 
         const chatData = {
-            user: game.user._id,
+            user: game.user.id,
             rollMode: game.settings.get("core", "rollMode"),
             content: html,
         };

module/kh-dice.js

@@ -57,7 +57,7 @@ class KHDice {
         const html2 = await renderTemplate("systems/kopparhavet/templates/dice/roll.html", rollData);
 
         await r.toMessage({
-            user: game.user._id,
+            user: game.user.id,
             create: true,
             content: html2
         });

module/kh-hooks.js

@@ -10,10 +10,10 @@ export default class KHHooks {
                 actor.update({ "data.currency.shekel.label": "CURRENCY.SILVER" });
 
                 actorbaseSkills = CONFIG.KH.baseSkillsHT
-                skillIndex = await game.packs.get("kopparhavet.skills-ht").getContent();
+                skillIndex = await game.packs.get("kopparhavet.skills-ht").getDocuments();
             } else {
                 actorbaseSkills = CONFIG.KH.baseSkills;
-                skillIndex = await game.packs.get("kopparhavet.skills").getContent();
+                skillIndex = await game.packs.get("kopparhavet.skills").getDocuments();
             }
 
             // Check if skill already exists by some chance
@@ -23,7 +23,15 @@ export default class KHHooks {
             // Filter skillIndex array to include only skills for Actor Type.
             let _skillsList = skillIndex.filter((i) => skillsToAdd.includes(i.data.name));
 
-            await actor.createEmbeddedEntity("OwnedItem", _skillsList);
+            let _sl = [];
+            _skillsList.forEach((s) => {
+                //s.data._source.data["creatureType"] = actor.data.type;
+                //s.data._source.data["coreSkill"] = true;
+                _sl.push(s.data);
+            });
+
+            await actor.createEmbeddedDocuments("Item", _sl);
+            //await actor.createEmbeddedDocuments("Item", [_skillsList.toObject()]);
         } else {
             setTimeout(async function () {
                 await actor.sheet.render(true);

module/kh-main.js

@@ -9,8 +9,8 @@ import * as migrations from "./helpers/migration-helper.js";
 Hooks.once("init", () => {
     CONFIG.Combat.initiative = { formula: "(@combat.init)d6kh2", decimals: 0 };
 
-    CONFIG.Actor.entityClass = ActorKH;
-    CONFIG.Item.entityClass = ItemKH;
+    CONFIG.Actor.documentClass = ActorKH;
+    CONFIG.Item.documentClass = ItemKH;
 
     // Give global access to FFG config.
     CONFIG.KH = KH;

system.json

@@ -2,9 +2,9 @@
     "name": "kopparhavet",
     "title": "Kopparhavets Hjältar",
     "description": "The Molten Sea is a dangerous but exciting place, where pirates, sorcerers and secretive orders of knighthood struggle for power, wealth and ancient lore.",
-    "version": "0.0.6",
-    "minimumCoreVersion": "0.7.5",
-    "compatibleCoreVersion": "0.7.9",
+    "version": "0.1.2",
+    "minimumCoreVersion": "9",
+    "compatibleCoreVersion": "9",
     "templateVersion": 4,
     "author": "Erebus",
     "scripts": [],
@@ -95,6 +95,6 @@
     "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
     "socket": true,
     "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
-    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.5.zip",
+    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.1.2.zip",
     "license": "LICENCE.txt"
 }

templates/actors/adversary-sheet.html

@@ -8,25 +8,25 @@
             <label style="margin: auto;">{{localize "BIO.NAME"}}:</label>
             <h1 class="charname" style="margin-bottom: 0;grid-column: 3/6;"><input name="name" type="text" value="{{actor.name}}" placeholder="{{localize "BIO.NAME"}}" /></h1>
 
-            <label style="margin: auto;">{{localize data.health.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.health.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.health.value" value="{{data.health.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.value" value="{{data.data.health.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.health.max" value="{{data.health.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.max" value="{{data.data.health.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.stamina.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.stamina.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.stamina.value" value="{{data.stamina.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.value" value="{{data.data.stamina.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.stamina.max" value="{{data.stamina.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.max" value="{{data.data.stamina.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.mana.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.mana.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.mana.value" value="{{data.mana.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.value" value="{{data.data.mana.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.mana.max" value="{{data.mana.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.max" value="{{data.data.mana.max}}" data-dtype="Number" />
             </div>
         </div>
 
@@ -44,7 +44,7 @@
                 {{> systems/kopparhavet/templates/parts/actor/talent.html}}
             </div>
             <div class="tab border note" data-group="primary" data-tab="note" style="height: 100%; border-top: none;">
-                {{editor content=data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
+                {{editor content=data.data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
             </div>
         </div>
     </div>

templates/actors/character-sheet.html

@@ -8,31 +8,31 @@
             <label style="margin: auto;">{{localize "BIO.NAME"}}:</label>
             <h1 class="charname" style="margin-bottom: 0;grid-column: 3/6;"><input name="name" type="text" value="{{actor.name}}" placeholder="{{localize "BIO.NAME"}}" /></h1>
 
-            <label style="margin: auto;">{{localize data.bio.kin.label}}:</label>
-            <input name="data.bio.kin.value" type="text" value="{{data.bio.kin.value}}" placeholder="{{localize data.bio.kin.label}}" />
+            <label style="margin: auto;">{{localize data.data.bio.kin.label}}:</label>
+            <input name="data.bio.kin.value" type="text" value="{{data.data.bio.kin.value}}" placeholder="{{localize data.data.bio.kin.label}}" />
 
-            <label style="margin: auto;">{{localize data.bio.profession.label}}:</label>
-            <input name="data.bio.profession.value" type="text" value="{{data.bio.profession.value}}" placeholder="{{localize data.bio.profession.label}}" />
+            <label style="margin: auto;">{{localize data.data.bio.profession.label}}:</label>
+            <input name="data.bio.profession.value" type="text" value="{{data.data.bio.profession.value}}" placeholder="{{localize data.data.bio.profession.label}}" />
 
-            <label style="margin: auto;">{{localize data.health.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.health.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.health.value" value="{{data.health.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.value" value="{{data.data.health.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.health.max" value="{{data.health.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.max" value="{{data.data.health.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.stamina.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.stamina.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.stamina.value" value="{{data.stamina.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.value" value="{{data.data.stamina.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.stamina.max" value="{{data.stamina.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.max" value="{{data.data.stamina.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.mana.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.mana.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.mana.value" value="{{data.mana.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.value" value="{{data.data.mana.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.mana.max" value="{{data.mana.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.max" value="{{data.data.mana.max}}" data-dtype="Number" />
             </div>
         </div>
 
@@ -62,7 +62,7 @@
                 {{> systems/kopparhavet/templates/parts/actor/bio.html}}
             </div>
             <div class="tab note border" data-group="primary" data-tab="note" style="border-top: none;">
-                {{editor content=data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
+                {{editor content=data.data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
             </div>
         </div>
     </div>

templates/actors/ht-adversary-sheet.html

@@ -8,25 +8,25 @@
             <label style="margin: auto;">{{localize "BIO.NAME"}}:</label>
             <h1 class="charname" style="margin-bottom: 0;grid-column: 3/6;"><input name="name" type="text" value="{{actor.name}}" placeholder="{{localize "BIO.NAME"}}" /></h1>
 
-            <label style="margin: auto;">{{localize data.health.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.health.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.health.value" value="{{data.health.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.value" value="{{data.data.health.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.health.max" value="{{data.health.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.max" value="{{data.data.health.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.stamina.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.stamina.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.stamina.value" value="{{data.stamina.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.value" value="{{data.data.stamina.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.stamina.max" value="{{data.stamina.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.max" value="{{data.data.stamina.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.mana.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.mana.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.mana.value" value="{{data.mana.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.value" value="{{data.data.mana.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.mana.max" value="{{data.mana.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.max" value="{{data.data.mana.max}}" data-dtype="Number" />
             </div>
         </div>
 
@@ -44,7 +44,7 @@
                 {{> systems/kopparhavet/templates/parts/actor/talent.html}}
             </div>
             <div class="tab border note" data-group="primary" data-tab="note" style="height: 100%; border-top: none;">
-                {{editor content=data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
+                {{editor content=data.data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
             </div>
         </div>
     </div>

templates/actors/ht-character-sheet.html

@@ -8,34 +8,34 @@
             <label style="margin: auto;">{{localize "BIO.NAME"}}:</label>
             <h1 class="charname" style="margin-bottom: 0; grid-column: 3/6;"><input name="name" type="text" value="{{actor.name}}" placeholder="{{localize "BIO.NAME"}}" /></h1>
 
-            <label style="margin: auto;">{{localize data.bio.nickname.label}}:</label>
-            <input name="data.bio.nickname.value" style="grid-column: 3/6;" type="text" value="{{data.bio.nickname.value}}" placeholder="{{localize data.bio.nickname.label}}" />
+            <label style="margin: auto;">{{localize data.data.bio.nickname.label}}:</label>
+            <input name="data.bio.nickname.value" style="grid-column: 3/6;" type="text" value="{{data.data.bio.nickname.value}}" placeholder="{{localize data.data.bio.nickname.label}}" />
 
-            <label style="margin: auto;">{{localize data.bio.kin.label}}:</label>
-            <input name="data.bio.kin.value" type="text" value="{{data.bio.kin.value}}" placeholder="{{localize data.bio.kin.label}}" />
+            <label style="margin: auto;">{{localize data.data.bio.kin.label}}:</label>
+            <input name="data.bio.kin.value" type="text" value="{{data.data.bio.kin.value}}" placeholder="{{localize data.data.bio.kin.label}}" />
 
-            <label style="margin: auto;">{{localize data.bio.profession.label}}:</label>
-            <input name="data.bio.profession.value" type="text" value="{{data.bio.profession.value}}" placeholder="{{localize data.bio.profession.label}}" />
+            <label style="margin: auto;">{{localize data.data.bio.profession.label}}:</label>
+            <input name="data.bio.profession.value" type="text" value="{{data.data.bio.profession.value}}" placeholder="{{localize data.data.bio.profession.label}}" />
 
-            <label style="margin: auto;">{{localize data.health.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.health.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.health.value" value="{{data.health.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.value" value="{{data.data.health.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.health.max" value="{{data.health.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.health.max" value="{{data.data.health.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.stamina.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.stamina.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.stamina.value" value="{{data.stamina.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.value" value="{{data.data.stamina.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.stamina.max" value="{{data.stamina.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.stamina.max" value="{{data.data.stamina.max}}" data-dtype="Number" />
             </div>
 
-            <label style="margin: auto;">{{localize data.mana.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.mana.label}}:</label>
             <div class="grid-container" style="grid-template-columns: auto 1fr auto;">
-                <input class="center-text" type="text" name="data.mana.value" value="{{data.mana.value}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.value" value="{{data.data.mana.value}}" data-dtype="Number" />
                 <span> / </span>
-                <input class="center-text" type="text" name="data.mana.max" value="{{data.mana.max}}" data-dtype="Number" />
+                <input class="center-text" type="text" name="data.mana.max" value="{{data.data.mana.max}}" data-dtype="Number" />
             </div>
         </div>
 
@@ -61,7 +61,7 @@
                 {{> systems/kopparhavet/templates/parts/actor/gear.html}}
             </div>
             <div class="tab note border" data-group="primary" data-tab="note" style="border-top: none;">
-                {{editor content=data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
+                {{editor content=data.data.bio.note.value target="data.bio.note.value" button=true owner=owner editable=editable}}
             </div>
         </div>
     </div>

templates/actors/ship-sheet.html

@@ -8,27 +8,27 @@
             <label style="margin-top: auto; margin-bottom: auto;">{{localize "BIO.NAME"}}:</label>
             <h1 class="charname" style="margin-bottom: 0;grid-column: 3/6;"><input name="name" type="text" value="{{actor.name}}" placeholder="{{localize "BIO.NAME"}}" /></h1>
 
-            <label style="margin-top: auto; margin-bottom: auto;">{{localize data.class.label}}:</label>
-            <span class="charname" style="margin-bottom: 0;grid-column: 3/6;"><input name="data.class.value" type="text" value="{{data.class.value}}" placeholder="{{localize data.class.label}}" /></span>
+            <label style="margin-top: auto; margin-bottom: auto;">{{localize data.data.class.label}}:</label>
+            <span class="charname" style="margin-bottom: 0;grid-column: 3/6;"><input name="data.class.value" type="text" value="{{data.data.class.value}}" placeholder="{{localize data.data.class.label}}" /></span>
 
-            <label style="margin: auto;">{{localize data.operationscost.label}}:</label>
-            <input class="center-text" type="text" name="data.operationscost.value" value="{{data.operationscost.value}}" data-dtype="Number" />
+            <label style="margin: auto;">{{localize data.data.operationscost.label}}:</label>
+            <input class="center-text" type="text" name="data.operationscost.value" value="{{data.data.operationscost.value}}" data-dtype="Number" />
 
-            <label style="margin: auto;">{{localize data.operationssupply.label}}:</label>
-            <input class="center-text" type="text" name="data.operationssupply.value" value="{{data.operationssupply.value}}" data-dtype="Number" />
+            <label style="margin: auto;">{{localize data.data.operationssupply.label}}:</label>
+            <input class="center-text" type="text" name="data.operationssupply.value" value="{{data.data.operationssupply.value}}" data-dtype="Number" />
 
-            <label style="margin: auto;">{{localize data.hull.label}}:</label>
+            <label style="margin: auto;">{{localize data.data.hull.label}}:</label>
             <