cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-11 19:25:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in main

Browse source
This commit is contained in:
WBHarry 2025-08-14 20:39:53 +02:00
commit b3c0344b91
11 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
module/applications/dialogs/damageReductionDialog.mjs
View file

@ -39,7 +39,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
this.availableStressReductions = Object.keys(actor.system.rules.damageReduction.stressDamageReduction).reduce(
(acc, key) => {
const dr = actor.system.rules.damageReduction.stressDamageReduction[key];
if (dr.enabled) {
if (dr.cost) {
if (acc === null) acc = {};
const damage = damageKeyToNumber(key);
@ -260,7 +260,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
const reducedDamage = currentDamage !== this.damage ? getDamageLabel(currentDamage) : null;
const currentDamageLabel = reducedDamage ?? getDamageLabel(this.damage);
if (stressReduction.from !== currentDamageLabel) return;
if (!stressReduction.any && stressReduction.from !== currentDamageLabel) return;
stressReduction.selected = true;
this.render();

4
module/data/fields/action/damageField.mjs
View file

@ -10,7 +10,7 @@ export default class DamageField extends fields.SchemaField {
initial: false,
label: 'DAGGERHEART.ACTIONS.Settings.includeBase.label'
}),
direct: new fields.BooleanField({ initial: false, label: "DAGGERHEART.CONFIG.DamageType.direct.name" })
direct: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.CONFIG.DamageType.direct.name' })
};
super(damageFields, options, context);
}
@ -30,7 +30,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
bonus: new fields.NumberField({ nullable: true, initial: null, label: 'Bonus' }),
custom: new fields.SchemaField({
enabled: new fields.BooleanField({ label: 'Custom Formula' }),
formula: new FormulaField({ label: 'Formula' })
formula: new FormulaField({ label: 'Formula', initial: '' })
})
};
}

2
module/data/fields/actionField.mjs
View file

@ -82,6 +82,7 @@ export class ActionsField extends MappingField {
*/
export class ActionField extends foundry.data.fields.ObjectField {
getModel(value) {
if (value && !value.type) value.type = 'attack';
return game.system.api.models.actions.actionsTypes[value.type] ?? null;
}
@ -99,7 +100,6 @@ export class ActionField extends foundry.data.fields.ObjectField {
/** @override */
initialize(value, model, options = {}) {
if (value && !value.type) value.type = 'attack';
const cls = this.getModel(value);
if (cls) return new cls(value, { parent: model, ...options });
return foundry.utils.deepClone(value);

1
module/data/fields/actorField.mjs
View file

@ -20,7 +20,6 @@ const resourceField = (max = 0, initial = 0, label, reverse = false, maxLabel) =
const stressDamageReductionRule = localizationPath =>
new fields.SchemaField({
enabled: new fields.BooleanField({ required: true, initial: false }),
cost: new fields.NumberField({
integer: true,
label: `${localizationPath}.label`,

4
module/dice/dhRoll.mjs
View file

@ -227,13 +227,13 @@ export const registerRollDiceHooks = () => {
if (!actor) return;
if (config.roll.isCritical || config.roll.result.duality === 1)
updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
if (config.roll.isCritical) updates.push({ key: 'stress', value: 1, total: -1, enabled: true });
if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
if (config.rerolledRoll) {
if (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1)
updates.push({ key: 'hope', value: -1, total: 1, enabled: true });
if (config.rerolledRoll.isCritical) updates.push({ key: 'stress', value: 1, total: -1, enabled: true });
if (config.rerolledRoll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
if (config.rerolledRoll.result.duality === -1)
updates.push({ key: 'fear', value: -1, total: 1, enabled: true });
}

5
module/helpers/utils.mjs
View file

@ -198,7 +198,7 @@ foundry.dice.terms.Die.prototype.selfCorrecting = function (modifier) {
};
export const getDamageKey = damage => {
return ['none', 'minor', 'major', 'severe'][damage];
return ['none', 'minor', 'major', 'severe', 'any'][damage];
};
export const getDamageLabel = damage => {
@ -210,7 +210,8 @@ export const damageKeyToNumber = key => {
none: 0,
minor: 1,
major: 2,
severe: 3
severe: 3,
any: 4
}[key];
};

2
module/systemRegistration/settings.mjs
View file

@ -86,7 +86,7 @@ const registerMenus = () => {
hint: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.variantRules.hint'),
icon: CONFIG.DH.SETTINGS.menu.VariantRules.Icon,
type: DhVariantRuleSettings,
restricted: false
restricted: true
});
};