diff --git a/src/module/sheets/characterSheet.mjs b/src/module/sheets/characterSheet.mjs index be851e43..fe2cd3f4 100644 --- a/src/module/sheets/characterSheet.mjs +++ b/src/module/sheets/characterSheet.mjs @@ -254,6 +254,7 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) { } static #startResting(event, target) { + const dialog = new RestingDialog(this.document) dialog.render(true) @@ -355,6 +356,7 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) { event.preventDefault() await this.document.update(formData.object) + return false } static async #rollDamage(event, target) { diff --git a/src/templates/actor/character/main-sheet.hbs b/src/templates/actor/character/main-sheet.hbs index 611361ed..46abb8ec 100644 --- a/src/templates/actor/character/main-sheet.hbs +++ b/src/templates/actor/character/main-sheet.hbs @@ -56,7 +56,7 @@ {{/if}} {{#each attacks}} @@ -130,14 +130,14 @@
- - - - + + + + {{#if this.hasLiturgies}} - {{/if}} + {{/if}} {{#if this.hasSpells}} - {{/if}} + {{/if}}
diff --git a/src/templates/actor/character/standalone/bagpack.hbs b/src/templates/actor/character/standalone/bagpack.hbs index 1ab325de..afe6b862 100644 --- a/src/templates/actor/character/standalone/bagpack.hbs +++ b/src/templates/actor/character/standalone/bagpack.hbs @@ -10,8 +10,8 @@
- - + +
diff --git a/src/templates/actor/character/tab-effects.hbs b/src/templates/actor/character/tab-effects.hbs index eb492c9c..ee33faf2 100644 --- a/src/templates/actor/character/tab-effects.hbs +++ b/src/templates/actor/character/tab-effects.hbs @@ -18,7 +18,7 @@ {{this.conditions}} {{#if ../isGM}} - {{/if}} {{/each}} diff --git a/src/templates/actor/character/tab-equipment.hbs b/src/templates/actor/character/tab-equipment.hbs index 4d725738..04a48d60 100644 --- a/src/templates/actor/character/tab-equipment.hbs +++ b/src/templates/actor/character/tab-equipment.hbs @@ -18,8 +18,8 @@

Inventar

- - + +
diff --git a/src/templates/actor/character/tab-set.hbs b/src/templates/actor/character/tab-set.hbs index ef59c810..e383d2b6 100644 --- a/src/templates/actor/character/tab-set.hbs +++ b/src/templates/actor/character/tab-set.hbs @@ -15,9 +15,9 @@ {{/each}} {{#if setEquipped}} - + {{else}} - + {{/if}} diff --git a/src/templates/actor/character/tab-set2.hbs b/src/templates/actor/character/tab-set2.hbs index 43b5bb2c..d5f0b1f5 100644 --- a/src/templates/actor/character/tab-set2.hbs +++ b/src/templates/actor/character/tab-set2.hbs @@ -19,9 +19,9 @@ src="{{this.icon}}"/>
{{/each}} {{#if (eq ../actor.system.setEquipped @index)}} - + {{else}} - + {{/if}} diff --git a/src/templates/actor/character/tab-set3.hbs b/src/templates/actor/character/tab-set3.hbs index 93264641..a274668b 100644 --- a/src/templates/actor/character/tab-set3.hbs +++ b/src/templates/actor/character/tab-set3.hbs @@ -19,9 +19,9 @@ src="{{this.icon}}"/> {{/each}} {{#if (eq ../actor.system.setEquipped @index)}} - + {{else}} - + {{/if}} diff --git a/src/templates/actor/creature/tab-attacks.hbs b/src/templates/actor/creature/tab-attacks.hbs index b1020e5a..38e3d070 100644 --- a/src/templates/actor/creature/tab-attacks.hbs +++ b/src/templates/actor/creature/tab-attacks.hbs @@ -45,9 +45,8 @@ value="{{this.tp}}"/> - + {{/each}} @@ -73,7 +72,7 @@ - diff --git a/src/templates/actor/merchant/tab-goods.hbs b/src/templates/actor/merchant/tab-goods.hbs index ab61828f..3b64a298 100644 --- a/src/templates/actor/merchant/tab-goods.hbs +++ b/src/templates/actor/merchant/tab-goods.hbs @@ -8,7 +8,7 @@ {{this.name}} {{currency this.system.price}} - + {{/each}} diff --git a/src/templates/actor/merchant/tab-services.hbs b/src/templates/actor/merchant/tab-services.hbs index ca964624..348d4650 100644 --- a/src/templates/actor/merchant/tab-services.hbs +++ b/src/templates/actor/merchant/tab-services.hbs @@ -21,7 +21,7 @@ -
@@ -42,7 +42,7 @@ {{#unless (lte this.availability 0)}}{{this.availability}}{{/unless}} - +
{{/if}} {{/each}} diff --git a/src/templates/dialog/attribute-dialog.hbs b/src/templates/dialog/attribute-dialog.hbs index c7084995..01f10935 100644 --- a/src/templates/dialog/attribute-dialog.hbs +++ b/src/templates/dialog/attribute-dialog.hbs @@ -51,7 +51,7 @@ - \ No newline at end of file diff --git a/src/templates/dialog/battle-dialog.hbs b/src/templates/dialog/battle-dialog.hbs index 39e620ef..37aabcee 100644 --- a/src/templates/dialog/battle-dialog.hbs +++ b/src/templates/dialog/battle-dialog.hbs @@ -13,7 +13,7 @@ - + @@ -338,7 +338,7 @@
{{/if}} - + {{#if (or (not defenseTalents) (not defenseAttributes))}}
diff --git a/src/templates/dialog/combat-action.hbs b/src/templates/dialog/combat-action.hbs index d5a4688a..0974cefe 100644 --- a/src/templates/dialog/combat-action.hbs +++ b/src/templates/dialog/combat-action.hbs @@ -57,7 +57,7 @@
-
diff --git a/src/templates/dialog/defense-action.hbs b/src/templates/dialog/defense-action.hbs index c9724512..cfd94c2a 100644 --- a/src/templates/dialog/defense-action.hbs +++ b/src/templates/dialog/defense-action.hbs @@ -43,7 +43,7 @@
-
diff --git a/src/templates/dialog/liturgy-dialog.hbs b/src/templates/dialog/liturgy-dialog.hbs index 4ff69552..963fceb0 100644 --- a/src/templates/dialog/liturgy-dialog.hbs +++ b/src/templates/dialog/liturgy-dialog.hbs @@ -54,7 +54,7 @@ {{this.displayRank}} {{this.mod}} - @@ -74,7 +74,7 @@ - + @@ -97,7 +97,7 @@ - \ No newline at end of file diff --git a/src/templates/dialog/resting-dialog.hbs b/src/templates/dialog/resting-dialog.hbs index afae5b85..ac4dd9af 100644 --- a/src/templates/dialog/resting-dialog.hbs +++ b/src/templates/dialog/resting-dialog.hbs @@ -71,5 +71,5 @@ - + \ No newline at end of file diff --git a/src/templates/dialog/spell-dialog.hbs b/src/templates/dialog/spell-dialog.hbs index 1fdcaad1..ef78f0f4 100644 --- a/src/templates/dialog/spell-dialog.hbs +++ b/src/templates/dialog/spell-dialog.hbs @@ -63,7 +63,7 @@ {{/if}} - @@ -137,11 +137,11 @@
- -
diff --git a/src/templates/dialog/talent-dialog.hbs b/src/templates/dialog/talent-dialog.hbs index e8c0cfc2..f5a143ff 100644 --- a/src/templates/dialog/talent-dialog.hbs +++ b/src/templates/dialog/talent-dialog.hbs @@ -51,7 +51,7 @@ - \ No newline at end of file diff --git a/src/templates/item/activeeffect/main-sheet.hbs b/src/templates/item/activeeffect/main-sheet.hbs index ce7a83a5..67061742 100644 --- a/src/templates/item/activeeffect/main-sheet.hbs +++ b/src/templates/item/activeeffect/main-sheet.hbs @@ -4,7 +4,7 @@ {{name}} - diff --git a/src/templates/item/deity-sheet.hbs b/src/templates/item/deity-sheet.hbs index a84e4020..e78318c0 100644 --- a/src/templates/item/deity-sheet.hbs +++ b/src/templates/item/deity-sheet.hbs @@ -48,7 +48,7 @@ {{#each liturgies.rank0}}
{{this.name}} -
{{/each}} @@ -61,7 +61,7 @@ {{#each liturgies.rank1}}
{{this.name}} -
{{/each}} @@ -74,7 +74,7 @@ {{#each liturgies.rank2}}
{{this.name}} -
{{/each}} @@ -87,7 +87,7 @@ {{#each liturgies.rank3}}
{{this.name}} -
{{/each}} @@ -100,7 +100,7 @@ {{#each liturgies.rank4}}
{{this.name}} -
{{/each}} @@ -113,7 +113,7 @@ {{#each liturgies.rank5}}
{{this.name}} -
{{/each}} @@ -126,7 +126,7 @@ {{#each liturgies.rank6}}
{{this.name}} -
{{/each}} @@ -139,7 +139,7 @@ {{#each liturgies.rank7}}
{{this.name}} -
{{/each}} @@ -152,7 +152,7 @@ {{#each liturgies.rank8}}
{{this.name}} -
{{/each}} diff --git a/src/templates/item/liturgy/tab-commonality.hbs b/src/templates/item/liturgy/tab-commonality.hbs index 7d42bd49..5bc412c9 100644 --- a/src/templates/item/liturgy/tab-commonality.hbs +++ b/src/templates/item/liturgy/tab-commonality.hbs @@ -15,7 +15,7 @@
- +
@@ -27,7 +27,7 @@ {{this.name}} Grad {{grad}} {{#if ../editable}} - {{/if}} diff --git a/src/templates/ui/partial-cooldown.hbs b/src/templates/ui/partial-cooldown.hbs index d6cb26ee..9a222567 100644 --- a/src/templates/ui/partial-cooldown.hbs +++ b/src/templates/ui/partial-cooldown.hbs @@ -7,7 +7,7 @@ data-action="activateCooldown" {{/if}} data-cooldown-id="{{@key}}">{{this.title}} - diff --git a/src/templates/ui/tab-variants.hbs b/src/templates/ui/tab-variants.hbs index eca37418..b65e8dbe 100644 --- a/src/templates/ui/tab-variants.hbs +++ b/src/templates/ui/tab-variants.hbs @@ -6,9 +6,9 @@ - - @@ -91,7 +91,7 @@ {{/if}} {{/if}} - @@ -100,7 +100,7 @@ - @@ -116,7 +116,7 @@ - @@ -125,7 +125,7 @@ - @@ -134,7 +134,7 @@ {{/if}} -