cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-21 18:09:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed the unused ResourceMap total property (#2024)
Some checks are pending
Project CI / build (24.x) (push) Waiting to run
Details

Browse source
This commit is contained in:
WBHarry 2026-06-21 00:13:45 +02:00 • committed by GitHub
parent 6b80a6243c
commit 29be8c1395
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
module/applications/dialogs/groupRollDialog.mjs
View file

@ -483,13 +483,13 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
const resourceMap = new ResourceUpdateMap(actor); const resourceMap = new ResourceUpdateMap(actor);
if (totalRoll.isCritical) { if (totalRoll.isCritical) {
resourceMap.addResources([ resourceMap.addResources([
{ key: 'stress', value: -1, total: 1 }, { key: 'stress', value: -1 },
{ key: 'hope', value: 1, total: 1 } { key: 'hope', value: 1 }
]); ]);
} else if (totalRoll.withHope) { } else if (totalRoll.withHope) {
resourceMap.addResources([{ key: 'hope', value: 1, total: 1 }]); resourceMap.addResources([{ key: 'hope', value: 1 }]);
} else { } else {
resourceMap.addResources([{ key: 'fear', value: 1, total: 1 }]); resourceMap.addResources([{ key: 'fear', value: 1 }]);
} }
resourceMap.updateResources(); resourceMap.updateResources();

8
module/applications/dialogs/tagTeamDialog.mjs
View file

@ -752,7 +752,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
/* Handle resource updates from the finished TagTeamRoll */ /* Handle resource updates from the finished TagTeamRoll */
const tagTeamData = this.party.system.tagTeam; const tagTeamData = this.party.system.tagTeam;
const fearUpdate = { key: 'fear', value: null, total: null, enabled: true }; const fearUpdate = { key: 'fear', value: null, enabled: true };
for (let memberId in tagTeamData.members) { for (let memberId in tagTeamData.members) {
const resourceUpdates = []; const resourceUpdates = [];
const rollGivesHope = finalRoll.isCritical || finalRoll.withHope; const rollGivesHope = finalRoll.isCritical || finalRoll.withHope;
@ -762,11 +762,11 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
? 1 - tagTeamData.initiator.cost ? 1 - tagTeamData.initiator.cost
: -tagTeamData.initiator.cost : -tagTeamData.initiator.cost
: 1; : 1;
resourceUpdates.push({ key: 'hope', value: value, total: -value, enabled: true }); resourceUpdates.push({ key: 'hope', value: value, enabled: true });
} else if (rollGivesHope) { } else if (rollGivesHope) {
resourceUpdates.push({ key: 'hope', value: 1, total: -1, enabled: true }); resourceUpdates.push({ key: 'hope', value: 1, enabled: true });
} }
if (finalRoll.isCritical) resourceUpdates.push({ key: 'stress', value: -1, total: 1, enabled: true }); if (finalRoll.isCritical) resourceUpdates.push({ key: 'stress', value: -1, enabled: true });
if (finalRoll.withFear) { if (finalRoll.withFear) {
fearUpdate.value = fearUpdate.value === null ? 1 : fearUpdate.value + 1; fearUpdate.value = fearUpdate.value === null ? 1 : fearUpdate.value + 1;
fearUpdate.total = fearUpdate.total === null ? -1 : fearUpdate.total - 1; fearUpdate.total = fearUpdate.total === null ? -1 : fearUpdate.total - 1;

2
module/applications/sheets/actors/character.mjs
View file

@ -809,7 +809,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
/* This could be avoided by baking config.costs into config.resourceUpdates. Didn't feel like messing with it at the time */ /* This could be avoided by baking config.costs into config.resourceUpdates. Didn't feel like messing with it at the time */
const costResources = const costResources =
result.costs?.filter(x => x.enabled).map(cost => ({ ...cost, value: -cost.value, total: -cost.total })) || result.costs?.filter(x => x.enabled).map(cost => ({ ...cost, value: -cost.value })) ||
{}; {};
result.resourceUpdates.addResources(costResources); result.resourceUpdates.addResources(costResources);
await result.resourceUpdates.updateResources(); await result.resourceUpdates.updateResources();

3
module/data/action/baseAction.mjs
View file

@ -459,8 +459,7 @@ export class ResourceUpdateMap extends Map {
} else if (!existing?.clear) { } else if (!existing?.clear) {
this.set(resource.key, { this.set(resource.key, {
...existing, ...existing,
value: existing.value + (resource.value ?? 0), value: existing.value + (resource.value ?? 0)
total: existing.total + (resource.total ?? 0)
}); });
} }
} }

12
module/dice/dualityRoll.mjs
View file

@ -334,15 +334,15 @@ export default class DualityRoll extends D20Roll {
const fear = const fear =
(config.roll.result.duality === -1 ? 1 : 0) - (config.rerolledRoll.result.duality === -1 ? 1 : 0); (config.roll.result.duality === -1 ? 1 : 0) - (config.rerolledRoll.result.duality === -1 ? 1 : 0);
if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true }); if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true }); if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true }); if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
} }
} else { } else {
if (config.roll.isCritical || config.roll.result.duality === 1) if (config.roll.isCritical || config.roll.result.duality === 1)
updates.push({ key: 'hope', value: 1, total: -1, enabled: true }); updates.push({ key: 'hope', value: 1, enabled: true });
if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true }); if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, enabled: true });
if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true }); if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, enabled: true });
} }
if (updates.length) { if (updates.length) {

6
module/dice/helpers.mjs
View file

@ -9,9 +9,9 @@ export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) {
const stress = (newDuality === 0 ? 1 : 0) - (oldDuality === 0 ? 1 : 0); const stress = (newDuality === 0 ? 1 : 0) - (oldDuality === 0 ? 1 : 0);
const fear = (newDuality === -1 ? 1 : 0) - (oldDuality === -1 ? 1 : 0); const fear = (newDuality === -1 ? 1 : 0) - (oldDuality === -1 ? 1 : 0);
if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true }); if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true }); if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true }); if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
const resourceUpdates = new ResourceUpdateMap(actor); const resourceUpdates = new ResourceUpdateMap(actor);
resourceUpdates.addResources(updates); resourceUpdates.addResources(updates);