diff --git a/src/module/combat/combat-tracker.js b/src/module/combat/combat-tracker.js index eba7ac12..d679f29f 100644 --- a/src/module/combat/combat-tracker.js +++ b/src/module/combat/combat-tracker.js @@ -108,8 +108,10 @@ calculateEncounterDifficulty(combatants) { let difficultyTotal = 0 let partyLevel = 0 let encounterDifficulty + // Combatants which have both fast and slow turns, we take into account only once. + const uniqueCombatants = [...new Map(combatants.map((combatant) => [combatant["tokenId"], combatant])).values()] - for (let combatant of combatants) { + for (let combatant of uniqueCombatants) { if (combatant.token.actor.effects.find(e => e.statuses?.has('dead')) || combatant.actor.type === 'vehicle') continue if (combatant.actor.type === 'character' && combatant.actor?.system.isPC) { diff --git a/src/module/data/item/RelicDataModel.js b/src/module/data/item/RelicDataModel.js index 57f7fd3b..cd5fa29a 100644 --- a/src/module/data/item/RelicDataModel.js +++ b/src/module/data/item/RelicDataModel.js @@ -9,6 +9,7 @@ export default class RelicDataModel extends foundry.abstract.TypeDataModel { description: makeHtmlField(), enrichedDescription: makeHtmlField(), contents: contents(), + quantity: makeIntField(1), requirement: new foundry.data.fields.SchemaField({ attribute: makeStringField(), minvalue: makeIntField()