From 582a15be77971e28e82a33414b35e3add646c32a Mon Sep 17 00:00:00 2001 From: WBHarry Date: Thu, 2 Apr 2026 11:23:57 +0200 Subject: [PATCH 1/4] Fixed scene-navigation styling for levels --- .../ui/sceneNavigation/scene-navigation.hbs | 61 +++++-------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/templates/ui/sceneNavigation/scene-navigation.hbs b/templates/ui/sceneNavigation/scene-navigation.hbs index 68df761e..5bdbbdad 100644 --- a/templates/ui/sceneNavigation/scene-navigation.hbs +++ b/templates/ui/sceneNavigation/scene-navigation.hbs @@ -11,19 +11,21 @@ {{> ".scene" }} {{/with}} - - {{#each scenes.levels}} -
  • - {{#with button}} - - {{/with}} -
    - {{ name }} -
    -
    • - {{/each}} -     + {{#if scenes.levels}} + + {{#each scenes.levels}} +
  • + {{#with button}} + + {{/with}} +
    + {{ name }} +
    +
    • + {{/each}} +     + {{/if}} {{#each scenes.active}} {{> ".scene" }} @@ -34,39 +36,6 @@ {{> ".scene" }} {{/each}} - {{!-- - {{#each scenes.active as |scene|}} -
  • -
      -
    • - {{scene.name}} - {{#if scene.users}} -
        - {{#each scene.users as |user|}} -
      • {{user.letter}}
        • - {{/each}} -
      - {{/if}} -
      • -
    - {{#if scene.hasEnvironments}} - - {{/if}} -
    • - {{/each}} -     - - {{#each scenes.inactive as |scene|}} -
  • -
      -
    • - {{scene.name}} -
      • -
    -
    • - {{/each}} -     --}} {{#*inline ".scene"}} From e8ac3012ad390f2e0a9c36bd3e8206db20cc40cc Mon Sep 17 00:00:00 2001 From: WBHarry Date: Thu, 2 Apr 2026 11:24:17 +0200 Subject: [PATCH 2/4] Raised version --- system.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system.json b/system.json index b1fe74d8..ea71aaba 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "id": "daggerheart", "title": "Daggerheart", "description": "An unofficial implementation of the Daggerheart system", - "version": "2.0.0", + "version": "2.0.1", "compatibility": { "minimum": "14.359", "verified": "14.359", From 0f1ac406df4a4e866ea089798d131ef73af827eb Mon Sep 17 00:00:00 2001 From: WBHarry Date: Thu, 2 Apr 2026 12:22:31 +0200 Subject: [PATCH 3/4] Fixed adding a new damage instance to an action default to prof, which doesn't work for adversaries --- .../applications/sheets-configs/action-config.mjs | 1 - module/data/fields/action/damageField.mjs | 4 ++-- templates/actionTypes/effect.hbs | 15 --------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/module/applications/sheets-configs/action-config.mjs b/module/applications/sheets-configs/action-config.mjs index e15b0391..e073cfa6 100644 --- a/module/applications/sheets-configs/action-config.mjs +++ b/module/applications/sheets-configs/action-config.mjs @@ -21,7 +21,6 @@ export default class DHActionConfig extends DHActionBaseConfig { static async addEffect(_event) { if (!this.action.effects) return; - const effectData = this._addEffectData.bind(this)(); const data = this.action.toObject(); const created = await this.action.item.createEmbeddedDocuments('ActiveEffect', [ diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs index d41d2d4a..5d40a470 100644 --- a/module/data/fields/action/damageField.mjs +++ b/module/data/fields/action/damageField.mjs @@ -232,7 +232,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel { return { multiplier: new fields.StringField({ choices: CONFIG.DH.GENERAL.multiplierTypes, - initial: 'prof', + initial: 'flat', label: 'DAGGERHEART.ACTIONS.Config.damage.multiplier', nullable: false, required: true @@ -244,7 +244,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel { }), dice: new fields.StringField({ choices: CONFIG.DH.GENERAL.diceTypes, - initial: 'd6', + initial: CONFIG.DH.GENERAL.diceTypes.d6, label: 'DAGGERHEART.GENERAL.Dice.single', nullable: false, required: true diff --git a/templates/actionTypes/effect.hbs b/templates/actionTypes/effect.hbs index dd6a7974..8c5e6e68 100644 --- a/templates/actionTypes/effect.hbs +++ b/templates/actionTypes/effect.hbs @@ -4,21 +4,6 @@
      - {{!-- {{#each source as | effect index |}} -
      - {{#with (@root.getEffectDetails effect._id) as | details |}} - -
      - {{name}} -
      - {{/with}} - - {{#if @root.source.save.trait}}{{formInput ../fields.onSave value=effect.onSave name=(concat "effects." index ".onSave") dataset=(object tooltip=(localize "DAGGERHEART.UI.Tooltip.appliedEvenIfSuccessful") tooltipDirection="UP")}}{{/if}} -
      - -
      -
      - {{/each}} --}} {{#each source as | effect index |}}
      From 56dc9afe8fe0c650e4a47098f93aaaea0378ac9d Mon Sep 17 00:00:00 2001 From: WBHarry Date: Thu, 2 Apr 2026 13:37:38 +0200 Subject: [PATCH 4/4] Corrected some action labels and missing translations --- lang/en.json | 6 ++++-- templates/actionTypes/roll.hbs | 8 ++++---- templates/actionTypes/save.hbs | 6 +++--- templates/sheets-settings/adversary-settings/attack.hbs | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lang/en.json b/lang/en.json index 9bcf02b5..d19dfb58 100755 --- a/lang/en.json +++ b/lang/en.json @@ -113,7 +113,9 @@ }, "displayInChat": "Display in chat", "deleteTriggerTitle": "Delete Trigger", - "deleteTriggerContent": "Are you sure you want to delete the {trigger} trigger?" + "deleteTriggerContent": "Are you sure you want to delete the {trigger} trigger?", + "advantageState": "Advantage State", + "damageOnSave": "Damage on Save" }, "RollField": { "diceRolling": { @@ -125,7 +127,7 @@ } }, "Settings": { - "attackBonus": "Attack Bonus", + "attackModifier": "Attack Modifier", "attackName": "Attack Name", "criticalThreshold": "Critical Threshold", "includeBase": { "label": "Include Item Damage" }, diff --git a/templates/actionTypes/roll.hbs b/templates/actionTypes/roll.hbs index 3e25b9c8..2f257768 100644 --- a/templates/actionTypes/roll.hbs +++ b/templates/actionTypes/roll.hbs @@ -17,13 +17,13 @@
      {{#unless (eq source.type 'spellcast')}} {{#if @root.isNPC}} - {{formField fields.bonus label="Bonus" name="roll.bonus" value=source.bonus placeholder=@root.baseAttackBonus disabled=(not source.type)}} + {{formField fields.bonus label="DAGGERHEART.GENERAL.Modifier.single" name="roll.bonus" value=source.bonus placeholder=@root.baseAttackBonus disabled=(not source.type)}} {{else}} - {{formField fields.trait label="Trait" name="roll.trait" value=source.trait localize=true disabled=(not source.type)}} + {{formField fields.trait label="DAGGERHEART.GENERAL.Trait.single" name="roll.trait" value=source.trait localize=true disabled=(not source.type)}} {{/if}} {{/unless}} - {{formField fields.difficulty label="Difficulty" name="roll.difficulty" value=source.difficulty disabled=(not source.type)}} - {{formField fields.advState label= "Advantage State" name="roll.advState" value=source.advState localize=true disabled=(not source.type)}} + {{formField fields.difficulty label="DAGGERHEART.GENERAL.difficulty" name="roll.difficulty" value=source.difficulty disabled=(not source.type)}} + {{formField fields.advState label="DAGGERHEART.ACTIONS.Config.advantageState" name="roll.advState" value=source.advState localize=true disabled=(not source.type)}}
      {{/if}} \ No newline at end of file diff --git a/templates/actionTypes/save.hbs b/templates/actionTypes/save.hbs index 85536c87..fdadba54 100644 --- a/templates/actionTypes/save.hbs +++ b/templates/actionTypes/save.hbs @@ -2,8 +2,8 @@ {{localize "DAGGERHEART.GENERAL.Roll.reaction"}}

      {{localize "DAGGERHEART.ACTIONS.Settings.saveHint"}}

      - {{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) placeholder=@root.baseSaveDifficulty}} - {{formField fields.damageMod label="Damage on Save" name="save.damageMod" value=source.damageMod localize=true disabled=(not source.trait)}} + {{formField fields.trait label="DAGGERHEART.GENERAL.Trait.single" name="save.trait" value=source.trait localize=true}} + {{formField fields.difficulty label="DAGGERHEART.GENERAL.difficulty" name="save.difficulty" value=source.difficulty disabled=(not source.trait) placeholder=@root.baseSaveDifficulty}} + {{formField fields.damageMod label="DAGGERHEART.ACTIONS.Config.damageOnSave" name="save.damageMod" value=source.damageMod localize=true disabled=(not source.trait)}}
      \ No newline at end of file diff --git a/templates/sheets-settings/adversary-settings/attack.hbs b/templates/sheets-settings/adversary-settings/attack.hbs index c3ee21f6..f829338f 100644 --- a/templates/sheets-settings/adversary-settings/attack.hbs +++ b/templates/sheets-settings/adversary-settings/attack.hbs @@ -11,7 +11,7 @@
      {{localize "DAGGERHEART.GENERAL.attack"}}
      - {{formField systemFields.attack.fields.roll.fields.bonus value=document._source.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackBonus" name="system.attack.roll.bonus" localize=true}} + {{formField systemFields.attack.fields.roll.fields.bonus value=document._source.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackModifier" name="system.attack.roll.bonus" localize=true}} {{formField systemFields.attack.fields.range value=document._source.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}} {{#if systemFields.attack.fields.target.fields}} {{ formField systemFields.attack.fields.target.fields.type value=document._source.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true }}