[Feature] Group Roll Rework (#1785)

* Initial

* .

* Improvements

* .

* Renamed 'Main Charater' to 'Leader'

* Localization fixes

* .

* Fixed roll sound coming when canceling a roll. Fixed the leader PART not being disabled when the player isn't the leader

module/data/_module.mjs

@@ -4,6 +4,7 @@ export { default as DhRollTable } from './rollTable.mjs';
 export { default as RegisteredTriggers } from './registeredTriggers.mjs';
 export { default as CompendiumBrowserSettings } from './compendiumBrowserSettings.mjs';
 export { default as TagTeamData } from './tagTeamData.mjs';
+export { default as GroupRollData } from './groupRollData.mjs';
 export { default as SpotlightTracker } from './spotlightTracker.mjs';
 
 export * as countdowns from './countdowns.mjs';

module/data/actor/party.mjs

@@ -1,6 +1,7 @@
 import BaseDataActor from './base.mjs';
 import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import TagTeamData from '../tagTeamData.mjs';
+import GroupRollData from '../groupRollData.mjs';
 
 export default class DhParty extends BaseDataActor {
     /**@inheritdoc */
@@ -16,7 +17,8 @@ export default class DhParty extends BaseDataActor {
                 bags: new fields.NumberField({ initial: 0, integer: true }),
                 chests: new fields.NumberField({ initial: 0, integer: true })
             }),
-            tagTeam: new fields.EmbeddedDataField(TagTeamData)
+            tagTeam: new fields.EmbeddedDataField(TagTeamData),
+            groupRoll: new fields.EmbeddedDataField(GroupRollData)
         };
     }
 

module/data/chat-message/_modules.mjs

@@ -1,6 +1,5 @@
 import DHAbilityUse from './abilityUse.mjs';
 import DHActorRoll from './actorRoll.mjs';
-import DHGroupRoll from './groupRoll.mjs';
 import DHSystemMessage from './systemMessage.mjs';
 
 export const config = {
@@ -9,6 +8,5 @@ export const config = {
     damageRoll: DHActorRoll,
     dualityRoll: DHActorRoll,
     fateRoll: DHActorRoll,
-    groupRoll: DHGroupRoll,
     systemMessage: DHSystemMessage
 };

module/data/chat-message/groupRoll.mjs

@@ -1,39 +0,0 @@
-import { abilities } from '../../config/actorConfig.mjs';
-
-export default class DHGroupRoll extends foundry.abstract.TypeDataModel {
-    static defineSchema() {
-        const fields = foundry.data.fields;
-
-        return {
-            leader: new fields.EmbeddedDataField(GroupRollMemberField),
-            members: new fields.ArrayField(new fields.EmbeddedDataField(GroupRollMemberField))
-        };
-    }
-
-    get totalModifier() {
-        return this.members.reduce((acc, m) => {
-            if (m.manualSuccess === null) return acc;
-
-            return acc + (m.manualSuccess ? 1 : -1);
-        }, 0);
-    }
-}
-
-class GroupRollMemberField extends foundry.abstract.DataModel {
-    static defineSchema() {
-        const fields = foundry.data.fields;
-
-        return {
-            actor: new fields.ObjectField(),
-            trait: new fields.StringField({ choices: abilities }),
-            difficulty: new fields.StringField(),
-            result: new fields.ObjectField({ nullable: true, initial: null }),
-            manualSuccess: new fields.BooleanField({ nullable: true, initial: null })
-        };
-    }
-
-    /* Can be expanded if we handle automation of success/failure */
-    get success() {
-        return manualSuccess;
-    }
-}

module/data/groupRollData.mjs

@@ -0,0 +1,40 @@
+export default class GroupRollData extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+
+        return {
+            leader: new fields.EmbeddedDataField(CharacterData, { nullable: true, initial: null }),
+            aidingCharacters: new fields.TypedObjectField(new fields.EmbeddedDataField(CharacterData))
+        };
+    }
+
+    get participants() {
+        return {
+            ...(this.leader ? { [this.leader.id]: this.leader } : {}),
+            ...this.aidingCharacters
+        };
+    }
+}
+
+export class CharacterData extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+
+        return {
+            id: new fields.StringField({ required: true }),
+            name: new fields.StringField({ required: true }),
+            img: new fields.StringField({ required: true }),
+            rollChoice: new fields.StringField({
+                choices: CONFIG.DH.ACTOR.abilities,
+                initial: CONFIG.DH.ACTOR.abilities.agility.id
+            }),
+            rollData: new fields.JSONField({ nullable: true, initial: null }),
+            selected: new fields.BooleanField({ initial: false }),
+            successfull: new fields.BooleanField({ nullable: true, initial: null })
+        };
+    }
+
+    get roll() {
+        return this.rollData ? CONFIG.Dice.daggerheart.DualityRoll.fromData(this.rollData) : null;
+    }
+}