diff --git a/module/applications/sheets-configs/action-config.mjs b/module/applications/sheets-configs/action-config.mjs index 070db23f..ed81b7e9 100644 --- a/module/applications/sheets-configs/action-config.mjs +++ b/module/applications/sheets-configs/action-config.mjs @@ -110,6 +110,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) { context.costOptions = this.getCostOptions(); context.disableOption = this.disableOption.bind(this); context.isNPC = this.action.actor?.isNPC; + context.baseSaveDifficulty = this.action.actor?.baseSaveDifficulty; context.hasRoll = this.action.hasRoll; const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers; diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs index d6c61718..e97d10c6 100644 --- a/module/applications/sheets/actors/character.mjs +++ b/module/applications/sheets/actors/character.mjs @@ -311,7 +311,7 @@ export default class CharacterSheet extends DHBaseActorSheet { icon: 'fa-solid fa-hands', condition: target => { const doc = getDocFromElementSync(target); - return doc && system.equipped; + return doc && doc.system.equipped; }, callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target) } diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs index 779e5268..8b9888f5 100644 --- a/module/data/action/baseAction.mjs +++ b/module/data/action/baseAction.mjs @@ -305,7 +305,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel title: 'Roll Save', roll: { trait: this.save.trait, - difficulty: this.save.difficulty, + difficulty: this.save.difficulty ?? this.actor?.baseSaveDifficulty, type: 'reaction' }, data: target.actor.getRollData() diff --git a/module/data/fields/action/saveField.mjs b/module/data/fields/action/saveField.mjs index c2d84157..e93a82a9 100644 --- a/module/data/fields/action/saveField.mjs +++ b/module/data/fields/action/saveField.mjs @@ -8,7 +8,7 @@ export default class SaveField extends fields.SchemaField { initial: null, choices: CONFIG.DH.ACTOR.abilities }), - difficulty: new fields.NumberField({ nullable: true, initial: 10, integer: true, min: 0 }), + difficulty: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }), damageMod: new fields.StringField({ initial: CONFIG.DH.ACTIONS.damageOnSave.none.id, choices: CONFIG.DH.ACTIONS.damageOnSave diff --git a/module/data/fields/action/targetField.mjs b/module/data/fields/action/targetField.mjs index 61f79196..41f931a6 100644 --- a/module/data/fields/action/targetField.mjs +++ b/module/data/fields/action/targetField.mjs @@ -6,8 +6,7 @@ export default class TargetField extends fields.SchemaField { type: new fields.StringField({ choices: CONFIG.DH.ACTIONS.targetTypes, initial: CONFIG.DH.ACTIONS.targetTypes.any.id, - nullable: true, - initial: null + nullable: true }), amount: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }) }; diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs index 67a5e0b3..5a26ded6 100644 --- a/module/documents/actor.mjs +++ b/module/documents/actor.mjs @@ -385,6 +385,10 @@ export default class DhpActor extends Actor { return CONFIG.Dice.daggerheart[['character', 'companion'].includes(this.type) ? 'DualityRoll' : 'D20Roll']; } + get baseSaveDifficulty() { + return this.system.difficulty ?? 10; + } + getRollData() { const rollData = super.getRollData(); rollData.system = this.system.getRollData(); diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less index 452d997b..dd874efd 100644 --- a/styles/less/global/inventory-item.less +++ b/styles/less/global/inventory-item.less @@ -105,6 +105,10 @@ align-items: center; justify-content: end; gap: 8px; + + .unequipped { + opacity: .5; + } } } diff --git a/styles/less/global/item-header.less b/styles/less/global/item-header.less index f517ad5d..3b3e7ee9 100755 --- a/styles/less/global/item-header.less +++ b/styles/less/global/item-header.less @@ -19,7 +19,7 @@ flex-direction: column; align-items: center; gap: 5px; - margin-top: 36px; + margin-top: var(--header-height); text-align: center; width: 80%; diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less index 1a00239a..172f0113 100755 --- a/styles/less/global/sheet.less +++ b/styles/less/global/sheet.less @@ -15,6 +15,9 @@ // Window header styles .window-header { + position: absolute; + width: 100%; + height: var(--header-height); background: transparent; border-bottom: none; justify-content: end; @@ -41,11 +44,9 @@ .window-content { padding: 0; position: relative; - top: -36px; min-height: -webkit-fill-available; transition: opacity 0.3s ease; padding-bottom: 20px; - margin-bottom: -36px; .tab { padding: 0 10px; diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less index a8646a0a..e9306af6 100644 --- a/styles/less/sheets/actors/adversary/header.less +++ b/styles/less/sheets/actors/adversary/header.less @@ -4,7 +4,7 @@ .application.sheet.daggerheart.actor.dh-style.adversary { .adversary-header-sheet { padding: 0 15px; - padding-top: 36px; + padding-top: var(--header-height); width: 100%; .name-row { diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less index b80da83d..f9511207 100644 --- a/styles/less/sheets/actors/character/header.less +++ b/styles/less/sheets/actors/character/header.less @@ -16,7 +16,7 @@ .application.sheet.daggerheart.actor.dh-style.character { .character-header-sheet { padding: 0 15px; - padding-top: 36px; + padding-top: var(--header-height); width: 100%; .name-row { diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less index f09ee541..60fc6835 100644 --- a/styles/less/sheets/actors/character/sheet.less +++ b/styles/less/sheets/actors/character/sheet.less @@ -11,7 +11,6 @@ width: 100%; padding-bottom: 0; overflow-x: auto; - margin-bottom: 0; .character-sidebar-sheet { grid-row: 1 / span 2; diff --git a/templates/actionTypes/save.hbs b/templates/actionTypes/save.hbs index ff5be220..90bc0483 100644 --- a/templates/actionTypes/save.hbs +++ b/templates/actionTypes/save.hbs @@ -1,6 +1,6 @@
{{localize "DAGGERHEART.GENERAL.save"}} {{formField fields.trait label="Trait" name="save.trait" value=source.trait localize=true}} - {{formField fields.difficulty label="Difficulty" name="save.difficulty" value=source.difficulty disabled=(not source.trait)}} + {{formField fields.difficulty label="Difficulty" name="save.difficulty" value=source.difficulty disabled=(not source.trait) placeholder=@root.baseSaveDifficulty}} {{formField fields.damageMod label="Damage on Save" name="save.damageMod" value=source.damageMod localize=true disabled=(not source.trait)}}
\ No newline at end of file