cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-14 12:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some localization, style and smaller changes

Browse source
This commit is contained in:
WBHarry 2026-01-13 15:37:05 +01:00
parent a554ec0e4d
commit 048510074c
9 changed files with 137 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

20
module/dice/dualityRoll.mjs
View file

@ -85,9 +85,7 @@ export default class DualityRoll extends D20Roll {
}
get isCritical() {
if (this.guaranteedCritical) {
return true;
}
if (this.guaranteedCritical) return true;
if (!this.dHope._evaluated || !this.dFear._evaluated) return;
return this.dHope.total === this.dFear.total;
}
@ -103,9 +101,13 @@ export default class DualityRoll extends D20Roll {
}
get totalLabel() {
const label = this.guaranteedCritical ? 'DAGGERHEART.GENERAL.guaranteedCriticalSuccess' :
this.isCritical ? 'DAGGERHEART.GENERAL.criticalSuccess' :
this.withHope ? 'DAGGERHEART.GENERAL.hope' : 'DAGGERHEART.GENERAL.fear';
const label = this.guaranteedCritical
? 'DAGGERHEART.GENERAL.guaranteedCriticalSuccess'
: this.isCritical
? 'DAGGERHEART.GENERAL.criticalSuccess'
: this.withHope
? 'DAGGERHEART.GENERAL.hope'
: 'DAGGERHEART.GENERAL.fear';
return game.i18n.localize(label);
}
@ -117,8 +119,9 @@ export default class DualityRoll extends D20Roll {
/** @inheritDoc */
static fromData(data) {
if (data.options.guaranteedCritical) {
console.log("TODO: set the max values for Hope and Fear here?");
console.log('TODO: set the max values for Hope and Fear here?');
}
data.terms[0].class = foundry.dice.terms.Die.name;
data.terms[2].class = foundry.dice.terms.Die.name;
return super.fromData(data);
@ -176,7 +179,7 @@ export default class DualityRoll extends D20Roll {
config.dialog ??= {};
config.guaranteedCritical = config.data?.parent?.appliedEffects.reduce((a, c) => {
const change = c.changes.find(ch => ch.key === 'system.rules.roll.guaranteedCritical');
if (change) a = true;
if (change) a = true;
return a;
}, false);
@ -187,7 +190,6 @@ export default class DualityRoll extends D20Roll {
return super.buildConfigure(config, message);
}
static async buildEvaluate(roll, config = {}, message = {}) {
await super.buildEvaluate(roll, config, message);

30
module/dice/fateRoll.mjs
View file

@ -3,7 +3,7 @@ import D20Roll from './d20Roll.mjs';
import { setDiceSoNiceForHopeFateRoll, setDiceSoNiceForFearFateRoll } from '../helpers/utils.mjs';
export default class FateRoll extends D20Roll {
constructor(formula, data = {}, options = {}) {
constructor(formula, data = {}, options = {}) {
super(formula, data, options);
}
@ -12,42 +12,33 @@ export default class FateRoll extends D20Roll {
static DefaultDialog = D20RollDialog;
get title() {
return game.i18n.localize(
`DAGGERHEART.GENERAL.fateRoll`
);
return game.i18n.localize(`DAGGERHEART.GENERAL.fateRoll`);
}
get dHope() {
// if ( !(this.terms[0] instanceof foundry.dice.terms.Die) ) return;
if (!(this.dice[0] instanceof foundry.dice.terms.Die)) this.createBaseDice();
return this.dice[0];
// return this.#hopeDice;
}
set dHope(faces) {
if (!(this.dice[0] instanceof foundry.dice.terms.Die)) this.createBaseDice();
this.dice[0].faces = this.getFaces(faces);
// this.#hopeDice = `d${face}`;
}
get dFear() {
// if ( !(this.terms[1] instanceof foundry.dice.terms.Die) ) return;
if (!(this.dice[0] instanceof foundry.dice.terms.Die)) this.createBaseDice();
return this.dice[0];
// return this.#fearDice;
}
set dFear(faces) {
if (!(this.dice[0] instanceof foundry.dice.terms.Die)) this.createBaseDice();
this.dice[0].faces = this.getFaces(faces);
// this.#fearDice = `d${face}`;
}
get isCritical() {
return false;
}
get fateDie() {
return this.data.fateType;
}
@ -73,16 +64,10 @@ export default class FateRoll extends D20Roll {
static async buildEvaluate(roll, config = {}, message = {}) {
await super.buildEvaluate(roll, config, message);
if (roll.fateDie === "Hope") {
await setDiceSoNiceForHopeFateRoll(
roll,
config.roll.fate.dice
);
if (roll.fateDie === 'Hope') {
await setDiceSoNiceForHopeFateRoll(roll, config.roll.fate.dice);
} else {
await setDiceSoNiceForFearFateRoll(
roll,
config.roll.fate.dice
);
await setDiceSoNiceForFearFateRoll(roll, config.roll.fate.dice);
}
}
@ -90,12 +75,11 @@ export default class FateRoll extends D20Roll {
const data = super.postEvaluate(roll, config);
data.fate = {
dice: roll.fateDie === "Hope" ? roll.dHope.denomination : roll.dFear.denomination,
value: roll.fateDie === "Hope" ? roll.dHope.total : roll.dFear.total,
dice: roll.fateDie === 'Hope' ? roll.dHope.denomination : roll.dFear.denomination,
value: roll.fateDie === 'Hope' ? roll.dHope.total : roll.dFear.total,
fateDie: roll.fateDie
};
return data;
}
}