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

Multiclass levelup fixes

Browse source
This commit is contained in:
WBHarry 2025-07-24 04:45:49 +02:00
parent 569e567dfd
commit 4551a2bcfe
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
module/applications/levelup/characterLevelup.mjs
View file

@ -166,6 +166,7 @@ export default class DhCharacterLevelUp extends LevelUpBase {
context.multiclass = { context.multiclass = {
...data, ...data,
...(multiclass.toObject?.() ?? multiclass), ...(multiclass.toObject?.() ?? multiclass),
type: 'multiclass',
uuid: multiclass.uuid, uuid: multiclass.uuid,
domains: domains:
multiclass?.system?.domains.map(key => { multiclass?.system?.domains.map(key => {

24
module/applications/levelup/levelup.mjs
View file

@ -452,6 +452,12 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
return; return;
} }
const secondaryData = Object.keys(
foundry.utils.getProperty(this.levelup, `${target.dataset.path}.secondaryData`)
).reduce((acc, key) => {
acc[`-=${key}`] = null;
return acc;
}, {});
await this.levelup.updateSource({ await this.levelup.updateSource({
multiclass: { multiclass: {
class: item.uuid, class: item.uuid,
@ -464,7 +470,8 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
amount: target.dataset.amount ? Number(target.dataset.amount) : null, amount: target.dataset.amount ? Number(target.dataset.amount) : null,
value: target.dataset.value, value: target.dataset.value,
type: target.dataset.type, type: target.dataset.type,
data: item.uuid data: item.uuid,
secondaryData: secondaryData
} }
}); });
this.render(); this.render();
@ -538,10 +545,21 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
static async selectDomain(_, button) { static async selectDomain(_, button) {
const option = foundry.utils.getProperty(this.levelup, button.dataset.path); const option = foundry.utils.getProperty(this.levelup, button.dataset.path);
const domain = option.secondaryData.domain ? null : button.dataset.domain; const domain = option.secondaryData.domain ? null : button.dataset.domain;
const update = { [`${button.dataset.path}.secondaryData.domain`]: domain };
await this.levelup.updateSource({ const domainCards = this.levelup.levels[this.levelup.currentLevel].achievements.domainCards;
[`${button.dataset.path}.secondaryData.domain`]: domain const illegalDomainCards = option.secondaryData.domain
? Object.keys(domainCards)
.map(key => ({ ...domainCards[key], key }))
.filter(
x => x.uuid && foundry.utils.fromUuidSync(x.uuid).system.domain === option.secondaryData.domain
)
: [];
illegalDomainCards.forEach(card => {
update[`levels.${this.levelup.currentLevel}.achievements.domainCards.${card.key}.uuid`] = null;
}); });
await this.levelup.updateSource(update);
this.render(); this.render();
} }

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

@ -263,7 +263,8 @@ export default class DhCharacter extends BaseDataActor {
} }
get tier() { get tier() {
return this.levelData.level.current === 1 const currentLevel = this.levelData.level.current;
return currentLevel === 1
? 1 ? 1
: Object.values(game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers).find( : Object.values(game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers).find(
tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end