Foe actor drag and drop

patches/@league-of-foundry-developers+foundry-vtt-types+9.269.0.patch

@@ -1,34 +1,47 @@
+diff --git a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/apps/forms/actor.d.ts b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/apps/forms/actor.d.ts
+index ab8be64..b10d652 100644
+--- a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/apps/forms/actor.d.ts
++++ b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/apps/forms/actor.d.ts
+@@ -87,7 +87,7 @@ declare global {
+     protected _onDropActiveEffect(event: DragEvent, data: ActorSheet.DropData.ActiveEffect): Promise<unknown>;
+
+     /**
+-     * Handle dropping of an item reference or item data onto an Actor Sheet
++     * Handle dropping of an actor reference or actor data onto an Actor Sheet
+      * @param event - The concluding DragEvent which contains drop data
+      * @param data  - The data transfer extracted from the event
+      * @returns A data object which describes the result of the drop
 diff --git a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/config.d.ts b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/config.d.ts
 index da561df..3665779 100644
 --- a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/config.d.ts
 +++ b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/config.d.ts
 @@ -128,6 +128,9 @@ declare global {
-
+ 
        /** @defaultValue `{}` */
        typeLabels: Record<string, string>;
 +
 +      /** @defaultValue `{}` */
 +      typeIcons: Record<string, string>;
      };
-
+ 
      /**
 @@ -332,6 +335,9 @@ declare global {
-
+ 
        /** @defaultValue `{}` */
        typeLabels: Record<string, string>;
 +
 +      /** @defaultValue `{}` */
 +      typeIcons: Record<string, string>;
      };
-
+ 
      /**
 @@ -1485,6 +1491,7 @@ declare global {
        };
        defaultType: "text";
        sidebarIcon: "fas fa-book-open";
 +      coreTypes: ["image", "pdf", "text", "video"]
      };
-
+ 
      /**
 diff --git a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/data/documents/table.d.ts b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/client/data/documents/table.d.ts
 index ca6d3f2..34792e6 100644
@@ -40,35 +53,35 @@ index ca6d3f2..34792e6 100644
         */
 -      roll: Roll;
 +      roll?: Roll;
-
+ 
        /**
         * Allow drawing recursively from inner RollTable results
         * @defaultValue `true`
         */
 -      recursive: boolean;
 +      recursive?: boolean;
-
+ 
        /**
         * One or more table results which have been drawn
         * @defaultValue `[]`
         */
 -      results: foundry.data.TableResultData[];
 +      results?: foundry.data.TableResultData[];
-
+ 
        /**
         * Whether to automatically display the results in chat
         * @defaultValue `true`
         */
 -      displayChat: boolean;
 +      displayChat?: boolean;
-
+ 
        /**
         * The chat roll mode to use when displaying the result
         */
 -      rollMode: keyof CONFIG.Dice.RollModes | "roll";
 +      rollMode?: keyof CONFIG.Dice.RollModes | "roll";
      }
-
+ 
      /**
 diff --git a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/data.mjs/journalEntryPageData.d.ts b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/data.mjs/journalEntryPageData.d.ts
 index e1da7b2..c865bb4 100644
@@ -77,27 +90,27 @@ index e1da7b2..c865bb4 100644
 @@ -165,9 +165,12 @@ declare global {
       */
      name: string;
-
+ 
 +
      /**
       * The type of this page, in {@link BaseJournalEntryPage.TYPES}.
       */
 +    type: ValueOf<typeof foundry.documents.BaseJournalEntryPage.TYPES>
 +
      content: ValueOf<typeof foundry.CONST.JOURNAL_ENTRY_PAGE_FORMATS>;
-
+ 
      /**
 @@ -217,6 +220,7 @@ declare global {
       * @defaultValue `{}`
       */
      flags: ConfiguredFlags<"JournalEntryPage">;
 +
    }
-
+ 
    namespace JournalEntryPageDataProperties {
 @@ -315,4 +319,10 @@ export class JournalEntryPageData extends DocumentData<
  }
-
+ 
  // eslint-disable-next-line @typescript-eslint/no-empty-interface
 -export interface JournalEntryPageData extends JournalEntryPageDataProperties {}
 +export interface JournalEntryPageData extends JournalEntryPageDataProperties {
@@ -118,10 +131,10 @@ index 25cb406..ce8ce9b 100644
 +    isEmbedded: true
    }
  >;
-
+ 
 @@ -43,4 +44,24 @@ export declare class BaseJournalEntryPage extends Document<
    static get TYPES(): DocumentSubTypes<"JournalEntryPage">[];
-
+ 
    getUserLevel(user: BaseUser): ValueOf<typeof CONST.DOCUMENT_OWNERSHIP_LEVELS> | null;
 +
 +  /**
@@ -158,7 +171,7 @@ index eb3fa4c..f45b1d5 100644
 +>
 +  ? InstanceType<ConfiguredDocumentClassForName<T>>["type"]
    : typeof foundry.CONST.BASE_DOCUMENT_TYPE;
-
+ 
  export type ConfiguredDocumentClassForName<Name extends DocumentType> = CONFIG[Name]["documentClass"];
 diff --git a/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/types/utils.d.ts b/node_modules/@league-of-foundry-developers/foundry-vtt-types/src/types/utils.d.ts
 index 8cc4b52..197c630 100644
@@ -188,5 +201,5 @@ index 8cc4b52..197c630 100644
 +    } )
 +  : T[P];
  };
-
+ 
  /**

src/config.ts

@@ -20,13 +20,18 @@ import {
 	registerOracleTree
 } from './module/features/customoracles'
 import { OracleTable } from './module/roll-table/oracle-table'
+import type { ConfiguredData } from '@league-of-foundry-developers/foundry-vtt-types/src/types/helperTypes'
+
+export type SystemSubtype = ConfiguredData<
+	'Actor' | 'Item' | 'JournalEntryPage'
+>['type']
 
 export interface EmitterEvents extends Record<EventType, unknown> {
 	highlightMove: string // Foundry UUID
 	highlightOracle: string // DF ID
 	globalConditionChanged: { name: string; enabled: boolean } // info about condition that changed
-	dragStart: string // type of item
-	dragEnd: string // type of item
+	dragStart: SystemSubtype // type of item
+	dragEnd: SystemSubtype // type of item
 }
 export type IronswornEmitter = Emitter<EmitterEvents>
 

src/index.ts

@@ -88,6 +88,9 @@ Hooks.once('init', async () => {
 	CONFIG.RollTable.resultIcon = 'icons/dice/d10black.svg'
 	CONFIG.TableResult.documentClass = OracleTableResult
 
+	// configure index fields
+	CONFIG.Actor.compendiumIndexFields.push('system.dfid')
+
 	// CONFIG.RollTable.resultTemplate =
 	// 	'systems/foundry-ironsworn/templates/rolls/oracle-roll-message.hbs'
 

src/module/actor/sheets/sitesheet.ts

@@ -1,6 +1,5 @@
 import { VueActorSheet } from '../../vue/vueactorsheet'
 import siteSheetVue from '../../vue/site-sheet.vue'
-
 export class IronswornSiteSheet extends VueActorSheet {
 	static get defaultOptions() {
 		return mergeObject(super.defaultOptions, {
@@ -10,6 +9,15 @@ export class IronswornSiteSheet extends VueActorSheet {
 		}) as any
 	}
 
+	async _onDropActor(event: DragEvent, data: ActorSheet.DropData.Actor) {
+		// Fetch the actor. We only want to override denizens (foe-type actors)
+		const droppedActor = await Actor.fromDropData(data as any)
+		if (droppedActor == null) return false
+		if (droppedActor.type !== 'foe') {
+			return await super._onDropActor(event, data)
+		}
+	}
+
 	async _onDropItem(event: DragEvent, data: ActorSheet.DropData.Item) {
 		if (!this.actor.assert('site'))
 			throw new Error(
@@ -27,13 +35,13 @@ export class IronswornSiteSheet extends VueActorSheet {
 			'.ironsworn__denizen__drop'
 		)[0]
 		if (dropTarget == null) return false
-		const idx = parseInt(dropTarget.dataset.idx || '')
-		const { denizens } = this.actor.system
+		const idx = parseInt(dropTarget?.dataset.idx || '')
+		const { denizens } = this.actor.system as SiteDataSourceData
 		if (!denizens[idx]) return false
 
 		// Set the denizen description
-		denizens[idx].text = item.link
-		void this.actor.update({ system: { denizens } }, { render: true })
+		denizens[idx].text = droppedActor.link
+		this.actor.update({ system: { denizens } }, { render: true })
 		return true
 	}
 }