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

Merged with main

Browse source
This commit is contained in:
WBHarry 2026-06-21 00:17:50 +02:00
commit 25a64b1332
17 changed files with 104 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -767,7 +767,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
/* Handle resource updates from the finished TagTeamRoll */
const tagTeamData = this.party.system.tagTeam;
const fearUpdate = { key: 'fear', value: null, total: null, enabled: true };
const fearUpdate = { key: 'fear', value: null, enabled: true };
if (shouldUseHopeFearAutomation({ gmAsPlayer: true })) {
for (let memberId in tagTeamData.members) {
@ -779,14 +779,13 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
? 1 - tagTeamData.initiator.cost
: -tagTeamData.initiator.cost
: 1;
resourceUpdates.push({ key: 'hope', value: value, total: -value, enabled: true });
resourceUpdates.push({ key: 'hope', value: value, enabled: true });
} 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) {
fearUpdate.value = fearUpdate.value === null ? 1 : fearUpdate.value + 1;
fearUpdate.total = fearUpdate.total === null ? -1 : fearUpdate.total - 1;
}
game.actors.get(memberId).modifyResource(resourceUpdates);
@ -795,7 +794,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
/* Even with Hope/Fear automation off, the hope cost of performing the TagTeamRoll can still optionally be subtracted */
else if (tagTeamData.initiator.cost) {
const initiatingActor = game.actors.get(tagTeamData.initiator.memberId);
initiatingActor.modifyResource([{ key: 'hope', value: -tagTeamData.initiator.cost, total: tagTeamData.initiator.cost, enabled: true }]);
initiatingActor.modifyResource([{ key: 'hope', value: -tagTeamData.initiator.cost, enabled: true }]);
}
if (fearUpdate.value) {