From f7a29c00292e31c46c4c32397aaa407f86c6c2d4 Mon Sep 17 00:00:00 2001 From: Dapoulp <74197441+Dapoulp@users.noreply.github.com> Date: Sun, 3 Aug 2025 15:01:43 +0200 Subject: [PATCH] Small Fixes (#540) * Small Fixes * Remove console.log & comments --- module/data/chat-message/adversaryRoll.mjs | 4 +- module/dice/d20Roll.mjs | 3 +- module/documents/actor.mjs | 8 +- .../less/sheets/actors/adversary/actions.less | 1 - .../less/sheets/actors/adversary/sheet.less | 8 ++ .../less/sheets/actors/adversary/sidebar.less | 13 +++ .../less/sheets/actors/character/sheet.less | 2 + .../less/sheets/actors/character/sidebar.less | 1 - styles/less/ui/chat/chat.less | 23 +++-- templates/sheets/actors/adversary/sidebar.hbs | 84 ++++++++++--------- templates/ui/chat/parts/damage-part.hbs | 19 +---- templates/ui/chat/parts/roll-part.hbs | 66 ++++++--------- 12 files changed, 117 insertions(+), 115 deletions(-) diff --git a/module/data/chat-message/adversaryRoll.mjs b/module/data/chat-message/adversaryRoll.mjs index db3cab52..b288b270 100644 --- a/module/data/chat-message/adversaryRoll.mjs +++ b/module/data/chat-message/adversaryRoll.mjs @@ -69,7 +69,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel { } get hitTargets() { - return this.currentTargets.filter(t => (t.hit || !this.targetSelection)); + return this.currentTargets.filter(t => (t.hit || !this.hasRoll || !this.targetSelection)); } async updateTargets() { @@ -120,6 +120,8 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel { } if(this.hasSave) this.setPendingSaves(); } + + this.canViewSecret = this.parent.speakerActor?.testUserPermission(game.user, 'OBSERVER'); } getTargetList() { diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs index 28f7ecf7..21d261ff 100644 --- a/module/dice/d20Roll.mjs +++ b/module/dice/d20Roll.mjs @@ -170,7 +170,8 @@ export default class D20Roll extends DHRoll { .map(d => { return { dice: d.denomination, - value: d.total + value: d.total, + results: d.results }; }); data.modifierTotal = this.calculateTotalModifiers(roll); diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs index 4dad59c7..9a3612f8 100644 --- a/module/documents/actor.mjs +++ b/module/documents/actor.mjs @@ -597,7 +597,7 @@ export default class DhpActor extends Actor { async modifyResource(resources) { if (!resources.length) return; - if (resources.find(r => r.type === 'stress')) this.convertStressDamageToHP(resources); + if (resources.find(r => r.key === 'stress')) this.convertStressDamageToHP(resources); let updates = { actor: { target: this, resources: {} }, armor: { target: this.system.armor, resources: {} }, @@ -664,14 +664,14 @@ export default class DhpActor extends Actor { } convertStressDamageToHP(resources) { - const stressDamage = resources.find(r => r.type === 'stress'), + const stressDamage = resources.find(r => r.key === 'stress'), newValue = this.system.resources.stress.value + stressDamage.value; if (newValue <= this.system.resources.stress.max) return; - const hpDamage = resources.find(r => r.type === 'hitPoints'); + const hpDamage = resources.find(r => r.key === 'hitPoints'); if (hpDamage) hpDamage.value++; else resources.push({ - type: 'hitPoints', + key: 'hitPoints', value: 1 }); } diff --git a/styles/less/sheets/actors/adversary/actions.less b/styles/less/sheets/actors/adversary/actions.less index 8370abc3..3c8ca4bc 100644 --- a/styles/less/sheets/actors/adversary/actions.less +++ b/styles/less/sheets/actors/adversary/actions.less @@ -11,7 +11,6 @@ mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); padding: 20px 0; padding-top: 10px; - height: 95%; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less index 286351c9..b710cab8 100644 --- a/styles/less/sheets/actors/adversary/sheet.less +++ b/styles/less/sheets/actors/adversary/sheet.less @@ -14,6 +14,9 @@ .adversary-sidebar-sheet { grid-row: 1 / span 2; grid-column: 1; + overflow: hidden; + display: flex; + flex-direction: column; } .adversary-header-sheet { @@ -24,6 +27,11 @@ .tab { grid-row: 2; grid-column: 2; + &.active { + overflow: hidden; + display: flex; + flex-direction: column; + } } } } diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less index eec3b6cf..4955c175 100644 --- a/styles/less/sheets/actors/adversary/sidebar.less +++ b/styles/less/sheets/actors/adversary/sidebar.less @@ -269,6 +269,19 @@ } } + .shortcut-items-section { + overflow-y: hidden; + padding-top: 10px; + padding-bottom: 20px; + mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); + + &:hover { + overflow-y: auto; + scrollbar-width: thin; + scrollbar-color: light-dark(@dark-blue, @golden) transparent; + } + } + .attack-section { .title { display: flex; diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less index 421b102f..026b4d29 100644 --- a/styles/less/sheets/actors/character/sheet.less +++ b/styles/less/sheets/actors/character/sheet.less @@ -15,6 +15,8 @@ .character-sidebar-sheet { grid-row: 1 / span 2; grid-column: 1; + display: flex; + flex-direction: column; } .character-header-sheet { diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less index db4c9cbb..cefa1e02 100644 --- a/styles/less/sheets/actors/character/sidebar.less +++ b/styles/less/sheets/actors/character/sidebar.less @@ -443,7 +443,6 @@ .shortcut-items-section { overflow-y: hidden; - max-height: 56%; padding-top: 10px; padding-bottom: 20px; mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less index 941b6896..9afa32d3 100644 --- a/styles/less/ui/chat/chat.less +++ b/styles/less/ui/chat/chat.less @@ -520,13 +520,16 @@ flex-wrap: wrap; .roll-die { - display: flex; - flex-direction: column; + display: grid; + grid-template-areas: + ". a a" + "c b b"; gap: 3px; label { text-align: center; height: var(--font-size-12); + grid-area: a; } > div { @@ -534,7 +537,17 @@ align-items: center; justify-content: center; gap: 5px; - // font-size: var(--font-size-20); + grid-area: b; + } + + &.has-plus:before { + content: '+'; + font-size: var(--font-size-20); + grid-area: c; + display: flex; + align-items: center; + justify-content: center; + width: 15px; } } } @@ -542,7 +555,6 @@ fieldset { display: flex; flex-direction: column; - // gap: 10px; border-color: var(--text-color); border-radius: 5px; @@ -732,9 +744,6 @@ .dice-roll .dice-tooltip fieldset { margin-bottom: 5px; - .roll-dice { - gap: 10px; - } } } } diff --git a/templates/sheets/actors/adversary/sidebar.hbs b/templates/sheets/actors/adversary/sidebar.hbs index 1b6d65a5..82aad232 100644 --- a/templates/sheets/actors/adversary/sidebar.hbs +++ b/templates/sheets/actors/adversary/sidebar.hbs @@ -71,49 +71,51 @@ -
-
- -

{{localize "DAGGERHEART.GENERAL.attack"}}

- +
+
+
+ +

{{localize "DAGGERHEART.GENERAL.attack"}}

+ +
+
    + {{> 'daggerheart.inventory-item' + item=document.system.attack + type='action' + hideTags=true + hideDescription=true + hideTooltip=true + hideResources=true + noExtensible=true + noCompendiumEdit=true + }} +
-
    - {{> 'daggerheart.inventory-item' - item=document.system.attack - type='action' - hideTags=true - hideDescription=true - hideTooltip=true - hideResources=true - noExtensible=true - noCompendiumEdit=true - }} -
-
-
-
- -

{{localize "DAGGERHEART.GENERAL.experience.plural"}}

- -
-
- {{#each source.system.experiences as |experience id|}} -
-
- +{{experience.value}} +
+
+ +

{{localize "DAGGERHEART.GENERAL.experience.plural"}}

+ +
+
+ {{#each source.system.experiences as |experience id|}} +
+
+ +{{experience.value}} +
+ {{experience.name}} +
+ + + +
- {{experience.name}} -
- - - -
-
- {{/each}} + {{/each}} +
+
+ +
+
-
- -
-
\ No newline at end of file diff --git a/templates/ui/chat/parts/damage-part.hbs b/templates/ui/chat/parts/damage-part.hbs index d717166e..7ec8bfd8 100644 --- a/templates/ui/chat/parts/damage-part.hbs +++ b/templates/ui/chat/parts/damage-part.hbs @@ -28,29 +28,14 @@ {{#each dice}} {{#each results}} {{#unless discarded}} -
+
{{result}}
- {{#unless @last}} -
-
+
-
- {{/unless}} {{/unless}} {{/each}} - {{#unless @last}} -
-
+
-
- {{/unless}} {{/each}} {{#if modifierTotal}} - {{#if (gt modifierTotal 0)}} -
-
+
-
- {{/if}} -
+
{{modifierTotal}}
{{/if}} diff --git a/templates/ui/chat/parts/roll-part.hbs b/templates/ui/chat/parts/roll-part.hbs index 0d9ce15d..d4e46b1f 100644 --- a/templates/ui/chat/parts/roll-part.hbs +++ b/templates/ui/chat/parts/roll-part.hbs @@ -12,7 +12,15 @@ {{/if}}
- {{#if roll.difficulty}}{{localize "DAGGERHEART.GENERAL.difficulty"}} {{roll.difficulty}}{{/if}} + {{#if roll.difficulty}} + + {{#if canViewSecret}} + difficulty {{roll.difficulty}} + {{else}} + {{localize (ifThen roll.success "DAGGERHEART.GENERAL.success" "DAGGERHEART.GENERAL.failure")}} + {{/if}} + + {{/if}}
{{localize "DAGGERHEART.GENERAL.formula"}}
@@ -28,11 +36,7 @@ {{roll.hope.value}}
-
- -
+
-
-
+
{{#if roll.fear.rerolled.any}}{{/if}} @@ -40,11 +44,7 @@
{{#if roll.advantage.type}} -
- -
+
-
-
+
{{#if (eq roll.advantage.type 1)}}
{{roll.advantage.value}}
@@ -55,48 +55,30 @@
{{/if}} {{#if roll.rally.dice}} -
- -
+
-
-
+
{{roll.rally.value}}
{{/if}} {{#each roll.extra}} -
- -
+
-
-
- -
{{value}}
-
- {{#unless @last}} -
- -
+
-
- {{/unless}} + {{#each results}} + {{#unless discarded}} +
+ +
{{result}}
+
+ {{/unless}} + {{/each}} {{/each}} {{else}} {{#each roll.dice}} {{#each results}} -
-
{{result}}
-
- {{#unless (or @last (not discarded))}} -
-
+
+
+
+ {{result}}
- {{/unless}} - {{/each}} - {{#unless @last}} -
-
+
- {{/unless}} + {{/each}} {{/each}} {{/if}}