cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-22 02:19:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sheet fixes

Browse source
This commit is contained in:
WBHarry 2026-07-18 00:49:56 +02:00
parent ce47c63ce6
commit 1f12a98c63
4 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ export default class DHAttackAction extends DHDamageAction {
if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`)); if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`));
const useAltDamage = this.actor?.effects?.find(x => x.type === 'horde')?.active; const useAltDamage = this.actor?.effects?.find(x => x.type === 'horde')?.active;
for (const { value, valueAlt, type } of damage.parts) { for (const { value, valueAlt, type } of [damage.main, ...damage.resources]) {
const usedValue = useAltDamage ? valueAlt : value; const usedValue = useAltDamage ? valueAlt : value;
const damageString = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {}); const damageString = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {});
const str = damageString const str = damageString

4
module/data/actor/adversary.mjs
View file

@ -84,8 +84,7 @@ export default class DhpAdversary extends DhCreature {
type: 'attack' type: 'attack'
}, },
damage: { damage: {
parts: { main: {
hitPoints: {
type: ['physical'], type: ['physical'],
applyTo: 'hitPoints', applyTo: 'hitPoints',
value: { value: {
@ -94,7 +93,6 @@ export default class DhpAdversary extends DhCreature {
} }
} }
} }
}
}), }),
experiences: new fields.TypedObjectField( experiences: new fields.TypedObjectField(
new fields.SchemaField({ new fields.SchemaField({

4
module/data/actor/character.mjs
View file

@ -104,8 +104,7 @@ export default class DhCharacter extends DhCreature {
trait: 'strength' trait: 'strength'
}, },
damage: { damage: {
parts: { main: {
hitPoints: {
type: ['physical'], type: ['physical'],
applyTo: 'hitPoints', applyTo: 'hitPoints',
value: { value: {
@ -117,7 +116,6 @@ export default class DhCharacter extends DhCreature {
} }
} }
} }
}
}), }),
levelData: new fields.EmbeddedDataField(DhLevelData), levelData: new fields.EmbeddedDataField(DhLevelData),
bonuses: new fields.SchemaField({ bonuses: new fields.SchemaField({

8
module/data/item/weapon.mjs
View file

@ -67,8 +67,7 @@ export default class DHWeapon extends AttachableItem {
type: 'attack' type: 'attack'
}, },
damage: { damage: {
parts: { main: {
hitPoints: {
type: ['physical'], type: ['physical'],
value: { value: {
multiplier: 'prof', multiplier: 'prof',
@ -77,7 +76,6 @@ export default class DHWeapon extends AttachableItem {
} }
} }
} }
}
}), }),
rules: new fields.SchemaField({ rules: new fields.SchemaField({
attack: new fields.SchemaField({ attack: new fields.SchemaField({
@ -230,7 +228,7 @@ export default class DHWeapon extends AttachableItem {
game.i18n.localize(`DAGGERHEART.CONFIG.Burden.${burden}`) game.i18n.localize(`DAGGERHEART.CONFIG.Burden.${burden}`)
]; ];
for (const { value, type } of attack.damage.parts) { for (const { value, type } of [attack.damage.main, ...attack.damage.resources]) {
const parts = value.custom.enabled ? [game.i18n.localize('DAGGERHEART.GENERAL.custom')] : [value.dice]; const parts = value.custom.enabled ? [game.i18n.localize('DAGGERHEART.GENERAL.custom')] : [value.dice];
if (!value.custom.enabled && value.bonus) parts.push(value.bonus.signedString()); if (!value.custom.enabled && value.bonus) parts.push(value.bonus.signedString());
@ -258,7 +256,7 @@ export default class DHWeapon extends AttachableItem {
if (roll.trait) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`)); if (roll.trait) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${roll.trait}.short`));
if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`)); if (range) labels.push(game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.short`));
for (const { value, type } of damage.parts) { for (const { value, type } of [damage.main, ...damage.resources]) {
const str = Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {}); const str = Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {});
const icons = Array.from(type) const icons = Array.from(type)