feat: add ability to drop folders on actors

xdy · Jan 31, 2025 · 628a708 · 628a708
1 parent a430a34
commit 628a708
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 3 deletions.
diff --git a/src/module/entities/TwodsixActor.ts b/src/module/entities/TwodsixActor.ts
@@ -1109,6 +1109,12 @@ export default class TwodsixActor extends Actor {
     return false;
   }
 
+  /**
+   * Handle a dropped ActiveEffect on the Actor.
+   * @param {TwodsixActiveEffect} droppedEffect         Dropped ActiveEffect
+   * @returns {Promise<boolean>}
+   *
+   */
   public async handleDroppedActiveEffect(droppedEffect:TwodsixActiveEffect): Promise<boolean> {
     if ( !droppedEffect || (droppedEffect.target === this) ) {
       return false;
@@ -1118,6 +1124,28 @@ export default class TwodsixActor extends Actor {
     return true;
   }
 
+  /**
+   * Handle a dropped Folder on the Actor.
+   * @param {FolderData} folder         Extracted folder document
+   * @returns {Promise<void>}
+   *
+   */
+  public async handleDroppedFolder(folder:FolderData): Promise<void> {
+    if (folder?.type === "Item" && folder?.contents.length > 0){
+      const confirmed = await foundry.applications.api.DialogV2.confirm({
+        window: {title: game.i18n.localize("TWODSIX.Warnings.AddMultipleItems")},
+        content: game.i18n.localize("TWODSIX.Warnings.ConfirmDrop")
+      });
+      if (confirmed) {
+        for (const it of folder.contents) {
+          await this.handleDroppedItem(it);
+        }
+      }
+    } else {
+      ui.notifications.warn("TWODSIX.Warnings.CantDropFolder", {localize: true});
+    }
+  }
+
   /**
    * Method to handle a dropped damage payload
    * @param {any} damagePayload The damage paylod being dropped (includes damage amount, AP value and damage type & label)

diff --git a/src/module/handlebars.ts b/src/module/handlebars.ts
@@ -345,7 +345,7 @@ export default function registerHandlebarsHelpers(): void {
     return style;
   });
 
-  Handlebars.registerHelper("concat", (...args) => args.slice(0, args.length - 1).join(''));  //Needed? In FVTT baseline
+  Handlebars.registerHelper("concat", (...args) => args.slice(0, args.length - 1).join(''));  //Needed -YES. FVTT baseline concat works differently
   /*** No longer needed ****/
   /*
   Handlebars.registerHelper('each_sort_by_property', (property:string, array:TwodsixItem[], options) => {

diff --git a/src/module/hooks/dropItemOnToken.ts b/src/module/hooks/dropItemOnToken.ts
@@ -6,7 +6,7 @@
 import TwodsixActor from "../entities/TwodsixActor";
 import { getDocFromDropData } from "../utils/sheetUtils";
 Hooks.on('dropCanvasData', (canvasObject, dropData) => {
-  if ((['damageItem', 'ActiveEffect'].includes(dropData.type) || (dropData.type === "Item" && !game.modules.get("item-piles")?.active)) && game.settings.get("twodsix", "allowDropOnIcon")) {
+  if ((['damageItem', 'ActiveEffect', 'Folder'].includes(dropData.type) || (dropData.type === "Item" && !game.modules.get("item-piles")?.active)) && game.settings.get("twodsix", "allowDropOnIcon")) {
     catchDrop(canvasObject, dropData).then();
     return false;
   }
@@ -34,6 +34,10 @@ async function catchDrop(canvasObject: Canvas, dropData): Promise<any> {
           const droppedEffect = await fromUuid(dropData.uuid);
           return await targetActor.handleDroppedActiveEffect(droppedEffect);
         }
+        case 'Folder': {
+          const folder = await fromUuid(dropData.uuid);
+          return targetActor.handleDroppedFolder(folder);
+        }
         default: {
           ui.notifications.warn("TWODSIX.Warnings.CantDropOnToken", {localize: true});
           return false;

diff --git a/src/module/sheets/AbstractTwodsixActorSheet.ts b/src/module/sheets/AbstractTwodsixActorSheet.ts
@@ -386,6 +386,9 @@ export abstract class AbstractTwodsixActorSheet extends foundry.applications.api
     } else if (dropData.type === 'ActiveEffect') {
       const droppedEffect = await fromUuid(dropData.uuid);
       await this.onDropActiveEffect(ev, droppedEffect);
+    } else if (dropData.type === 'Folder') {
+      const droppedFolder = await fromUuid(dropData.uuid);
+      await (<TwodsixActor>this.actor).handleDroppedFolder(droppedFolder);
     } else {
       console.log(`Unknown Drop Type ${dropData.type}`);
       return false;

diff --git a/static/lang/en.json b/static/lang/en.json
@@ -1711,7 +1711,10 @@
       "CantFindShield": "Can't find an equipped shield to block",
       "NoPsiPoints": "Must have at least one psionic point to use an ability",
       "PsiUsageGTZero": "PSI Points used must be greater than zero",
-      "InvalidFormula": "Formula is Invalid for: "
+      "InvalidFormula": "Formula is Invalid for: ",
+      "ConfirmDrop": "Add all contents of folder to actor?",
+      "AddMultipleItems": "Add Multiple Items",
+      "CantDropFolder": "Cannot drop this folder onto actor."
     }
   },
   "TYPES": {