[Fix] Party Fixes (#1284)

* Fixed deletion of characters in the world locking up the party actor

* .

* Fixed so leader in group roll gains resourcse

* Fixed so party.inventory has the right controls

* Corrected for added character purning

* .

module/applications/sheets/actors/party.mjs

@@ -7,6 +7,7 @@ import { socketEvent } from '../../../systemRegistration/socket.mjs';
 import GroupRollDialog from '../../dialogs/group-roll-dialog.mjs';
 import DhpActor from '../../../documents/actor.mjs';
 import DHItem from '../../../documents/item.mjs';
+import DhParty from '../../../data/actor/party.mjs';
 
 export default class Party extends DHBaseActorSheet {
     constructor(options) {
@@ -79,6 +80,9 @@ export default class Party extends DHBaseActorSheet {
         }
     };
 
+    static ALLOWED_ACTOR_TYPES = ['character', 'companion', 'adversary'];
+    static DICE_ROLL_ACTOR_TYPES = ['character'];
+
     async _onRender(context, options) {
         await super._onRender(context, options);
         this._createFilterMenus();
@@ -277,13 +281,17 @@ export default class Party extends DHBaseActorSheet {
     }
 
     static async #tagTeamRoll() {
-        new game.system.api.applications.dialogs.TagTeamDialog(this.document.system.partyMembers).render({
+        new game.system.api.applications.dialogs.TagTeamDialog(
+            this.document.system.partyMembers.filter(x => Party.DICE_ROLL_ACTOR_TYPES.includes(x.type))
+        ).render({
             force: true
         });
     }
 
-    static async #groupRoll(params) {
-        new GroupRollDialog(this.document.system.partyMembers).render({ force: true });
+    static async #groupRoll(_params) {
+        new GroupRollDialog(
+            this.document.system.partyMembers.filter(x => Party.DICE_ROLL_ACTOR_TYPES.includes(x.type))
+        ).render({ force: true });
     }
 
     /**
@@ -453,17 +461,17 @@ export default class Party extends DHBaseActorSheet {
         event.stopPropagation();
 
         const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
-        const item = await foundry.utils.fromUuid(data.uuid);
+        const document = await foundry.utils.fromUuid(data.uuid);
 
-        if (item instanceof DhpActor) {
+        if (document instanceof DhpActor && Party.ALLOWED_ACTOR_TYPES.includes(document.type)) {
             const currentMembers = this.document.system.partyMembers.map(x => x.uuid);
             if (currentMembers.includes(data.uuid)) {
                 return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.duplicateCharacter'));
             }
 
-            await this.document.update({ 'system.partyMembers': [...currentMembers, item.uuid] });
-        } else if (item instanceof DHItem) {
-            this.document.createEmbeddedDocuments('Item', [item.toObject()]);
+            await this.document.update({ 'system.partyMembers': [...currentMembers, document.uuid] });
+        } else if (document instanceof DHItem) {
+            this.document.createEmbeddedDocuments('Item', [document.toObject()]);
         } else {
             ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.onlyCharactersInPartySheet'));
         }

module/applications/ui/chatLog.mjs

@@ -192,9 +192,18 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
 
     async groupRollButton(event, message) {
         const path = event.currentTarget.dataset.path;
+        const isLeader = path === 'leader';
         const { actor: actorData, trait } = foundry.utils.getProperty(message.system, path);
         const actor = game.actors.get(actorData._id);
 
+        if (!actor) {
+            return ui.notifications.error(
+                game.i18n.format('DAGGERHEART.UI.Notifications.documentIsMissing', {
+                    documentType: game.i18n.localize('TYPES.Actor.character')
+                })
+            );
+        }
+
         if (!actor.testUserPermission(game.user, 'OWNER')) {
             return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.noActorOwnership'));
         }
@@ -214,7 +223,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
             hasRoll: true,
             skips: {
                 createMessage: true,
-                resources: true
+                resources: !isLeader
             }
         };
         const result = await actor.diceRoll({
@@ -225,6 +234,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
             })
         });
 
+        if (!result) return;
+        await game.system.api.fields.ActionFields.CostField.execute.call({ actor }, result);
+
         const newMessageData = foundry.utils.deepClone(message.system);
         foundry.utils.setProperty(newMessageData, `${path}.result`, result.roll);
         const renderData = { system: new game.system.api.models.chatMessages.config.groupRoll(newMessageData) };

module/data/actor/character.mjs

@@ -675,6 +675,8 @@ export default class DhCharacter extends BaseDataActor {
     }
 
     _getTags() {
-        return [this.class.value?.name, this.class.subclass?.name, this.community?.name, this.ancestry?.name].filter((t) => !!t);
+        return [this.class.value?.name, this.class.subclass?.name, this.community?.name, this.ancestry?.name].filter(
+            t => !!t
+        );
     }
 }

module/data/actor/party.mjs

@@ -41,7 +41,7 @@ export default class DhParty extends BaseDataActor {
 
         // Clear this party from all members that aren't deleted
         for (const member of this.partyMembers) {
-            member.parties?.delete(this.parent);
+            member?.parties?.delete(this.parent);
         }
     }
 }

module/systemRegistration/migrations.mjs

@@ -4,6 +4,7 @@ export async function runMigrations() {
     let lastMigrationVersion = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion);
     if (!lastMigrationVersion) lastMigrationVersion = game.system.version;
 
+    //#region old migrations
     if (foundry.utils.isNewerVersion('1.1.0', lastMigrationVersion)) {
         const lockedPacks = [];
         const compendiumActors = [];
@@ -190,6 +191,7 @@ export async function runMigrations() {
 
         lastMigrationVersion = '1.2.0';
     }
+    //#endregion
 
     await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion, lastMigrationVersion);
 }