diff --git a/lang/en.json b/lang/en.json index 28323898..624ec525 100755 --- a/lang/en.json +++ b/lang/en.json @@ -136,8 +136,6 @@ "criticalThreshold": "Critical Threshold", "includeBase": { "label": "Include Item Damage" }, "groupAttack": { "label": "Group Attack" }, - "inheritDefaultDamage": { "label": "Inherit Default Damage" }, - "inheritDefaultEffects": { "label": "Inherit Default Effects" }, "multiplier": "Multiplier", "saveHint": "Set a default Trait to enable Reaction Roll. It can be changed later in Reaction Roll Dialog.", "resultBased": { diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs index abf2f9a6..78c27774 100644 --- a/module/data/fields/action/damageField.mjs +++ b/module/data/fields/action/damageField.mjs @@ -346,16 +346,6 @@ export class DHDamageData extends DHResourceData { export class AltDamageOutcome extends foundry.abstract.DataModel { static defineSchema() { return { - inheritDefaultDamage: new fields.BooleanField({ - required: true, - initial: true, - label: 'DAGGERHEART.ACTIONS.Settings.inheritDefaultDamage.label' - }), - inheritDefaultEffects: new fields.BooleanField({ - required: true, - initial: true, - label: 'DAGGERHEART.ACTIONS.Settings.inheritDefaultEffects.label' - }), ...getDamageBaseFields() }; } diff --git a/templates/actionTypes/damage.hbs b/templates/actionTypes/damage.hbs index 9e9541de..fef6591e 100644 --- a/templates/actionTypes/damage.hbs +++ b/templates/actionTypes/damage.hbs @@ -18,9 +18,6 @@ {{#if (and @root.isNPC (not (eq path 'system.attack.')))}} {{formField baseFields.groupAttack value=source.groupAttack name=(concat path basePath ".groupAttack") localize=true classes="select"}} {{/if}} - {{#unless isDefaultDamage}} - {{formField @root.fields.damage.fields.altOutcomes.fields.successFear.fields.inheritDefaultDamage name=(concat path basePath ".inheritDefaultDamage") localize=true classes="checkbox"}} - {{/unless}} {{!-- Handlebars uses Symbol.Iterator to produce index|key. This isn't compatible with our parts object, so we instead use applyTo, which is the same value --}}