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

Added reroll handling for compound size changes

Browse source
This commit is contained in:
WBHarry 2026-07-20 12:26:13 +02:00
parent 4a25ffb456
commit a5c8e79d72
1 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
module/dice/die/baseDie.mjs
View file

@ -19,7 +19,7 @@ export default class BaseDie extends foundry.dice.terms.Die {
this.results.splice(resultIndex, 0, rerolledResult); this.results.splice(resultIndex, 0, rerolledResult);
if (['c', 'cc'].some(x => this.modifiers.includes(x))) { if (['c', 'cc'].some(x => this.modifiers.includes(x))) {
await this.handleComboDiceReroll(resultIndex); await this.handleComboDiceReroll(resultIndex, result);
} }
} }
@ -66,7 +66,7 @@ export default class BaseDie extends foundry.dice.terms.Die {
async rollComboDice(options) { async rollComboDice(options) {
const { maxIncreasesDiceSize, rerollStartIndex } = options; const { maxIncreasesDiceSize, rerollStartIndex } = options;
const initialResultsLength = this.results.length; const initialResultsLength = this.results.filter(x => x.active).length;
const result = await this.continueCombo(maxIncreasesDiceSize); const result = await this.continueCombo(maxIncreasesDiceSize);
/* The flow of DiceSoNice has no way of knowing that some of the results of a Die should be a different denomination /* The flow of DiceSoNice has no way of knowing that some of the results of a Die should be a different denomination
@ -133,8 +133,9 @@ export default class BaseDie extends foundry.dice.terms.Die {
return this.continueCombo(maxIncreasesDiceSize); return this.continueCombo(maxIncreasesDiceSize);
} }
async handleComboDiceReroll(rerolledIndex) { async handleComboDiceReroll(rerolledIndex, originalResult) {
const resultGroupingIndexes = this.results.map((x, index) => ({ index, active: x.active })) /* Potentially sliced when correcting compound dice at (1) */
let resultGroupingIndexes = this.results.map((x, index) => ({ index, active: x.active }))
.filter(x => x.active).map(x => x.index); .filter(x => x.active).map(x => x.index);
if (resultGroupingIndexes.length <= 1) return; if (resultGroupingIndexes.length <= 1) return;
@ -147,7 +148,29 @@ export default class BaseDie extends foundry.dice.terms.Die {
const nextIndex = resultGroupingIndexes[rerollGroupingIndex + 1]; const nextIndex = resultGroupingIndexes[rerollGroupingIndex + 1];
const nextResult = this.results[nextIndex]; const nextResult = this.results[nextIndex];
/* Rerolling any of the last two dice might introduce new results */ const dropDice = preceeding => {
const cutoffIndex = preceeding ? resultGroupingIndexes[rerollGroupingIndex + 1] + 1 : rerolledIndex + 1;
this.results = this.results.slice(0, cutoffIndex);
this.number = this.results.filter(x => x.active).length;
};
/* (1) If subsequent size increases from the compound effect are now incorrect, drop subsequent dice */
const lastFaces = Number((originalResult.denomination ?? this.denomination).slice(1));
if (
compoundCombo &&
(
(originalResult.result === lastFaces &&
rerolledResult.result !== lastFaces)
||
(originalResult.result !== lastFaces &&
rerolledResult.result === lastFaces)
)
) {
dropDice(false);
resultGroupingIndexes = resultGroupingIndexes.slice(0, this.number);
}
/* (2) Rerolling any of the last two dice might introduce new results */
if ( if (
rerollGroupingIndex === resultGroupingIndexes.length - 1 && rerollGroupingIndex === resultGroupingIndexes.length - 1 &&
rerolledResult.result >= previousResult?.result rerolledResult.result >= previousResult?.result
@ -165,11 +188,13 @@ export default class BaseDie extends foundry.dice.terms.Die {
rerollStartIndex: rerollGroupingIndex rerollStartIndex: rerollGroupingIndex
}); });
} }
/* Rerolling a preceeding dice might invalidate later dice which should then be dropped */ /* (3) Rerolling a subsequent dice might invalidate later dice which should then be dropped */
else if (rerolledResult.result < previousResult?.result){ else if (rerolledResult.result < previousResult?.result){
const cutoffIndex = rerollGroupingIndex === 0 ? resultGroupingIndexes[1] + 1 : rerolledIndex + 1; dropDice(false);
this.results = this.results.slice(0, cutoffIndex); }
this.number = this.results.filter(x => x.active).length; /* (4) Rerolling a preceeding dice might invalidate later dice which should then be dropped */
else if (rerolledResult.result >= nextResult?.result) {
dropDice(true);
} }
const fakeRollFaces = const fakeRollFaces =