fix: 🐛 Critical Injuries dragged on to sheet

fvtt-fria-ligan · Aug 15, 2024 · b315c2a · b315c2a
1 parent 861e660
commit b315c2a
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 32 deletions.
diff --git a/.changeset/cyan-pots-drive.md b/.changeset/cyan-pots-drive.md
@@ -0,0 +1,5 @@
+---
+"forbidden-lands": patch
+---
+
+Fixed an issue where critical injuries dragged onto character sheets would not be created
diff --git a/src/actor/actor-document.js b/src/actor/actor-document.js
@@ -82,17 +82,12 @@ export class ForbiddenLandsActor extends Actor {
 		for await (const entity of newData) {
 			if (!entity.system) continue;
 
-			entity.system = await Object.entries(entity.system).reduce(
-				async (obj, [key, value]) => {
-					if (typeof value === "string" && value.match(inlineRoll)) {
-						const result = await createRoll(inlineRoll.exec(value));
-						value = value.replace(inlineRoll, result);
-					}
-					const resolved = await obj;
-					return { ...resolved, [key]: value };
-				},
-				{},
-			);
+			for await (const [key, value] of Object.entries(entity.system)) {
+				if (typeof value === "string" && value.match(inlineRoll)) {
+					const result = await createRoll(inlineRoll.exec(value));
+					entity.system[key] = value.replace(inlineRoll, result);
+				}
+			}
 
 			// We only want to touch flags of items that are considered "gear"
 			if (!CONFIG.fbl.carriedItemTypes.includes(entity.type)) continue;

diff --git a/src/actor/character/character-sheet.js b/src/actor/character/character-sheet.js
@@ -11,7 +11,7 @@ export class ForbiddenLandsCharacterSheet extends ForbiddenLandsActorSheet {
 			"forbidden-lands",
 			"useHealthAndResolve",
 		);
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			classes: ["forbidden-lands", "sheet", "actor"],
 			width: 660,
 			height: useHealthAndResolve ? 790 : 740,

diff --git a/src/actor/monster/monster-sheet.js b/src/actor/monster/monster-sheet.js
@@ -5,7 +5,7 @@ import localizeString from "@utils/localize-string.js";
 //import { ActorSheetConfig } from "@utils/sheet-config.js";
 export class ForbiddenLandsMonsterSheet extends ForbiddenLandsActorSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			classes: ["forbidden-lands", "sheet", "actor"],
 			template:

diff --git a/src/actor/party/party-sheet.js b/src/actor/party/party-sheet.js
@@ -9,7 +9,7 @@ export class ForbiddenLandsPartySheet extends ActorSheet {
 			dragSelector: ".party-member",
 			dropSelector: ".party-member-list",
 		});
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			classes: ["forbidden-lands", "sheet", "actor", "party"],
 			template: "systems/forbidden-lands/templates/actor/party/party-sheet.hbs",
 			width: window.innerWidth * 0.05 + 650,

diff --git a/src/actor/stronghold/stronghold-sheet.js b/src/actor/stronghold/stronghold-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsActorSheet } from "../actor-sheet.js";
 export class ForbiddenLandsStrongholdSheet extends ForbiddenLandsActorSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			classes: ["forbidden-lands", "sheet", "actor"],
 			template:

diff --git a/src/components/character-generator/character-generator.js b/src/components/character-generator/character-generator.js
@@ -10,7 +10,7 @@ export class ForbiddenLandsCharacterGenerator extends Application {
 	}
 
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			classes: ["forbidden-lands", "sheet", "actor"],
 			template:
 				"systems/forbidden-lands/templates/components/character-generator/generator-sheet.hbs",

diff --git a/src/components/roll-engine/engine.js b/src/components/roll-engine/engine.js
@@ -94,7 +94,7 @@ export class FBLRollHandler extends FormApplication {
 	 * Foundry override intended to customize the window render.
 	 */
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			classes: ["forbidden-lands"],
 			width: "500",
 			height: "auto",

diff --git a/src/item/armor/armor-sheet.js b/src/item/armor/armor-sheet.js
@@ -2,7 +2,7 @@ import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 
 export class ForbiddenLandsArmorSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template: "systems/forbidden-lands/templates/item/armor/armor-sheet.hbs",
 			tabs: [

diff --git a/src/item/building/building-sheet.js b/src/item/building/building-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsBuildingSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/building/building-sheet.hbs",

diff --git a/src/item/critical-injury/critical-injury-sheet.js b/src/item/critical-injury/critical-injury-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsCriticalInjurySheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/critical-injury/critical-injury-sheet.hbs",

diff --git a/src/item/gear/gear-sheet.js b/src/item/gear/gear-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsGearSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template: "systems/forbidden-lands/templates/item/gear/gear-sheet.hbs",
 			tabs: [

diff --git a/src/item/hireling/hireling-sheet.js b/src/item/hireling/hireling-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsHirelingSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/hireling/hireling-sheet.hbs",

diff --git a/src/item/item-document.js b/src/item/item-document.js
@@ -166,7 +166,7 @@ export class ForbiddenLandsItem extends Item {
 		}
 		const message = await ChatMessage.create(chatData);
 		if (itemData.isCriticalInjury) {
-			const content = $(message.data.content);
+			const content = $(message.content);
 			const limit = content.find("[data-type='limit']").text().trim();
 			const healingTime = content.find("[data-type='healtime']").text().trim();
 			itemData.system.limit = limit;

diff --git a/src/item/item-sheet.js b/src/item/item-sheet.js
@@ -12,7 +12,7 @@ export class ForbiddenLandsItemSheet extends ItemSheet {
 	}
 
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			classes: ["forbidden-lands", "sheet", "item"],
 			width: window.innerWidth * 0.08 + 350,

diff --git a/src/item/monster-attack/monster-attack-sheet.js b/src/item/monster-attack/monster-attack-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsMonsterAttackSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/monster-attack/monster-attack-sheet.hbs",

diff --git a/src/item/raw-material/raw-material-sheet.js b/src/item/raw-material/raw-material-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsRawMaterialSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/raw-material/raw-material-sheet.hbs",

diff --git a/src/item/spell/spell-sheet.js b/src/item/spell/spell-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsSpellSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template: "systems/forbidden-lands/templates/item/spell/spell-sheet.hbs",
 		});

diff --git a/src/item/talent/talent-sheet.js b/src/item/talent/talent-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsTalentSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/talent/talent-sheet.hbs",

diff --git a/src/item/weapon/weapon-sheet.js b/src/item/weapon/weapon-sheet.js
@@ -1,7 +1,7 @@
 import { ForbiddenLandsItemSheet } from "@item/item-sheet";
 export class ForbiddenLandsWeaponSheet extends ForbiddenLandsItemSheet {
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			template:
 				"systems/forbidden-lands/templates/item/weapon/weapon-sheet.hbs",

diff --git a/src/system/core/migration.js b/src/system/core/migration.js
@@ -207,7 +207,7 @@ const migrateSceneData = (scene) => {
 				const updates = new Map(update[embeddedName].map((u) => [u._id, u]));
 				for (const embedded of actorData[embeddedName]) {
 					const toUpdate = updates.get(embedded._id);
-					if (toUpdate) mergeObject(embedded, toUpdate);
+					if (toUpdate) foundry.utils.mergeObject(embedded, toUpdate);
 				}
 				delete update[embeddedName];
 			}

diff --git a/src/system/core/settings.js b/src/system/core/settings.js
@@ -38,7 +38,7 @@ export class TableConfigMenu extends FormApplication {
 	});
 
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			template:
 				"systems/forbidden-lands/templates/components/tables-config.hbs",
 			classes: ["tables-config"],
@@ -127,7 +127,7 @@ export class SheetConfigMenu extends FormApplication {
 	});
 
 	static get defaultOptions() {
-		return mergeObject(super.defaultOptions, {
+		return foundry.utils.mergeObject(super.defaultOptions, {
 			template: "systems/forbidden-lands/templates/components/sheet-config.hbs",
 			classes: ["sheet-config"],
 			title: "CONFIG.SHEET_CONFIG.TITLE",