fix: 🐛 Consumable roll not decreasing consumable

Fixes #441
fvtt-fria-ligan · Jul 30, 2024 · 9729eeb · 9729eeb
1 parent 47f52eb
commit 9729eeb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.changeset/fuzzy-mangos-rhyme.md b/.changeset/fuzzy-mangos-rhyme.md
@@ -0,0 +1,5 @@
+---
+"forbidden-lands": patch
+---
+
+Consumable roll not correctly decreasing consumables
diff --git a/lang/en.json b/lang/en.json
@@ -353,6 +353,7 @@
 	"MONSTER.TYPE.MOUNT": "Mount",
 	"MOVEMENT": "Movement",
 	"NONE": "None",
+	"NOTIFY.CONSUMABLE_USED": "Consumable used!",
 	"NOTIFY.YOUR_ITEM_BROKE": "Your item broke!",
 	"NOTIFY.YOU_ARE_BROKEN": "You are broken!",
 	"OTHER": "OTHER",

diff --git a/src/actor/character/character-sheet.js b/src/actor/character/character-sheet.js
@@ -127,7 +127,7 @@ export class ForbiddenLandsCharacterSheet extends ForbiddenLandsActorSheet {
 		await roll.roll({ async: true });
 		const message = await roll.toMessage();
 		if (
-			Number(message.roll.result) <=
+			Number(message.rolls[0].result) <=
 			(game.settings.get("forbidden-lands", "autoDecreaseConsumable") || 0)
 		) {
 			FBLRollHandler.decreaseConsumable(message.id);

diff --git a/src/components/roll-engine/engine.js b/src/components/roll-engine/engine.js
@@ -704,15 +704,18 @@ export class FBLRollHandler extends FormApplication {
 	 */
 	static async decreaseConsumable(messageId) {
 		let {
-			data: { speaker },
-			roll: {
-				options: { consumable },
-			},
+			speaker,
+			rolls: [
+				{
+					options: { consumable },
+				},
+			],
 		} = game.messages.get(messageId);
 
 		speaker = this.getSpeaker(speaker);
 		if (!speaker)
 			return console.error("Could not decrease consumable: No actor found.");
+		ui.notifications.info("NOTIFY.CONSUMABLE_USED", { localize: true });
 
 		const currentValue = speaker?.consumables[consumable]?.value;
 		const newValue = Math.max(currentValue - 1, 0);