diff --git a/src/settings.ts b/src/settings.ts index fb2edda5..01eb500b 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -182,17 +182,6 @@ const settingsData = [ default: false, }, }, - { - namespace: 'pf2e-graphics', - key: 'tourNag', - folder: 'PF2e Graphics', - options: { - scope: 'client', - config: false, - type: Boolean, - default: true, - }, - }, ] as const; function conditionalSettings() { diff --git a/src/tours.ts b/src/tours.ts index 9444d36c..79810a8e 100644 --- a/src/tours.ts +++ b/src/tours.ts @@ -103,7 +103,7 @@ export async function registerTours() { } // Post ~~nagging~~ welcome message if client has unstarted PF2e Graphics tours - if (unstartedTourConfigs.length && game.settings.get('pf2e-graphics', 'tourNag')) { + if (unstartedTourConfigs.length) { ChatMessage.create({ style: CONST.CHAT_MESSAGE_STYLES.OOC, speaker: { diff --git a/src/view/ChatMessage/TourNag.svelte b/src/view/ChatMessage/TourNag.svelte index 2094df6d..9e51bebb 100644 --- a/src/view/ChatMessage/TourNag.svelte +++ b/src/view/ChatMessage/TourNag.svelte @@ -5,8 +5,11 @@ export let message: ChatMessagePF2e; const { unstartedTourConfigs } = message.flags['pf2e-graphics'] as { unstartedTourConfigs: TourConfig[] }; - function close() { - window.game.settings.set('pf2e-graphics', 'tourNag', false); + function close(unstartedTourConfigs: TourConfig[]): undefined { + unstartedTourConfigs.forEach((tourConfig) => { + const tour = getTourDoc(tourConfig); + tour.progress(0).then(() => tour.exit()); // Tour isn't completed, so don't complete it 😤 + }); message.delete(); } @@ -20,20 +23,19 @@
Do you want a tour? :)
- {#each unstartedTourConfigs as tour} - {@const tourDoc = getTourDoc(tour)} + {#each unstartedTourConfigs as tourConfig} + {@const tourDoc = getTourDoc(tourConfig)} {/each}