mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-03-10 19:17:09 +01:00
Compare commits
No commits in common. "267de9a8cfce8eac6471cf8ece858d2b760cb874" and "ca434d33f1a8c67a7bf47988b0d20186b4490c8d" have entirely different histories.
267de9a8cf
...
ca434d33f1
2 changed files with 2 additions and 6 deletions
|
|
@ -104,10 +104,7 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
|
||||||
/** @override */
|
/** @override */
|
||||||
async _processSubmitData(event, form, submitData, options) {
|
async _processSubmitData(event, form, submitData, options) {
|
||||||
if (!submitData.flags) submitData.flags = {};
|
if (!submitData.flags) submitData.flags = {};
|
||||||
submitData.flags.daggerheart = foundry.utils.mergeObject(
|
submitData.flags.daggerheart = this.daggerheartFlag.toObject();
|
||||||
this.daggerheartFlag.toObject(),
|
|
||||||
submitData.flags.daggerheart
|
|
||||||
);
|
|
||||||
submitData.flags.daggerheart.sceneEnvironments = submitData.flags.daggerheart.sceneEnvironments.filter(x =>
|
submitData.flags.daggerheart.sceneEnvironments = submitData.flags.daggerheart.sceneEnvironments.filter(x =>
|
||||||
foundry.utils.fromUuidSync(x)
|
foundry.utils.fromUuidSync(x)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -670,7 +670,7 @@ export default class DhCharacter extends DhCreature {
|
||||||
};
|
};
|
||||||
|
|
||||||
const globalHopeMax = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxHope;
|
const globalHopeMax = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxHope;
|
||||||
this.resources.hope.max = globalHopeMax;
|
this.resources.hope.max = globalHopeMax - this.scars;
|
||||||
this.resources.hitPoints.max += this.class.value?.system?.hitPoints ?? 0;
|
this.resources.hitPoints.max += this.class.value?.system?.hitPoints ?? 0;
|
||||||
|
|
||||||
/* Companion Related Data */
|
/* Companion Related Data */
|
||||||
|
|
@ -694,7 +694,6 @@ export default class DhCharacter extends DhCreature {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.resources.hope.max -= this.scars;
|
|
||||||
this.resources.hope.value = Math.min(baseHope, this.resources.hope.max);
|
this.resources.hope.value = Math.min(baseHope, this.resources.hope.max);
|
||||||
this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
|
this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue