.

module/applications/sidebar/tabs/actorDirectory.mjs

@@ -46,50 +46,71 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
 
     _getEntryContextOptions() {
         const options = super._getEntryContextOptions();
-        options.push({
-            name: 'DAGGERHEART.UI.Sidebar.actorDirectory.duplicateToNewTier',
-            icon: `<i class="fa-solid fa-arrow-trend-up" inert></i>`,
-            condition: li => {
-                const actor = game.actors.get(li.dataset.entryId);
-                return actor?.type === 'adversary' && actor.system.type !== 'social';
-            },
-            callback: async li => {
-                const actor = game.actors.get(li.dataset.entryId);
-                if (!actor) throw new Error('Unexpected missing actor');
+        options.push(
+            {
+                name: 'DAGGERHEART.UI.Sidebar.actorDirectory.duplicateToNewTier',
+                icon: `<i class="fa-solid fa-arrow-trend-up" inert></i>`,
+                condition: li => {
+                    const actor = game.actors.get(li.dataset.entryId);
+                    return actor?.type === 'adversary' && actor.system.type !== 'social';
+                },
+                callback: async li => {
+                    const actor = game.actors.get(li.dataset.entryId);
+                    if (!actor) throw new Error('Unexpected missing actor');
 
-                const tiers = [1, 2, 3, 4].filter(t => t !== actor.system.tier);
-                const content = document.createElement('div');
-                const select = document.createElement('select');
-                select.name = 'tier';
-                select.append(
-                    ...tiers.map(t => {
-                        const option = document.createElement('option');
-                        option.value = t;
-                        option.textContent = game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${t}`);
-                        return option;
-                    })
-                );
-                content.append(select);
+                    const tiers = [1, 2, 3, 4].filter(t => t !== actor.system.tier);
+                    const content = document.createElement('div');
+                    const select = document.createElement('select');
+                    select.name = 'tier';
+                    select.append(
+                        ...tiers.map(t => {
+                            const option = document.createElement('option');
+                            option.value = t;
+                            option.textContent = game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${t}`);
+                            return option;
+                        })
+                    );
+                    content.append(select);
 
-                const tier = await foundry.applications.api.Dialog.input({
-                    classes: ['dh-style', 'dialog'],
-                    window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
-                    content,
-                    ok: {
-                        label: 'DAGGERHEART.UI.Sidebar.actorDirectory.createAdversary',
-                        callback: (event, button, dialog) => Number(button.form.elements.tier.value)
+                    const tier = await foundry.applications.api.Dialog.input({
+                        classes: ['dh-style', 'dialog'],
+                        window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
+                        content,
+                        ok: {
+                            label: 'DAGGERHEART.UI.Sidebar.actorDirectory.createAdversary',
+                            callback: (event, button, dialog) => Number(button.form.elements.tier.value)
+                        }
+                    });
+
+                    if (tier === actor.system.tier) {
+                        ui.notifications.warn('This actor is already at this tier');
+                    } else if (tier) {
+                        const source = actor.system.adjustForTier(tier);
+                        await Actor.create(source);
+                        ui.notifications.info(`Tier ${tier} ${actor.name} created`);
                     }
-                });
+                }
+            },
+            {
+                name: 'DAGGERHEART.UI.Sidebar.actorDirectory.activateParty',
+                icon: `<i class="fa-regular fa-square"></i>`,
+                condition: li => {
+                    const actor = game.actors.get(li.dataset.entryId);
+                    return actor && actor.type === 'party' && !actor.system.active;
+                },
+                callback: async li => {
+                    const actor = game.actors.get(li.dataset.entryId);
+                    if (!actor) throw new Error('Unexpected missing actor');
 
-                if (tier === actor.system.tier) {
-                    ui.notifications.warn('This actor is already at this tier');
-                } else if (tier) {
-                    const source = actor.system.adjustForTier(tier);
-                    await Actor.create(source);
-                    ui.notifications.info(`Tier ${tier} ${actor.name} created`);
+                    const currentActiveParty = game.actors.find(x => x.type === 'party' && x.system.active);
+                    if (currentActiveParty)
+                        await currentActiveParty.update({ 'system.active': false });
+
+                    await actor.update({ 'system.active': true });
+                    ui.actors.render();
                 }
             }
-        });
+        );
 
         return options;
     }

module/data/actor/party.mjs

@@ -9,6 +9,7 @@ export default class DhParty extends BaseDataActor {
         const fields = foundry.data.fields;
         return {
             ...super.defineSchema(),
+            active: new fields.BooleanField(),
             partyMembers: new ForeignDocumentUUIDArrayField({ type: 'Actor' }, { prune: true }),
             notes: new fields.HTMLField(),
             gold: new fields.SchemaField({
@@ -44,6 +45,15 @@ export default class DhParty extends BaseDataActor {
         }
     }
 
+    /**@inheritdoc */
+    async _preCreate(data, options, user) {
+        const allowed = await super._preCreate(data, options, user);
+        if (allowed === false) return;
+
+        if (!game.actors.some(x => x.type === 'party' && x.active)) 
+            await this.updateSource({ active: true });
+    }
+
     _onDelete(options, userId) {
         super._onDelete(options, userId);
 

module/data/fields/action/summonField.mjs

@@ -1,3 +1,4 @@
+import { itemAbleRollParse } from '../../../helpers/utils.mjs';
 import FormulaField from '../formulaField.mjs';
 
 const fields = foundry.data.fields;
@@ -36,13 +37,12 @@ export default class DHSummonField extends fields.ArrayField {
         const rolls = [];
         const summonData = [];
         for (const summon of this.summon) {
-            let count = summon.count;
-            const roll = new Roll(summon.count);
-            if (!roll.isDeterministic) {
-                await roll.evaluate();
-                if (game.modules.get('dice-so-nice')?.active) rolls.push(roll);
-                count = roll.total;
-            }
+            const roll = new Roll(itemAbleRollParse(summon.count, this.actor, this.item));
+            await roll.evaluate();
+            const count = roll.total;
+            if (!roll.isDeterministic && game.modules.get('dice-so-nice')?.active) 
+                rolls.push(roll);
+            
 
             const actor = await DHSummonField.getWorldActor(await foundry.utils.fromUuid(summon.actorUUID));
             /* Extending summon data in memory so it's available in actionField.toChat. Think it's harmless, but ugly. Could maybe find a better way. */

module/documents/actor.mjs

@@ -600,6 +600,7 @@ export default class DhpActor extends Actor {
         rollData.system = this.system.getRollData();
         rollData.prof = this.system.proficiency ?? 1;
         rollData.cast = this.system.spellcastModifier ?? 1;
+    
         return rollData;
     }
 

module/helpers/utils.mjs

@@ -189,7 +189,15 @@ export const getDeleteKeys = (property, innerProperty, innerPropertyDefaultValue
 
 // Fix on Foundry native formula replacement for DH
 const nativeReplaceFormulaData = Roll.replaceFormulaData;
-Roll.replaceFormulaData = function (formula, data = {}, { missing, warn = false } = {}) {
+Roll.replaceFormulaData = function (formula, baseData = {}, { missing, warn = false } = {}) {
+    /* Inserting global data */
+    const data = { 
+        ...baseData, 
+        partySize: 
+            !game.actors ? 0 : 
+            game.actors.find(x => x.type === 'party' && x.system.active)?.system.partyMembers.length ?? 0,
+    };
+    
     const terms = Object.keys(CONFIG.DH.GENERAL.multiplierTypes).map(type => {
         return { term: type, default: 1 };
     });