Finalised levelup selections and propagating to PC

This commit is contained in:
WBHarry 2025-05-29 16:25:08 +02:00
parent 7a12783a8c
commit d7ebeb3b2a
12 changed files with 282 additions and 234 deletions

View file

@ -49,7 +49,7 @@ class DhLevelOption extends foundry.abstract.DataModel {
return {
label: new fields.StringField({ required: true }),
checkboxQuantity: new fields.NumberField({ required: true, integer: true, initial: 1 }),
checkboxSelections: new fields.NumberField({ required: true, integer: true, initial: 1 }),
minCost: new fields.NumberField({ required: true, integer: true, initial: 1 }),
type: new fields.StringField({ required: true, choices: LevelOptionType }),
value: new fields.NumberField({ integer: true }),
@ -118,14 +118,14 @@ export const defaultLevelTiers = {
options: {
trait: {
label: 'DAGGERHEART.LevelUp.Options.trait',
checkboxQuantity: 3,
checkboxSelections: 3,
minCost: 1,
type: LevelOptionType.trait.id,
amount: 2
},
hitPoint: {
label: 'DAGGERHEART.LevelUp.Options.hitPoint',
checkboxQuantity: 2,
checkboxSelections: 2,
minCost: 1,
type: LevelOptionType.hitPoint.id,
value: 1,
@ -133,14 +133,14 @@ export const defaultLevelTiers = {
},
stress: {
label: 'DAGGERHEART.LevelUp.Options.stress',
checkboxQuantity: 2,
checkboxSelections: 2,
minCost: 1,
type: LevelOptionType.stress.id,
value: 1
},
experience: {
label: 'DAGGERHEART.LevelUp.Options.experience',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.experience.id,
value: 1,
@ -148,14 +148,14 @@ export const defaultLevelTiers = {
},
domainCard: {
label: 'DAGGERHEART.LevelUp.Options.domainCard',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.domainCard.id,
amount: 1
},
evasion: {
label: 'DAGGERHEART.LevelUp.Options.evasion',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.evasion.id,
value: 1
@ -181,28 +181,28 @@ export const defaultLevelTiers = {
options: {
trait: {
label: 'DAGGERHEART.LevelUp.Options.trait',
checkboxQuantity: 3,
checkboxSelections: 3,
minCost: 1,
type: LevelOptionType.trait.id,
amount: 2
},
hitPoint: {
label: 'DAGGERHEART.LevelUp.Options.hitPoint',
checkboxQuantity: 2,
checkboxSelections: 2,
minCost: 1,
type: LevelOptionType.hitPoint.id,
value: 1
},
stress: {
label: 'DAGGERHEART.LevelUp.Options.stress',
checkboxQuantity: 2,
checkboxSelections: 2,
minCost: 1,
type: LevelOptionType.stress.id,
value: 1
},
experience: {
label: 'DAGGERHEART.LevelUp.Options.experience',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.experience.id,
value: 1,
@ -210,34 +210,34 @@ export const defaultLevelTiers = {
},
domainCard: {
label: 'DAGGERHEART.LevelUp.Options.domainCard',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.domainCard.id,
amount: 1
},
evasion: {
label: 'DAGGERHEART.LevelUp.Options.evasion',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.evasion.id,
value: 1
},
subclass: {
label: 'DAGGERHEART.LevelUp.Options.subclass',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.subclass.id
},
proficiency: {
label: 'DAGGERHEART.LevelUp.Options.proficiency',
checkboxQuantity: 2,
checkboxSelections: 1,
minCost: 2,
type: LevelOptionType.proficiency.id,
value: 1
},
multiclass: {
label: 'DAGGERHEART.LevelUp.Options.multiclass',
checkboxQuantity: 2,
checkboxSelections: 1,
minCost: 2,
type: LevelOptionType.multiclass.id
}
@ -262,28 +262,28 @@ export const defaultLevelTiers = {
options: {
trait: {
label: 'DAGGERHEART.LevelUp.Options.trait',
checkboxQuantity: 3,
checkboxSelections: 3,
minCost: 1,
type: LevelOptionType.trait.id,
amount: 2
},
hitPoint: {
label: 'DAGGERHEART.LevelUp.Options.hitPoint',
checkboxQuantity: 2,
checkboxSelections: 2,
minCost: 1,
type: LevelOptionType.hitPoint.id,
value: 1
},
stress: {
label: 'DAGGERHEART.LevelUp.Options.stress',
checkboxQuantity: 2,
checkboxSelections: 2,
minCost: 1,
type: LevelOptionType.stress.id,
value: 1
},
experience: {
label: 'DAGGERHEART.LevelUp.Options.experience',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.experience.id,
value: 1,
@ -291,34 +291,34 @@ export const defaultLevelTiers = {
},
domainCard: {
label: 'DAGGERHEART.LevelUp.Options.domainCard',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.domainCard.id,
amount: 1
},
evasion: {
label: 'DAGGERHEART.LevelUp.Options.evasion',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.evasion.id,
value: 1
},
subclass: {
label: 'DAGGERHEART.LevelUp.Options.subclass',
checkboxQuantity: 1,
checkboxSelections: 1,
minCost: 1,
type: LevelOptionType.subclass.id
},
proficiency: {
label: 'DAGGERHEART.LevelUp.Options.proficiency',
checkboxQuantity: 2,
checkboxSelections: 1,
minCost: 2,
type: LevelOptionType.proficiency.id,
value: 1
},
multiclass: {
label: 'DAGGERHEART.LevelUp.Options.multiclass',
checkboxQuantity: 2,
checkboxSelections: 1,
minCost: 2,
type: LevelOptionType.multiclass.id
}

View file

@ -1,13 +1,17 @@
import { chunkify } from '../helpers/utils.mjs';
import { LevelOptionType } from './levelTier.mjs';
export class DhLevelup extends foundry.abstract.DataModel {
static initializeData(levelTierData, pcLevelData) {
const availableChoicesPerLevel = levelTierData.availableChoicesPerLevel;
const tierKeys = Object.keys(levelTierData.tiers);
const maxLevel = levelTierData.tiers[tierKeys[tierKeys.length - 1]].levels.end;
return {
tiers: Object.keys(levelTierData.tiers).reduce((acc, key) => {
tiers: tierKeys.reduce((acc, key) => {
acc[key] = DhLevelupTier.initializeData(
levelTierData.tiers[key],
maxLevel,
pcLevelData.selections.filter(x => x.tier === Number(key)),
pcLevelData.level.changed
);
@ -39,16 +43,16 @@ export class DhLevelup extends foundry.abstract.DataModel {
return Object.values(this.tiers).reduce(
(acc, tier) => {
acc.total += tier.selections.total;
for (var key in tier.selections.selections) {
const nrSelections = tier.selections.selections[key];
for (var key in tier.selections.available) {
const availableSelections = tier.selections.available[key];
if (acc.selections[key]) acc.selections[key] += nrSelections;
else acc.selections[key] = nrSelections;
if (acc.available[key]) acc.available[key] += availableSelections;
else acc.available[key] = availableSelections;
}
return acc;
},
{ total: 0, selections: {} }
{ total: 0, available: {} }
);
}
@ -77,16 +81,22 @@ export class DhLevelup extends foundry.abstract.DataModel {
}
class DhLevelupTier extends foundry.abstract.DataModel {
static initializeData(levelTier, pcLevelData, pcLevel) {
static initializeData(levelTier, levelEndCap, pcLevelData, pcLevel) {
const levels = {};
const levelEndCap = levelTier.levels.end + 1;
for (var level = levelTier.levels.start; level < levelEndCap; level++) {
for (var level = levelTier.levels.start; level <= levelEndCap; level++) {
levels[level] = DhLevelupLevel.initializeData(
levelTier.availableOptions,
pcLevelData.filter(x => x.level === level)
level <= Math.min(pcLevel, levelTier.levels.end) ? levelTier.availableOptions : 0,
levelTier.options,
pcLevelData.filter(x => x.level === level),
level < pcLevel
);
}
var belongingLevels = [];
for (var i = levelTier.levels.start; i <= levelTier.levels.end; i++) {
belongingLevels.push(i);
}
return {
tier: levelTier.tier,
name: levelTier.name,
@ -96,6 +106,7 @@ class DhLevelupTier extends foundry.abstract.DataModel {
return acc;
}, {}),
belongingLevels: belongingLevels,
levels: levels
};
}
@ -108,19 +119,26 @@ class DhLevelupTier extends foundry.abstract.DataModel {
name: new fields.StringField({ required: true }),
active: new fields.BooleanField({ required: true, initial: true }),
options: new fields.TypedObjectField(new fields.EmbeddedDataField(DhLevelupTierOption)),
belongingLevels: new fields.ArrayField(new fields.NumberField({ required: true, integer: true })),
levels: new fields.TypedObjectField(new fields.EmbeddedDataField(DhLevelupLevel))
};
}
get selections() {
const allSelections = Object.keys(this.levels).reduce((acc, key) => {
acc[key] = this.levels[key].nrSelections;
const allSelections = Object.keys(this.levels).reduce(
(acc, key) => {
const { selections, available } = this.levels[key].nrSelections;
if (acc.available[key]) acc.available[key] += available;
else acc.available[key] = available;
acc.total += selections;
return acc;
}, {});
return acc;
},
{ available: {}, total: 0 }
);
return {
selections: allSelections,
total: Object.values(allSelections).reduce((acc, nr) => acc + nr, 0)
available: allSelections.available,
total: allSelections.total
};
}
@ -128,24 +146,32 @@ class DhLevelupTier extends foundry.abstract.DataModel {
get tierCheckboxGroups() {
return Object.keys(this.options).map(optionKey => {
const option = this.options[optionKey];
const checkboxes = [...Array(option.checkboxSelections).keys()].flatMap(checkboxNr => {
const levelId = Object.keys(this.levels).find(levelKey => {
const optionSelect = this.levels[levelKey].optionSelections;
return Object.keys(optionSelect)
.filter(key => key === optionKey)
.some(optionKey => optionSelect[optionKey][checkboxNr]?.selected);
});
return [...Array(option.minCost)].map(_ => ({
...option,
tier: this.tier,
level: levelId,
selected: Boolean(levelId),
optionKey: optionKey,
checkboxNr: checkboxNr,
disabled: !levelId ? false : this.levels[levelId].optionSelections[optionKey][checkboxNr]?.locked,
cost: option.minCost
}));
});
return {
label: game.i18n.localize(option.label),
checkboxes: [...Array(option.checkboxQuantity).keys()].map(checkboxNr => {
const levelId = Object.keys(this.levels).find(levelKey => {
const optionSelect = this.levels[levelKey].optionSelections;
return Object.keys(optionSelect)
.filter(key => key === optionKey)
.some(optionKey => optionSelect[optionKey][checkboxNr]);
});
return {
...option,
tier: this.tier,
level: levelId,
selected: Boolean(levelId),
optionKey: optionKey,
checkboxNr: checkboxNr
};
})
checkboxGroups: chunkify(checkboxes, option.minCost, chunkedBoxes => ({
multi: option.minCost > 1,
checkboxes: chunkedBoxes
}))
};
});
}
@ -157,7 +183,7 @@ class DhLevelupTierOption extends foundry.abstract.DataModel {
return {
label: new fields.StringField({ required: true }),
checkboxQuantity: new fields.NumberField({ required: true, integer: true }),
checkboxSelections: new fields.NumberField({ required: true, integer: true }),
minCost: new fields.NumberField({ required: true, integer: true }),
type: new fields.StringField({ required: true, choices: LevelOptionType }),
value: new fields.NumberField({ integer: true }),
@ -167,12 +193,15 @@ class DhLevelupTierOption extends foundry.abstract.DataModel {
}
class DhLevelupLevel extends foundry.abstract.DataModel {
static initializeData(maxSelections, levelData) {
static initializeData(maxSelections, optionSelections, levelData, locked) {
return {
maxSelections: maxSelections,
optionSelections: levelData.reduce((acc, data) => {
if (!acc[data.optionkey]) acc[data.optionKey] = {};
acc[data.optionKey][data.checkboxNr] = true;
if (!acc[data.optionKey]) acc[data.optionKey] = {};
acc[data.optionKey][data.checkboxNr] = {
minCost: optionSelections[data.optionKey].minCost,
locked: locked
};
return acc;
}, {})
@ -185,15 +214,30 @@ class DhLevelupLevel extends foundry.abstract.DataModel {
return {
maxSelections: new fields.NumberField({ required: true, integer: true }),
optionSelections: new fields.TypedObjectField(
new fields.TypedObjectField(new fields.BooleanField({ required: true, initial: true }))
new fields.TypedObjectField(
new fields.SchemaField({
selected: new fields.BooleanField({ required: true, initial: true }),
minCost: new fields.NumberField({ required: true, integer: true }),
locked: new fields.BooleanField({ required: true, initial: false })
})
)
)
};
}
get nrSelections() {
return Object.keys(this.optionSelections).reduce(
(acc, optionKey) => acc + Object.keys(this.optionSelections[optionKey]).length,
0
);
const selections = Object.keys(this.optionSelections).reduce((acc, optionKey) => {
const selection = this.optionSelections[optionKey];
acc += Object.values(selection)
.filter(x => x.selected)
.reduce((acc, x) => acc + x.minCost, 0);
return acc;
}, 0);
return {
selections: selections,
available: this.maxSelections - selections
};
}
}

View file

@ -1,4 +1,4 @@
import { getPathValue, getTier } from '../helpers/utils.mjs';
import { getPathValue } from '../helpers/utils.mjs';
import { LevelOptionType } from './levelTier.mjs';
const fields = foundry.data.fields;
@ -349,7 +349,7 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
// this.armor.value = this.activeArmor?.baseScore ?? 0;
// this.damageThresholds = this.computeDamageThresholds();
// this.applyLevels();
this.applyLevels();
this.applyEffects();
}
@ -370,97 +370,7 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
};
}
applyLevels() {
let healthBonus = 0,
stressBonus = 0,
proficiencyBonus = 0,
evasionBonus = 0,
armorBonus = 0;
let experienceBonuses = {};
let advancementFirst = null,
advancementSecond = null;
for (var level in this.levelData.levelups) {
var levelData = this.levelData.levelups[level];
for (var tier in levelData) {
var tierData = levelData[tier];
if (tierData) {
healthBonus += Object.keys(tierData.hitPointSlots).length;
stressBonus += Object.keys(tierData.stressSlots).length;
proficiencyBonus += Object.keys(tierData.proficiency).length;
advancementFirst =
Object.keys(tierData.subclass).length > 0 && level >= 5 && level <= 7
? { ...tierData.subclass[0], tier: getTier(Number.parseInt(level), true) }
: advancementFirst;
advancementSecond =
Object.keys(tierData.subclass).length > 0 && level >= 8 && level <= 10
? { ...tierData.subclass[0], tier: getTier(Number.parseInt(level), true) }
: advancementSecond;
for (var index in Object.keys(tierData.experiences)) {
for (var experienceKey in tierData.experiences[index]) {
var experience = tierData.experiences[index][experienceKey];
experienceBonuses[experience] = experienceBonuses[experience]
? experienceBonuses[experience] + 1
: 1;
}
}
evasionBonus += Object.keys(tierData.armorOrEvasionSlot).filter(
x => tierData.armorOrEvasionSlot[x] === 'evasion'
).length;
armorBonus += Object.keys(tierData.armorOrEvasionSlot).filter(
x => tierData.armorOrEvasionSlot[x] === 'armor'
).length;
}
}
}
this.resources.health.max += healthBonus;
this.resources.stress.max += stressBonus;
this.proficiency.value += proficiencyBonus;
this.evasion += evasionBonus;
this.armorMarks = {
max: this.armor ? this.armor.system.marks.max + armorBonus : 0,
value: this.armor ? this.armor.system.marks.value : 0
};
this.experiences = this.experiences.map(x => ({ ...x, value: x.value + (experienceBonuses[x.id] ?? 0) }));
const subclassFeatures = this.subclassFeatures;
if (advancementFirst) {
if (advancementFirst.multiclass) {
this.multiclassSubclass.system[`${advancementFirst.feature}Feature`].unlocked = true;
this.multiclassSubclass.system[`${advancementFirst.feature}Feature`].tier = advancementFirst.tier;
subclassFeatures.multiclassSubclass[advancementFirst.feature].forEach(x => (x.system.disabled = false));
} else {
this.subclass.system[`${advancementFirst.feature}Feature`].unlocked = true;
this.subclass.system[`${advancementFirst.feature}Feature`].tier = advancementFirst.tier;
subclassFeatures.subclass[advancementFirst.feature].forEach(x => (x.system.disabled = false));
}
}
if (advancementSecond) {
if (advancementSecond.multiclass) {
this.multiclassSubclass.system[`${advancementSecond.feature}Feature`].unlocked = true;
this.multiclassSubclass.system[`${advancementSecond.feature}Feature`].tier = advancementSecond.tier;
subclassFeatures.multiclassSubclass[advancementSecond.feature].forEach(
x => (x.system.disabled = false)
);
} else {
this.subclass.system[`${advancementSecond.feature}Feature`].unlocked = true;
this.subclass.system[`${advancementSecond.feature}Feature`].tier = advancementSecond.tier;
subclassFeatures.subclass[advancementSecond.feature].forEach(x => (x.system.disabled = false));
}
}
//General progression
for (var i = 0; i < this.levelData.currentLevel; i++) {
const tier = getTier(i + 1);
if (tier !== 'tier0') {
this.domainData.maxLoadout = Math.min(this.domainData.maxLoadout + 1, 5);
this.domainData.maxCards += 1;
}
}
}
applyLevels() {}
applyEffects() {
const effects = this.effects;
@ -533,6 +443,6 @@ class DhPCLevelData extends foundry.abstract.DataModel {
}
get canLevelUp() {
return this.level.current < this.level.updated;
return this.level.current < this.level.changed;
}
}