cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-06 04:44:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changed to use DefaultOutcome and added successHope as an alt outcome

Browse source
This commit is contained in:
WBHarry 2026-05-14 21:13:33 +02:00
parent 482b932cd6
commit e12d5ce851
6 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
module/applications/sheets-configs/action-base-config.mjs
View file

@ -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:
outcomeKeys.length === 1
? game.i18n.localize('DAGGERHEART.CONFIG.OutcomeType.simpleOutcome')
: game.i18n.localize(CONFIG.DH.ACTIONS.outcomeTypes[key].label)
label: 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)
acc.push({ id: key, label: game.i18n.localize(value.label) });
if (action.damage.altOutcomes[key] === null) 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 {

4
module/config/actionConfig.mjs
View file

@ -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'

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

@ -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()
};
}