From 08c8796f1bf480040c25c6b25ad0e3285b852720 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Thu, 29 Aug 2024 10:57:23 -0700
Subject: [PATCH 1/5] Move moverow into a directory

---
 .../vue/components/{ => move}/sf-moverow.vue  | 27 ++++++++++---------
 .../vue/components/sf-move-category-rows.vue  |  2 +-
 .../vue/components/sf-movesheetmoves.vue      |  2 +-
 src/module/vue/components/site/site-moves.vue |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)
 rename src/module/vue/components/{ => move}/sf-moverow.vue (88%)

diff --git a/src/module/vue/components/sf-moverow.vue b/src/module/vue/components/move/sf-moverow.vue
similarity index 88%
rename from src/module/vue/components/sf-moverow.vue
rename to src/module/vue/components/move/sf-moverow.vue
index e6c0bc6a6..cce3682e3 100644
--- a/src/module/vue/components/sf-moverow.vue
+++ b/src/module/vue/components/move/sf-moverow.vue
@@ -77,20 +77,21 @@
 
 <script setup lang="ts">
 import { computed, onMounted, provide, ref, watch } from 'vue'
-import type { DisplayMove } from '../../features/custommoves'
-import type { IOracleTreeNode } from '../../features/customoracles'
-import type { IronswornItem } from '../../item/item'
-import { moveHasRollableOptions } from '../../rolls/preroll-dialog'
-import BtnRollmove from './buttons/btn-rollmove.vue'
-import BtnSendmovetochat from './buttons/btn-sendmovetochat.vue'
-import OracleTreeNode from './oracle-tree-node.vue'
-import RulesTextMove from './rules-text/rules-text-move.vue'
-import Collapsible from './collapsible/collapsible.vue'
-import BtnOracle from './buttons/btn-oracle.vue'
-import { ItemKey, $ItemKey } from '../provisions.js'
-import { enrichMarkdown } from '../vue-plugin.js'
+import type { DisplayMove } from '../../../features/custommoves'
+import type { IOracleTreeNode } from '../../../features/customoracles'
+import type { IronswornItem } from '../../../item/item'
+import { moveHasRollableOptions } from '../../../rolls/preroll-dialog'
+import { ItemKey, $ItemKey } from '../../provisions.js'
+import { enrichMarkdown } from '../../vue-plugin.js'
 import { compact, uniq } from 'lodash-es'
-import { OracleTable } from '../../roll-table/oracle-table'
+import { OracleTable } from '../../../roll-table/oracle-table'
+
+import BtnRollmove from '../buttons/btn-rollmove.vue'
+import BtnSendmovetochat from '../buttons/btn-sendmovetochat.vue'
+import OracleTreeNode from '../oracle-tree-node.vue'
+import RulesTextMove from '../rules-text/rules-text-move.vue'
+import Collapsible from '../collapsible/collapsible.vue'
+import BtnOracle from '../buttons/btn-oracle.vue'
 
 const props = withDefaults(
 	defineProps<{
diff --git a/src/module/vue/components/sf-move-category-rows.vue b/src/module/vue/components/sf-move-category-rows.vue
index 11906a4fd..7ab7eab4b 100644
--- a/src/module/vue/components/sf-move-category-rows.vue
+++ b/src/module/vue/components/sf-move-category-rows.vue
@@ -39,7 +39,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 import type { DisplayMoveCategory } from '../../features/custommoves.js'
-import SfMoverow from './sf-moverow.vue'
+import SfMoverow from './move/sf-moverow.vue'
 import Collapsible from './collapsible/collapsible.vue'
 import { snakeCase } from 'lodash-es'
 import { enrichMarkdown } from '../vue-plugin'
diff --git a/src/module/vue/components/sf-movesheetmoves.vue b/src/module/vue/components/sf-movesheetmoves.vue
index acf4a8de0..c550b44bc 100644
--- a/src/module/vue/components/sf-movesheetmoves.vue
+++ b/src/module/vue/components/sf-movesheetmoves.vue
@@ -60,7 +60,7 @@ import { computed, nextTick, provide, reactive, ref } from 'vue'
 import type { DisplayMoveCategory } from '../../features/custommoves'
 import { createMergedMoveTree } from '../../features/custommoves'
 import SfMoveCategoryRows from './sf-move-category-rows.vue'
-import SfMoverow from './sf-moverow.vue'
+import SfMoverow from './move/sf-moverow.vue'
 import IronBtn from './buttons/iron-btn.vue'
 
 const state = reactive({
diff --git a/src/module/vue/components/site/site-moves.vue b/src/module/vue/components/site/site-moves.vue
index f4bafd9f7..7eba2b3a6 100644
--- a/src/module/vue/components/site/site-moves.vue
+++ b/src/module/vue/components/site/site-moves.vue
@@ -83,7 +83,7 @@ import { $ActorKey, ActorKey } from '../../provisions'
 import BtnOracle from '../buttons/btn-oracle.vue'
 import BtnRollmove from '../buttons/btn-rollmove.vue'
 
-import SfMoverow from '../sf-moverow.vue'
+import SfMoverow from '../move/sf-moverow.vue'
 
 const site = inject(ActorKey) as Ref<ActorSource<'site'>>
 const $site = inject($ActorKey) as IronswornActor<'site'>

From 62e1c039e29726108a1ad64623f9e7f052b98b97 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Thu, 29 Aug 2024 11:35:48 -0700
Subject: [PATCH 2/5] Restructure moves to only require index data until
 expansion

---
 src/module/datasworn2/finding.ts              |  7 +-
 src/module/features/custommoves.ts            | 14 +++-
 src/module/rolls/preroll-dialog.ts            |  6 +-
 .../components/buttons/btn-sendmovetochat.vue | 14 ++--
 .../vue/components/move/move-content.vue      | 71 +++++++++++++++++++
 src/module/vue/components/move/sf-moverow.vue | 53 +++-----------
 6 files changed, 108 insertions(+), 57 deletions(-)
 create mode 100644 src/module/vue/components/move/move-content.vue

diff --git a/src/module/datasworn2/finding.ts b/src/module/datasworn2/finding.ts
index 409df6418..8913576bf 100644
--- a/src/module/datasworn2/finding.ts
+++ b/src/module/datasworn2/finding.ts
@@ -62,10 +62,13 @@ interface PackAndIndex {
 
 export async function getPackAndIndexForCompendiumKey(
 	ruleset: DataswornRulesetKey,
-	type: keyof typeof COMPENDIUM_KEY_MAP
+	type: keyof typeof COMPENDIUM_KEY_MAP,
+	additionalFields?: string[]
 ): Promise<PackAndIndex> {
 	const pack = game.packs.get(COMPENDIUM_KEY_MAP[type][ruleset])
-	const index = await pack?.getIndex({ fields: ['flags'] })
+	const index = await pack?.getIndex({
+		fields: ['flags', ...((additionalFields ?? []) as any[])]
+	})
 	return { pack, index }
 }
 
diff --git a/src/module/features/custommoves.ts b/src/module/features/custommoves.ts
index 3b9aabd43..7a54dc5e9 100644
--- a/src/module/features/custommoves.ts
+++ b/src/module/features/custommoves.ts
@@ -5,6 +5,7 @@ import {
 } from '../datasworn2'
 import { DataswornRulesetKey, IronswornSettings } from '../helpers/settings'
 import type { Move, MoveCategory } from '@datasworn/core/dist/Datasworn'
+import { moveTriggerIsRollable } from '../rolls/preroll-dialog'
 
 interface DisplayMoveRuleset {
 	displayName: string
@@ -22,6 +23,9 @@ export interface DisplayMove {
 	color: string | null
 	displayName: string
 	uuid: string
+	triggerText?: string
+	isRollable: boolean
+	oracles: string[]
 	ds?: Move
 }
 
@@ -29,7 +33,10 @@ const INDEXES: Record<string, any> = {}
 async function ensureIndex(rsKey: DataswornRulesetKey) {
 	const compendiumKey = COMPENDIUM_KEY_MAP.move[rsKey]
 	if (INDEXES[compendiumKey] == null) {
-		const { index } = await getPackAndIndexForCompendiumKey(rsKey, 'move')
+		const { index } = await getPackAndIndexForCompendiumKey(rsKey, 'move', [
+			'system.Trigger',
+			'system.dsOracleIds'
+		])
 		INDEXES[compendiumKey] = index
 	}
 }
@@ -55,6 +62,9 @@ export async function createMoveTreeForRuleset(
 					color: move.color ?? null,
 					displayName: move.name,
 					uuid: indexEntry.uuid, // TODO: move.uuid
+					triggerText: indexEntry.system?.Trigger?.Text,
+					isRollable: moveTriggerIsRollable(indexEntry?.system?.Trigger),
+					oracles: indexEntry.system?.dsOracleIds ?? [],
 					ds: move
 				}
 			})
@@ -68,6 +78,8 @@ export async function createMergedMoveTree(): Promise<DisplayMoveRuleset[]> {
 	return await Promise.all(
 		IronswornSettings.enabledRulesets.map(createMoveTreeForRuleset)
 	)
+
+	// TODO: custom move folder
 }
 
 // TODO dataforged has a key for move colours...., but they appear to have changed significantly since the last time i updated them! they'll be fixed for 2.0, but until then, here's a workaround.
diff --git a/src/module/rolls/preroll-dialog.ts b/src/module/rolls/preroll-dialog.ts
index 2fac7bb38..35dba06e0 100644
--- a/src/module/rolls/preroll-dialog.ts
+++ b/src/module/rolls/preroll-dialog.ts
@@ -58,10 +58,8 @@ function rollableOptions(trigger: SFMoveTrigger) {
 	)
 }
 
-export function moveHasRollableOptions(move: IronswornItem<'sfmove'>) {
-	if (!move.assert('sfmove')) return false
-	const options = rollableOptions(move.system.Trigger)
-	return options.length > 0
+export function moveTriggerIsRollable(trigger?: SFMoveTrigger) : boolean {
+	return !!trigger && rollableOptions(trigger).length > 0
 }
 
 export function getStatData(
diff --git a/src/module/vue/components/buttons/btn-sendmovetochat.vue b/src/module/vue/components/buttons/btn-sendmovetochat.vue
index 632ace4ca..7ffe34a4d 100644
--- a/src/module/vue/components/buttons/btn-sendmovetochat.vue
+++ b/src/module/vue/components/buttons/btn-sendmovetochat.vue
@@ -13,22 +13,22 @@
 </template>
 
 <script setup lang="ts">
-import { inject } from 'vue'
 import { createSfMoveChatMessage } from '../../../chat/sf-move-chat-message'
 import type { DisplayMove } from '../../../features/custommoves'
-import { $ItemKey } from '../../provisions.js'
 import IronBtn from './iron-btn.vue'
+import { IronswornItem } from '../../../item/item'
 
 interface Props
 	extends /* @vue-ignore */ Omit<PropsOf<typeof IronBtn>, 'tooltip'> {
 	move: DisplayMove
 }
 
-defineProps<Props>()
+const props = defineProps<Props>()
 
-const $item = inject($ItemKey)
-
-function sendToChat(e) {
-	if ($item) createSfMoveChatMessage($item)
+async function sendToChat(e) {
+	const foundryMove = (await fromUuid(
+		props.move.uuid
+	)) as IronswornItem<'sfmove'>
+	if (foundryMove) createSfMoveChatMessage(foundryMove)
 }
 </script>
diff --git a/src/module/vue/components/move/move-content.vue b/src/module/vue/components/move/move-content.vue
new file mode 100644
index 000000000..f447a5844
--- /dev/null
+++ b/src/module/vue/components/move/move-content.vue
@@ -0,0 +1,71 @@
+<template>
+	<RulesTextMove
+		:data="moveObj"
+		:is-progress-move="foundryMove.system.isProgressMove"
+		:class="$style.summary"
+	>
+		<template #after-footer>
+			<OracleTreeNode
+				v-for="node of oracleNodes"
+				:key="node.displayName"
+				:class="$style.oracle"
+				:node="node"
+			/>
+		</template>
+	</RulesTextMove>
+</template>
+
+<script setup lang="ts">
+import { ref, provide } from 'vue'
+import { uniq, compact } from 'lodash-es'
+import { IronswornItem } from '../../../item/item'
+import { OracleTable } from '../../../roll-table/oracle-table'
+import { ItemKey, $ItemKey } from '../../provisions.js'
+import type { DisplayMove } from '../../../features/custommoves'
+import type { IOracleTreeNode } from '../../../features/customoracles'
+
+import RulesTextMove from '../rules-text/rules-text-move.vue'
+import OracleTreeNode from '../oracle-tree-node.vue'
+
+const props = defineProps<{
+	move: DisplayMove
+}>()
+
+const foundryMove = (await fromUuid(props.move.uuid)) as IronswornItem<'sfmove'>
+const moveObj = ref(foundryMove.toObject())
+provide(ItemKey, moveObj as any)
+provide($ItemKey, foundryMove)
+
+const oracleDsIds = uniq([
+	...(foundryMove?.system?.dsOracleIds ?? []),
+	...Object.values(props.move.ds?.oracles ?? {}).map((x) => x._id)
+])
+const oracleNodes: IOracleTreeNode[] = await Promise.all(
+	oracleDsIds.map(async (oid) => {
+		const t = await OracleTable.getByDsId(oid)
+		return {
+			displayName: t?.name ?? '(missing)',
+			tables: compact([t?.uuid]),
+			children: []
+		}
+	})
+)
+</script>
+
+<style lang="scss" module>
+.oracle {
+	border-width: var(--ironsworn-border-width-md);
+	border-style: solid;
+	border-radius: var(--ironsworn-border-radius-sm);
+	border-color: var(--ironsworn-color-border);
+	padding: 0;
+
+	h4 {
+		font-size: var(--font-size-16);
+
+		button.icon-button {
+			height: inherit;
+		}
+	}
+}
+</style>
diff --git a/src/module/vue/components/move/sf-moverow.vue b/src/module/vue/components/move/sf-moverow.vue
index cce3682e3..2803ec5c3 100644
--- a/src/module/vue/components/move/sf-moverow.vue
+++ b/src/module/vue/components/move/sf-moverow.vue
@@ -5,7 +5,7 @@
 		class="movesheet-row"
 		:class="$style.wrapper"
 		data-tooltip-direction="LEFT"
-		:base-id="`move_row_${item._id}`"
+		:base-id="`move_row_${move.uuid}`"
 		:content-wrapper-class="$style.contentWrapper"
 		:toggle-wrapper-is="`h${headingLevel}`"
 		:toggle-section-class="[$style.toggleSection, toggleSectionClass]"
@@ -15,8 +15,7 @@
 		:toggle-wrapper-class="$style.toggleWrapper"
 		:toggle-label="move?.displayName"
 		:data-highlighted="dataHighlight"
-		:data-move-id="item._id"
-		:data-move-uuid="$item.uuid"
+		:data-move-uuid="move.uuid"
 	>
 		<template #after-toggle>
 			<section
@@ -28,10 +27,10 @@
 				<slot name="controls">
 					<slot
 						name="btn-roll-move"
-						v-bind="{ disabled: !canRoll, move, class: $style.btn }"
+						v-bind="{ disabled: !move.isRollable, move, class: $style.btn }"
 					>
 						<BtnRollmove
-							:disabled="!canRoll"
+							:disabled="!move.isRollable"
 							:move="move"
 							:class="$style.btn"
 						/>
@@ -57,41 +56,23 @@
 			</section>
 		</template>
 		<template #default>
-			<RulesTextMove
-				:data="item"
-				:is-progress-move="$item.system.isProgressMove"
-				:class="$style.summary"
-			>
-				<template #after-footer>
-					<OracleTreeNode
-						v-for="node of oracleNodes"
-						:key="node.displayName"
-						:class="$style.oracle"
-						:node="node"
-					/>
-				</template>
-			</RulesTextMove>
+			<MoveContent :move="move" />
 		</template>
 	</Collapsible>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, provide, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import type { DisplayMove } from '../../../features/custommoves'
 import type { IOracleTreeNode } from '../../../features/customoracles'
-import type { IronswornItem } from '../../../item/item'
-import { moveHasRollableOptions } from '../../../rolls/preroll-dialog'
-import { ItemKey, $ItemKey } from '../../provisions.js'
-import { enrichMarkdown } from '../../vue-plugin.js'
-import { compact, uniq } from 'lodash-es'
+import { compact } from 'lodash-es'
 import { OracleTable } from '../../../roll-table/oracle-table'
 
 import BtnRollmove from '../buttons/btn-rollmove.vue'
 import BtnSendmovetochat from '../buttons/btn-sendmovetochat.vue'
-import OracleTreeNode from '../oracle-tree-node.vue'
-import RulesTextMove from '../rules-text/rules-text-move.vue'
 import Collapsible from '../collapsible/collapsible.vue'
 import BtnOracle from '../buttons/btn-oracle.vue'
+import MoveContent from './move-content.vue'
 
 const props = withDefaults(
 	defineProps<{
@@ -126,20 +107,10 @@ const props = withDefaults(
 	}
 )
 
-const $item = (await fromUuid(props.move.uuid)) as IronswornItem<'sfmove'>
-const item = ref($item.toObject())
-
-provide(ItemKey, item as any)
-provide($ItemKey, $item)
-
 const $collapsible = ref<typeof Collapsible>()
 
-const oracleDsIds = uniq([
-	...($item?.system?.dsOracleIds ?? []),
-	...Object.values(props.move.ds?.oracles ?? {}).map((x) => x._id)
-])
 const oracleNodes: IOracleTreeNode[] = await Promise.all(
-	oracleDsIds.map(async (oid) => {
+	props.move.oracles.map(async (oid) => {
 		const t = await OracleTable.getByDsId(oid)
 		return {
 			displayName: t?.name ?? '(missing)',
@@ -149,15 +120,11 @@ const oracleNodes: IOracleTreeNode[] = await Promise.all(
 	})
 )
 
-const canRoll = computed(() => {
-	return moveHasRollableOptions($item)
-})
 const preventOracle = computed(() => {
 	return oracleNodes.length !== 1
 })
 
-const toggleTooltip = ref($item.system.Trigger?.Text)
-enrichMarkdown(toggleTooltip.value).then((x) => (toggleTooltip.value = x))
+const toggleTooltip = props.move.triggerText
 
 const dataHighlight = ref(false)
 async function flashHighlight() {

From d42018edafb8d1b3cc0797f144e91ea8ed9023c7 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Thu, 29 Aug 2024 13:15:58 -0700
Subject: [PATCH 3/5] Reinstate custom moves folder

---
 src/module/features/custommoves.ts | 47 ++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/module/features/custommoves.ts b/src/module/features/custommoves.ts
index 7a54dc5e9..2dc26cca4 100644
--- a/src/module/features/custommoves.ts
+++ b/src/module/features/custommoves.ts
@@ -6,6 +6,9 @@ import {
 import { DataswornRulesetKey, IronswornSettings } from '../helpers/settings'
 import type { Move, MoveCategory } from '@datasworn/core/dist/Datasworn'
 import { moveTriggerIsRollable } from '../rolls/preroll-dialog'
+import { compact } from 'lodash-es'
+import { IronswornItem } from '../item/item'
+import { SFMoveModel } from '../item/subtypes/sfmove'
 
 interface DisplayMoveRuleset {
 	displayName: string
@@ -72,14 +75,48 @@ export async function createMoveTreeForRuleset(
 	}
 }
 
+function customFolderMoveCategory(): DisplayMoveRuleset | undefined {
+	const name = game.i18n.localize('IRONSWORN.MOVES.Custom Moves')
+	const rootFolder = game.items?.directory?.folders.find((x) => x.name === name)
+	if (!rootFolder) return undefined
+
+	const category: DisplayMoveCategory = {
+		displayName: name,
+		color: (rootFolder as any).color?.css ?? null,
+		moves: []
+	}
+
+	for (const item of rootFolder.contents) {
+		if (!(item instanceof IronswornItem)) continue
+		if (item.type !== 'sfmove') continue
+		const system = item.system as SFMoveModel
+
+		category.moves.push({
+			displayName: item.name ?? '(unnamed)',
+			uuid: item.uuid,
+			color: null,
+			isRollable: moveTriggerIsRollable(system.Trigger),
+			oracles: system.dsOracleIds ?? [],
+			triggerText: system.Trigger?.Text
+		})
+	}
+	if (category.moves.length === 0) return undefined
+	console.log(category)
+	return {
+		displayName: name,
+		categories: [category]
+	}
+}
+
 export async function createMergedMoveTree(): Promise<DisplayMoveRuleset[]> {
 	// Pre-load compendium indexes
 	await Promise.all(IronswornSettings.enabledRulesets.map(ensureIndex))
-	return await Promise.all(
-		IronswornSettings.enabledRulesets.map(createMoveTreeForRuleset)
-	)
-
-	// TODO: custom move folder
+	return compact([
+		...(await Promise.all(
+			IronswornSettings.enabledRulesets.map(createMoveTreeForRuleset)
+		)),
+		customFolderMoveCategory()
+	])
 }
 
 // TODO dataforged has a key for move colours...., but they appear to have changed significantly since the last time i updated them! they'll be fixed for 2.0, but until then, here's a workaround.

From 8fd632324be33944beeb908190fccd4fdb3f2f32 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Thu, 29 Aug 2024 13:18:04 -0700
Subject: [PATCH 4/5] Cleanup

---
 src/module/features/custommoves.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/features/custommoves.ts b/src/module/features/custommoves.ts
index 2dc26cca4..a2975903f 100644
--- a/src/module/features/custommoves.ts
+++ b/src/module/features/custommoves.ts
@@ -101,7 +101,7 @@ function customFolderMoveCategory(): DisplayMoveRuleset | undefined {
 		})
 	}
 	if (category.moves.length === 0) return undefined
-	console.log(category)
+
 	return {
 		displayName: name,
 		categories: [category]

From fbb2a18b8825e591aca5472d7023bd335c81b44c Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Thu, 29 Aug 2024 13:20:32 -0700
Subject: [PATCH 5/5] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 713605648..8ff05da80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next Release
 
+- Brought back support for the "Custom Moves" folder ([#1023](https://github.com/ben/foundry-ironsworn/pull/1023))
+
 ## 1.24.0
 
 This is a major update that includes Sundered Isles content, but also brings along a host of changes: