cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-05 20:34:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed d20 modifiers

Browse source
This commit is contained in:
WBHarry 2026-05-27 20:56:07 +02:00
parent 126a8e4660
commit 505cc634d3
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
module/data/fields/action/rollField.mjs
View file

@ -78,24 +78,6 @@ export class DHActionRollData extends foundry.abstract.DataModel {
return formula;
}
getModifier() {
const modifiers = [];
if (!this.parent?.actor) return modifiers;
switch (this.parent.actor.type) {
case 'companion':
case 'adversary':
if (this.type === CONFIG.DH.GENERAL.rollTypes.attack.id)
modifiers.push({
label: 'Bonus to Hit',
value: this.bonus ?? this.parent.actor.system.attack.roll.bonus ?? 0
});
break;
default:
break;
}
return modifiers;
}
get rollTrait() {
if (this.parent?.actor?.type !== 'character') return null;
switch (this.type) {
@ -145,7 +127,6 @@ export default class RollField extends fields.EmbeddedDataField {
config.dialog.configure = RollField.getAutomation() ? !config.dialog.configure : config.dialog.configure;
const roll = {
baseModifiers: this.roll.getModifier(),
label: 'Attack',
type: this.roll?.type,
trait: this.roll?.rollTrait,

24
module/dice/d20Roll.mjs
View file

@ -128,8 +128,30 @@ export default class D20Roll extends DHRoll {
}
}
getBaseModifiers() {
const modifiers = [];
const actor = foundry.utils.fromUuidSync(this.options.source.actor);
if (!actor) return modifiers;
switch (actor.type) {
case 'companion':
case 'adversary':
if (
this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||
this.options.source.action === actor.system.attack.id
)
modifiers.push({
label: 'Bonus to Hit',
value: this.data.attack.roll.bonus ?? 0
});
break;
default:
break;
}
return modifiers;
}
applyBaseBonus() {
const modifiers = foundry.utils.deepClone(this.options.roll.baseModifiers) ?? [];
const modifiers = this.getBaseModifiers();
modifiers.push(
...this.getBonus(