cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-08 21:58:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix conflicts

Browse source
This commit is contained in:
Dapoolp 2025-07-06 22:57:37 +02:00
commit f038b7ccfd
152 changed files with 2150 additions and 2520 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/dice/d20Roll.mjs
View file

@ -118,7 +118,7 @@ export default class D20Roll extends DHRoll {
applyAdvantage() {
this.d20.modifiers.findSplice(m => ['kh', 'kl'].includes(m));
if (!this.hasAdvantage && !this.hasDisadvantage) this.number = 1;
if (!this.hasAdvantage && !this.hasDisadvantage) this.d20.number = 1;
else {
this.d20.number = 2;
this.d20.modifiers.push(this.hasAdvantage ? 'kh' : 'kl');

8
module/dice/dualityRoll.mjs
View file

@ -71,10 +71,10 @@ export default class DualityRoll extends D20Roll {
get totalLabel() {
const label = this.withHope
? 'DAGGERHEART.General.Hope'
? 'DAGGERHEART.GENERAL.hope'
: this.withFear
? 'DAGGERHEART.General.Fear'
: 'DAGGERHEART.General.CriticalSuccess';
? 'DAGGERHEART.GENERAL.fear'
: 'DAGGERHEART.GENERAL.criticalSuccess';
return game.i18n.localize(label);
}
@ -122,7 +122,7 @@ export default class DualityRoll extends D20Roll {
this.options.roll.modifiers = [];
if (!this.options.roll.trait) return;
this.options.roll.modifiers.push({
label: `DAGGERHEART.Abilities.${this.options.roll.trait}.name`,
label: `DAGGERHEART.CONFIG.Traits.${this.options.roll.trait}.name`,
value: Roll.replaceFormulaData(`@traits.${this.options.roll.trait}.total`, this.data)
});
}