diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs index 1f09b748..bcd6ad4d 100644 --- a/module/config/generalConfig.mjs +++ b/module/config/generalConfig.mjs @@ -178,7 +178,7 @@ export const defeatedConditions = () => { }, {}); }; -const defeatedConditionChoices = { +export const defeatedConditionChoices = { defeated: { id: 'defeated', name: 'DAGGERHEART.CONFIG.Condition.defeated.name' diff --git a/module/data/settings/Automation.mjs b/module/data/settings/Automation.mjs index be1b71ef..fbded2de 100644 --- a/module/data/settings/Automation.mjs +++ b/module/data/settings/Automation.mjs @@ -69,19 +69,19 @@ export default class DhAutomation extends foundry.abstract.DataModel { characterDefault: new fields.StringField({ required: true, choices: CONFIG.DH.GENERAL.defeatedConditionChoices, - initial: 'unconscious', + initial: CONFIG.DH.GENERAL.defeatedConditionChoices.unconscious.id, label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.defeated.characterDefault.label' }), adversaryDefault: new fields.StringField({ required: true, choices: CONFIG.DH.GENERAL.defeatedConditionChoices, - initial: 'defeated', + initial: CONFIG.DH.GENERAL.defeatedConditionChoices.dead.id, label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.defeated.adversaryDefault.label' }), companionDefault: new fields.StringField({ required: true, choices: CONFIG.DH.GENERAL.defeatedConditionChoices, - initial: 'defeated', + initial: CONFIG.DH.GENERAL.defeatedConditionChoices.defeated.id, label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.defeated.companionDefault.label' }), deadIcon: new fields.FilePathField({ diff --git a/styles/less/sheets/actors/party/resources.less b/styles/less/sheets/actors/party/resources.less index 9f3eae73..fc7e0110 100644 --- a/styles/less/sheets/actors/party/resources.less +++ b/styles/less/sheets/actors/party/resources.less @@ -14,7 +14,6 @@ body.game:is(.performance-low, .noblur) { .application.sheet.daggerheart.actor.dh-style.party { .tab.resources { - max-height: 400px; overflow: auto; .actors-list { @@ -32,6 +31,7 @@ body.game:is(.performance-low, .noblur) { position: relative; background: light-dark(@dark-blue-40, @dark-golden-40); border-radius: 6px; + border: 1px solid light-dark(@dark-blue, @golden); max-width: 230px; height: -webkit-fill-available;