Merge pull request #557 from p4535992/add_brt_compatiiblity

Little fix with Better Rolltables compatibility
fantasycalendar · Apr 11, 2024 · dbc73e3 · dbc73e3
2 parents 645dcd6 + da2d2b8
commit dbc73e3
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/src/helpers/pile-utilities.js b/src/helpers/pile-utilities.js
@@ -1964,7 +1964,13 @@ export async function rollTable({
 
 	let results = [];
 	if (game.modules.get("better-rolltables")?.active) {
-		results = (await game.modules.get("better-rolltables").api.roll(table)).itemsData.map(result => ({
+		const brtOptions = {
+			rollsAmount: roll.total,
+			roll: undefined,
+			displayChat: displayChat, 
+			recursive: true
+		}
+		results = (await game.modules.get("better-rolltables").api.roll(table,brtOptions)).itemsData.map(result => ({
 			documentCollection: result.documentCollection,
 			documentId: result.documentId,
 			text: result.text || result.name,
@@ -2003,8 +2009,13 @@ export async function rollTable({
 	const items = [];
 
 	rolledItems.forEach(newItem => {
-
-		const existingItem = items.find((item) => item.documentId === newItem.documentId);
+		const existingItem = items.find((item) => {
+			if (item.documentId && newItem.documentId) {
+				return item.documentId === newItem.documentId;
+			} else {
+				return item._id === newItem._id;
+			}
+		});
 		if (existingItem) {
 			existingItem.quantity += Math.max(newItem.quantity, 1);
 		} else {
@@ -2096,7 +2107,13 @@ export async function rollMerchantTables({ tableData = false, actor = false } =
 		}
 
 		tableItems.forEach(newItem => {
-			const existingItem = items.find((item) => item.documentId === newItem.documentId);
+			const existingItem = items.find((item) => {
+                if (item.documentId && newItem.documentId) {
+                    return item.documentId === newItem.documentId;
+                } else {
+                    return item._id === newItem._id;
+                }
+            });
 			if (existingItem) {
 				existingItem.quantity += Math.max(newItem.quantity, 1);
 			} else {
@@ -2141,4 +2158,4 @@ async function getItem(itemToGet) {
 		}
 	}
 	return item;
-}
+}