Changed to use DefaultOutcome and added successHope as an alt outcome

lang/en.json

@@ -136,6 +136,8 @@
                 "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": {
@@ -1280,11 +1282,11 @@
                 "die": "Die"
             },
             "OutcomeType": {
+                "default": "Default Outcome",
                 "successHope": "Success/ Hope",
                 "successFear": "Success/ Fear",
                 "failureHope": "Failure/ Hope",
-                "failureFear": "Failure/ Fear",
+                "failureFear": "Failure/ Fear"
-                "simpleOutcome": "Outcome"
             },
             "Range": {
                 "self": {
@@ -2359,7 +2361,8 @@
                 "deathMoves": "Deathmoves",
                 "sources": "Sources",
                 "packs": "Packs",
-                "range": "Range"
+                "range": "Range",
+                "outcomes": "Outcomes"
             },
             "Tiers": {
                 "singular": "Tier",

module/applications/sheets-configs/action-base-config.mjs

@@ -21,7 +21,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
     /* Needs to consider effect altOutcomes aswell */
     static getOutcomeTabs(action) {
         const outcomeKeys = [
-            'successHope',
+            'default',
             ...Object.keys(action.damage?.altOutcomes ?? {}).filter(key => action.damage.altOutcomes[key])
         ];
         return outcomeKeys.reduce((acc, key, index) => {
@@ -31,10 +31,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
                 group: 'outcomes',
                 id: key,
                 icon: null,
-                label:
+                label: game.i18n.localize(CONFIG.DH.ACTIONS.outcomeTypes[key].label)
-                    outcomeKeys.length === 1
-                        ? game.i18n.localize('DAGGERHEART.CONFIG.OutcomeType.simpleOutcome')
-                        : game.i18n.localize(CONFIG.DH.ACTIONS.outcomeTypes[key].label)
             };
             return acc;
         }, {});
@@ -43,8 +40,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
     /* Needs to consider effect altOutcomes aswell */
     static selectOutcome(action, callback) {
         const choices = Object.entries(CONFIG.DH.ACTIONS.outcomeTypes).reduce((acc, [key, value]) => {
-            if (key !== 'successHope' && action.damage.altOutcomes[key] === null)
+            if (action.damage.altOutcomes[key] === null) acc.push({ id: key, label: game.i18n.localize(value.label) });
-                acc.push({ id: key, label: game.i18n.localize(value.label) });
 
             return acc;
         }, []);
@@ -185,7 +181,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             group: 'primary',
             id: 'effect',
             icon: null,
-            label: 'DAGGERHEART.GENERAL.Tabs.effects'
+            label: 'DAGGERHEART.GENERAL.Tabs.outcomes'
         },
         trigger: {
             active: false,
@@ -398,7 +394,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
 
         const outcome = button.dataset.outcome;
         const outcomeParts =
-            outcome === 'successHope'
+            outcome === 'default'
                 ? this.action._source.damage.parts
                 : this.action._source.damage.altOutcomes[outcome].parts;
         const choices = getUnusedDamageTypes(outcomeParts);
@@ -424,7 +420,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             if (type === CONFIG.DH.GENERAL.healingTypes.hitPoints.id)
                 part.type = this.action.schema.fields.damage.fields.parts.element.fields.type.element.initial;
 
-            if (outcome === 'successHope') data.damage.parts[type] = part;
+            if (outcome === 'default') data.damage.parts[type] = part;
             else {
                 if (!data.damage.altOutcomes[outcome]) {
                     data.damage.altOutcomes[outcome] = new AltDamageOutcome();
@@ -464,7 +460,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         if (!this.action.damage.parts) return;
         const data = this.action.toObject();
         const { key, outcome } = button.dataset;
-        if (outcome === 'successHope') {
+        if (outcome === 'default') {
             delete data.damage.parts[key];
             data.damage.parts[`${key}`] = _del;
         } else {

module/config/actionConfig.mjs

@@ -124,6 +124,10 @@ export const areaTypes = {
 };
 
 export const outcomeTypes = {
+    default: {
+        key: 'default',
+        label: 'DAGGERHEART.CONFIG.OutcomeType.default'
+    },
     successHope: {
         key: 'successHope',
         label: 'DAGGERHEART.CONFIG.OutcomeType.successHope'

module/data/fields/action/damageField.mjs

@@ -24,6 +24,7 @@ export default class DamageField extends fields.SchemaField {
         const damageFields = {
             ...getDamageBaseFields(),
             altOutcomes: new fields.SchemaField({
+                successHope: new fields.EmbeddedDataField(AltDamageOutcome, { nullable: true, initial: null }),
                 successFear: new fields.EmbeddedDataField(AltDamageOutcome, { nullable: true, initial: null }),
                 failureHope: new fields.EmbeddedDataField(AltDamageOutcome, { nullable: true, initial: null }),
                 failureFear: new fields.EmbeddedDataField(AltDamageOutcome, { nullable: true, initial: null })
@@ -345,7 +346,16 @@ export class DHDamageData extends DHResourceData {
 export class AltDamageOutcome extends foundry.abstract.DataModel {
     static defineSchema() {
         return {
-            useStandardHitPointDamage: new fields.BooleanField({ required: true, initial: true }),
+            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()
         };
     }

templates/actionTypes/damage.hbs

@@ -18,6 +18,9 @@
         {{#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}}
     </div>
     
     {{!-- 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 --}}

templates/sheets-settings/action-settings/effect.hbs

@@ -9,7 +9,7 @@
                 <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
                     {{localize tab.label}}
                 </a>
-                {{#unless (eq tab.id 'successHope')}}<a data-outcome="{{tab.id}}" data-action="removeOutcome"><i class="fa-solid fa-trash"></i></a>{{/unless}}
+                {{#unless (eq tab.id 'default')}}<a data-outcome="{{tab.id}}" data-action="removeOutcome"><i class="fa-solid fa-trash"></i></a>{{/unless}}
             </div>
         {{/each}}
         <a data-action="addOutcome" {{#if allOutcomesAssigned}}disabled{{/if}}><i class="fa-solid fa-plus"></i></a>
@@ -21,13 +21,16 @@
             data-group="outcomes"
             data-tab="{{tab.id}}"
         >
-            {{#if (eq tab.id 'successHope')}}
+            {{#if ../fields.damage}}
-                {{#if ../fields.damage}}{{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=../fields.damage.fields.parts.element.fields source=../source.damage baseFields=../fields.damage.fields outcome=tab.id outcomePath="damage" }}{{/if}}
+                {{#if (eq tab.id 'default')}}
-            {{else}}
+                    {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=../fields.damage.fields.parts.element.fields source=../source.damage baseFields=../fields.damage.fields outcome=tab.id outcomePath="damage" isDefaultDamage="true" }}
-                {{#with (lookup ../fields.damage.fields.altOutcomes.fields tab.id) as |field|}}
+                {{else}}
-                    {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=field.fields.parts.element.fields source=(lookup ../../source.damage.altOutcomes ../id) baseFields=field.fields outcome=../id outcomePath=(concat "damage.altOutcomes." tab.id) }}
+                    {{#with (lookup ../fields.damage.fields.altOutcomes.fields tab.id) as |field|}}
-                {{/with }}
+                        {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=field.fields.parts.element.fields source=(lookup ../../source.damage.altOutcomes ../id) baseFields=field.fields outcome=../id outcomePath=(concat "damage.altOutcomes." tab.id) }}
+                    {{/with }}
+                {{/if}}
             {{/if}}
+            
         </section>
     {{/each}}