cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-23 16:03:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed so that scrolltexts for armor changes work again

Browse source
This commit is contained in:
WBHarry 2026-03-21 10:40:19 +01:00
parent e83d3f7d44
commit 9635387779
4 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
module/data/activeEffect/baseEffect.mjs
View file

@ -12,6 +12,7 @@
* "Anything that uses another data model value as its value": +1 - Effects that increase traits have to be calculated first at Base priority. (EX: Raise evasion by half your agility) * "Anything that uses another data model value as its value": +1 - Effects that increase traits have to be calculated first at Base priority. (EX: Raise evasion by half your agility)
*/ */
import { getScrollTextData } from '../../helpers/utils.mjs';
import { changeTypes } from './_module.mjs'; import { changeTypes } from './_module.mjs';
export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel { export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
@ -130,4 +131,27 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
} }
}; };
} }
async _preUpdate(changed, options, userId) {
const allowed = await super._preUpdate(changed, options, userId);
if (allowed === false) return false;
const autoSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
if (autoSettings.resourceScrollTexts && this.parent.actor?.type === 'character') {
const newArmorTotal = (changed.system?.changes ?? []).reduce((acc, change) => {
if (change.type === 'armor') acc += change.value.current;
return acc;
}, 0);
const armorData = getScrollTextData(this.parent.actor, { value: newArmorTotal }, 'armor');
options.scrollingTextData = [armorData];
}
}
_onUpdate(changed, options, userId) {
super._onUpdate(changed, options, userId);
if (this.parent.actor && options.scrollingTextData)
this.parent.actor.queueScrollText(options.scrollingTextData);
}
} }

8
module/data/activeEffect/changeTypes/armor.mjs
View file

@ -68,14 +68,12 @@ export default class ArmorChange extends foundry.abstract.DataModel {
} }
} }
static getInitialValue(locked) { static getInitialValue() {
return { return {
key: 'Armor',
type: CONFIG.DH.GENERAL.activeEffectModes.armor.id, type: CONFIG.DH.GENERAL.activeEffectModes.armor.id,
value: { value: {
current: 0, current: 0,
max: 0, max: 0
locked
}, },
phase: 'initial', phase: 'initial',
priority: 20 priority: 20
@ -87,7 +85,7 @@ export default class ArmorChange extends foundry.abstract.DataModel {
name: game.i18n.localize('DAGGERHEART.EFFECTS.ChangeTypes.armor.newArmorEffect'), name: game.i18n.localize('DAGGERHEART.EFFECTS.ChangeTypes.armor.newArmorEffect'),
img: 'icons/equipment/chest/breastplate-helmet-metal.webp', img: 'icons/equipment/chest/breastplate-helmet-metal.webp',
system: { system: {
changes: [ArmorChange.getInitialValue(true)] changes: [ArmorChange.getInitialValue()]
} }
}; };
} }

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

@ -220,14 +220,6 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
addLinkedItemsDiff(changed.system?.features, this.features, options); addLinkedItemsDiff(changed.system?.features, this.features, options);
const autoSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
const armorChanged =
changed.system?.marks?.value !== undefined && changed.system.marks.value !== this.marks.value;
if (armorChanged && autoSettings.resourceScrollTexts && this.parent.parent?.type === 'character') {
const armorData = getScrollTextData(this.parent.parent, changed.system.marks, 'armor');
options.scrollingTextData = [armorData];
}
if (changed.system?.actions) { if (changed.system?.actions) {
const triggersToRemove = Object.keys(changed.system.actions).reduce((acc, key) => { const triggersToRemove = Object.keys(changed.system.actions).reduce((acc, key) => {
const action = changed.system.actions[key]; const action = changed.system.actions[key];

2
templates/sheets/items/armor/header.hbs
View file

@ -9,7 +9,7 @@
</h3> </h3>
<h3> <h3>
{{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}: {{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}:
{{source.system.baseScore}} {{source.system.armorData.max}}
<span>-</span> <span>-</span>
{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}: {{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}:
{{source.system.baseThresholds.major}} {{source.system.baseThresholds.major}}