From 9656e62c1c2e24c9eb97122485c950fab1b6cc1f Mon Sep 17 00:00:00 2001 From: Paul Maskelyne Date: Tue, 9 Jul 2024 19:30:22 +0100 Subject: [PATCH] closes #840, closes #841 --- RELEASE_NOTES.md | 2 ++ i18n/en.yaml | 1 - system/src/apps/LevelUpSD.mjs | 1 + system/src/sheets/ActorSheetSD.mjs | 11 ----------- system/templates/actors/player/abilities.hbs | 9 --------- system/templates/actors/player/details.hbs | 8 ++++---- system/templates/apps/level-up.hbs | 18 ++++++++++++++++-- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index da13aef5..d1c63509 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -27,10 +27,12 @@ * [#835] Update Sleep spell description to the latest version * [#837] AC not displaying consistently when adding effects * [#839] Free Carry item calculation wrong if you have duplicate items instead of just using item quantity +* [#841] Compendium item links no longer working in Foundry v12 ## Chores * [#813] Merged Finnish language updates from Crowdin * [#829] Remove all Tours +* [#840] Remove Roll Initiative button from character sheet **NOTE:** We have found that the Tours are very fragile and onerous to maintain; needing to be tested/updated when even minor changes are made to the interface. Therefore we are removing them and will rely on alternate methods of teaching the system. diff --git a/i18n/en.yaml b/i18n/en.yaml index 45efc006..d02b2143 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -682,7 +682,6 @@ SHADOWDARK.sheet.player.luck: Luck SHADOWDARK.sheet.player.melee_attacks: Melee Attacks SHADOWDARK.sheet.player.name.label: Name SHADOWDARK.sheet.player.ranged_attacks: Ranged Attacks -SHADOWDARK.sheet.player.roll_initiative: Roll Initiative SHADOWDARK.sheet.player.spells_from_items: Spells From Items SHADOWDARK.sheet.player.spells_tier: Tier SHADOWDARK.sheet.player.spells: Spells diff --git a/system/src/apps/LevelUpSD.mjs b/system/src/apps/LevelUpSD.mjs index d802cf5e..dccd1cc1 100644 --- a/system/src/apps/LevelUpSD.mjs +++ b/system/src/apps/LevelUpSD.mjs @@ -226,6 +226,7 @@ export default class LevelUpSD extends FormApplication { // checks for effects on talent and prompts if needed let talentObj = await shadowdark.utils.createItemWithEffect(talentItem); talentObj.system.level = this.data.targetLevel; + talentObj.uuid = talentItem.uuid; this.data.talents.push(talentObj); this.render(); } diff --git a/system/src/sheets/ActorSheetSD.mjs b/system/src/sheets/ActorSheetSD.mjs index 1dd3f3ed..f5782576 100644 --- a/system/src/sheets/ActorSheetSD.mjs +++ b/system/src/sheets/ActorSheetSD.mjs @@ -16,10 +16,6 @@ export default class ActorSheetSD extends ActorSheet { event => this._onItemSelection(event) ); - html.find("[data-action='roll-initiative']").click( - event => this._onRollInitiative(event) - ); - html.find("[data-action='show-details']").click( event => shadowdark.utils.toggleItemDetails(event.currentTarget) ); @@ -212,13 +208,6 @@ export default class ActorSheetSD extends ActorSheet { this.actor.rollHP(); } - async _onRollInitiative(event) { - event.preventDefault(); - - // User the default roll available to each Actor / Token - await this.actor.rollInitiative({ createCombatants: false, rerollInitiative: false}); - } - async _onRollAbilityCheck(event) { event.preventDefault(); diff --git a/system/templates/actors/player/abilities.hbs b/system/templates/actors/player/abilities.hbs index b29ca5ed..e5e47acd 100644 --- a/system/templates/actors/player/abilities.hbs +++ b/system/templates/actors/player/abilities.hbs @@ -5,15 +5,6 @@ {{> actors/player/abilities/ac }} {{> actors/player/abilities/luck }} {{> actors/player/abilities/stats }} -
- - - {{localize 'SHADOWDARK.sheet.player.roll_initiative'}} - -
{{> actors/player/abilities/attacks }} diff --git a/system/templates/actors/player/details.hbs b/system/templates/actors/player/details.hbs index 95d102d2..711389b9 100644 --- a/system/templates/actors/player/details.hbs +++ b/system/templates/actors/player/details.hbs @@ -48,7 +48,7 @@
{{#if isSpellcaster}}{{/if}} - {{uuidToName system.class}} + {{uuidToName system.class}}
@@ -88,7 +88,7 @@
- {{uuidToName system.ancestry}} + {{uuidToName system.ancestry}}
@@ -107,7 +107,7 @@
- {{uuidToName system.background}} + {{uuidToName system.background}}
@@ -144,7 +144,7 @@
- {{uuidToName system.deity}} + {{uuidToName system.deity}}
diff --git a/system/templates/apps/level-up.hbs b/system/templates/apps/level-up.hbs index da8c44b0..b8ff4677 100644 --- a/system/templates/apps/level-up.hbs +++ b/system/templates/apps/level-up.hbs @@ -48,7 +48,14 @@ {{#each talents}}
- {{this.name}} + + {{this.name}} +
{{/each}} @@ -75,7 +82,14 @@ {{#if this}}
- {{this.name}} + + {{this.name}} +
{{/if}} {{#unless this}}