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

Add Attack to Weapon & Override settings to Roll

Browse source
This commit is contained in:
Dapoolp 2025-07-07 19:58:54 +02:00
parent 21f7d785f7
commit 357679a0a8
20 changed files with 140 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

18
module/data/action/attackAction.mjs
View file

@ -14,9 +14,15 @@ export default class DHAttackAction extends DHDamageAction {
prepareData() {
super.prepareData();
if (this.damage.includeBase && !!this.item?.system?.damage) {
const baseDamage = this.getParentDamage();
this.damage.parts.unshift(new DHDamageData(baseDamage));
if(!!this.item?.system?.attack) {
if (this.damage.includeBase) {
const baseDamage = this.getParentDamage();
this.damage.parts.unshift(new DHDamageData(baseDamage));
}
if(this.roll.useDefault) {
this.roll.trait = this.item.system.attack.roll.trait;
this.roll.type = 'weapon';
}
}
}
@ -24,10 +30,10 @@ export default class DHAttackAction extends DHDamageAction {
return {
value: {
multiplier: 'prof',
dice: this.item?.system?.damage.dice,
bonus: this.item?.system?.damage.bonus ?? 0
dice: this.item?.system?.attack.damage.parts[0].value.dice,
bonus: this.item?.system?.attack.damage.parts[0].value.bonus ?? 0
},
type: this.item?.system?.damage.type,
type: this.item?.system?.attack.damage.parts[0].type,
base: true
};
}