mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-12 03:31:07 +01:00
Fixed damage reduction any (#937)
This commit is contained in:
parent
207d0d6335
commit
16299a9865
5 changed files with 5 additions and 17 deletions
|
|
@ -39,7 +39,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
|
||||||
this.availableStressReductions = Object.keys(actor.system.rules.damageReduction.stressDamageReduction).reduce(
|
this.availableStressReductions = Object.keys(actor.system.rules.damageReduction.stressDamageReduction).reduce(
|
||||||
(acc, key) => {
|
(acc, key) => {
|
||||||
const dr = actor.system.rules.damageReduction.stressDamageReduction[key];
|
const dr = actor.system.rules.damageReduction.stressDamageReduction[key];
|
||||||
if (dr.enabled) {
|
if (dr.cost) {
|
||||||
if (acc === null) acc = {};
|
if (acc === null) acc = {};
|
||||||
|
|
||||||
const damage = damageKeyToNumber(key);
|
const damage = damageKeyToNumber(key);
|
||||||
|
|
@ -260,7 +260,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
|
||||||
const reducedDamage = currentDamage !== this.damage ? getDamageLabel(currentDamage) : null;
|
const reducedDamage = currentDamage !== this.damage ? getDamageLabel(currentDamage) : null;
|
||||||
const currentDamageLabel = reducedDamage ?? getDamageLabel(this.damage);
|
const currentDamageLabel = reducedDamage ?? getDamageLabel(this.damage);
|
||||||
|
|
||||||
if (stressReduction.from !== currentDamageLabel) return;
|
if (!stressReduction.any && stressReduction.from !== currentDamageLabel) return;
|
||||||
|
|
||||||
stressReduction.selected = true;
|
stressReduction.selected = true;
|
||||||
this.render();
|
this.render();
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ const resourceField = (max = 0, initial = 0, label, reverse = false, maxLabel) =
|
||||||
|
|
||||||
const stressDamageReductionRule = localizationPath =>
|
const stressDamageReductionRule = localizationPath =>
|
||||||
new fields.SchemaField({
|
new fields.SchemaField({
|
||||||
enabled: new fields.BooleanField({ required: true, initial: false }),
|
|
||||||
cost: new fields.NumberField({
|
cost: new fields.NumberField({
|
||||||
integer: true,
|
integer: true,
|
||||||
label: `${localizationPath}.label`,
|
label: `${localizationPath}.label`,
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,7 @@ foundry.dice.terms.Die.prototype.selfCorrecting = function (modifier) {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getDamageKey = damage => {
|
export const getDamageKey = damage => {
|
||||||
return ['none', 'minor', 'major', 'severe'][damage];
|
return ['none', 'minor', 'major', 'severe', 'any'][damage];
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getDamageLabel = damage => {
|
export const getDamageLabel = damage => {
|
||||||
|
|
@ -210,7 +210,8 @@ export const damageKeyToNumber = key => {
|
||||||
none: 0,
|
none: 0,
|
||||||
minor: 1,
|
minor: 1,
|
||||||
major: 2,
|
major: 2,
|
||||||
severe: 3
|
severe: 3,
|
||||||
|
any: 4
|
||||||
}[key];
|
}[key];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,12 +45,6 @@
|
||||||
"mode": 5,
|
"mode": 5,
|
||||||
"value": "1",
|
"value": "1",
|
||||||
"priority": null
|
"priority": null
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "system.rules.damageReduction.stressDamageReduction.severe.enabled",
|
|
||||||
"mode": 5,
|
|
||||||
"value": "1",
|
|
||||||
"priority": null
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"disabled": false,
|
"disabled": false,
|
||||||
|
|
|
||||||
|
|
@ -101,12 +101,6 @@
|
||||||
"mode": 5,
|
"mode": 5,
|
||||||
"value": "1",
|
"value": "1",
|
||||||
"priority": null
|
"priority": null
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "system.rules.damageReduction.stressDamageReduction.any.enabled",
|
|
||||||
"mode": 5,
|
|
||||||
"value": "1",
|
|
||||||
"priority": null
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"disabled": false,
|
"disabled": false,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue