Merge pull request #1024 from ben/truths-output

Fix truths dialog

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Avoided doing a full load of moves when showing the move sheet, resulting in better performance ([#1023](https://github.com/ben/foundry-ironsworn/pull/1023))
 - Brought back support for the "Custom Moves" folder (also [#1023](https://github.com/ben/foundry-ironsworn/pull/1023))
 - First-start dialog: prevent a situation where an expansion is enabled but not the ruleset it builds on (you shouldn't be able to enable Delve without Ironsworn)
+- Truths dialog: fix some bugs around randomization, journal output, and closing it when done ([#1024](https://github.com/ben/foundry-ironsworn/pull/1024))
 
 ## 1.24.0
 

src/module/journal/journal-entry-page-types.ts

@@ -68,6 +68,7 @@ export interface ClockDataProperties {
 /// ///////// SETTING TRUTH OPTION
 export interface TruthOptionDataSourceData extends DFISettingTruthOption {
 	dfid: string
+	dsid?: string
 	Summary: string
 	Quest: string
 }

src/module/vue/components/truth/truth-category.vue

@@ -10,13 +10,13 @@
 			:key="`truthPage${i}`"
 			ref="selectables"
 			:page="page"
-			:radio-group="dfid"
+			:radio-group="dsid"
 			@change="valueChange"
 		/>
 
 		<CustomTruth
 			ref="customTruth"
-			:radio-group="dfid"
+			:radio-group="dsid"
 			@change="customValueChange"
 		/>
 
@@ -51,7 +51,7 @@ const nonTruthPages = props
 	.je()
 	?.pages.filter((p) => p.type !== 'truth') as NonTruthPage[]
 
-const dfid = props.je().getFlag('foundry-ironsworn', 'dfid') as string
+const dsid = props.je().getFlag('foundry-ironsworn', 'dsid') as string
 
 const state = reactive<{
 	title?: string

src/module/vue/components/truth/truth-selectable.vue

@@ -1,7 +1,7 @@
 <template>
 	<label class="nogrow flexrow">
 		<input
-			ref="topRadio"
+			:checked="selected"
 			type="radio"
 			class="nogrow"
 			:name="radioGroup"
@@ -28,7 +28,7 @@
 						ref="suboptions"
 						type="radio"
 						class="nogrow"
-						:name="pageSystem.dfid"
+						:name="pageSystem.dsid"
 						@change="subtableSelect(entry)"
 					/>
 					<p v-html="entry.text" />
@@ -48,7 +48,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { ref } from 'vue'
 import type { IronswornJournalPage } from '../../../journal/journal-entry-page'
 import type { TruthOptionDataPropertiesData } from '../../../journal/journal-entry-page-types'
 import { OracleTableResult } from '../../../roll-table/oracle-table-result'
@@ -60,25 +60,27 @@ const props = defineProps<{
 }>()
 const pageSystem = props.page.system as TruthOptionDataPropertiesData
 
-const topRadio = ref<HTMLElement>()
-const state = reactive({ suboption: undefined as string | undefined })
+const selected = ref(false)
+
+const suboption = ref<string | undefined>()
 function subtableSelect(entry: OracleTableResult) {
-	state.suboption = entry.text
-	topRadio.value?.click()
+	suboption.value = entry.text
+	selected.value = true
 	emitValue()
 }
 
 const $emit = defineEmits<{
 	change: [string, string] // title, text
 }>()
 function emitValue() {
-	let text = `${pageSystem.Description} ${state.suboption ?? ''}\n\n_${
+	let text = `${pageSystem.Description} ${suboption ?? ''}\n\n_${
 		pageSystem.Quest
 	}_`
+
 	const template = pageSystem['Roll template']
-	if (state.suboption && template?.Description) {
+	if (suboption.value && template?.Description) {
 		text =
-			template.Description.replace(/\${{.*?}}/, state.suboption) +
+			template.Description.replace(/{{table>.*?}}/, `> ${suboption.value}`) +
 			`\n\n_${pageSystem.Quest}_`
 	}
 	$emit('change', props.page.name ?? '???', text.trim())
@@ -87,11 +89,11 @@ function emitValue() {
 const suboptions = ref<HTMLElement[]>([])
 
 async function selectAndRandomize() {
-	topRadio.value?.click()
+	selected.value = true
 
 	if (
 		props.page.subtable &&
-		((props.page.subtable?.results as any)?.length ?? 0) > 0
+		((props.page.subtable?.results as any)?.size ?? 0) > 0
 	) {
 		const { roll } = await props.page.subtable.draw()
 

src/module/vue/vueapp.ts

@@ -36,7 +36,7 @@ export function VueAppMixin<TBase extends Constructor<Application>>(
 			)
 		}
 
-		setupVueApp(app: App): void {
+		setupVueApp(_app: App): void {
 			// Implement in descendants if needed
 		}
 
@@ -47,6 +47,7 @@ export function VueAppMixin<TBase extends Constructor<Application>>(
 			// Create the Vue App instance
 			if (this.vueApp == null || this.vueRoot == null) {
 				const provides = pickBy(data, (v, k) => k.startsWith('$'))
+				this.localEmitter.on('closeApp', () => this.close())
 
 				this.vueRoot = undefined
 				this.vueApp = createApp({