Fix eslint, compress trigger code

MrVauxs · Jul 22, 2024 · dba46d9 · dba46d9
1 parent e1887cd
commit dba46d9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 20 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -20,7 +20,7 @@ export default antfu({
 		'import/no-mutable-exports': 'off',
 		'style/brace-style': ['error', '1tbs', { allowSingleLine: true }],
 		'unused-imports/no-unused-vars': 'warn',
-		'node/prefer-global/process': 'always',
+		'node/prefer-global/process': 0,
 	},
 
 	ignores: [],

diff --git a/src/storage/AnimCore.ts b/src/storage/AnimCore.ts
@@ -1,4 +1,4 @@
-import { ErrorMsg, dedupeStrings, dev, devMessage, findTokenByActor } from 'src/utils.ts'
+import { ErrorMsg, dedupeStrings, dev, devMessage, findTokenByActor, log } from 'src/utils.ts'
 import type { Entries, TokenOrDoc } from 'src/extensions'
 import { settings } from 'src/settings'
 import type { PresetKeys } from './presets'
@@ -171,8 +171,8 @@ export let AnimCore = class AnimCore {
 		if (!actor) actor = item?.actor ?? source?.actor as ActorPF2e | undefined | null
 		if (!source) source = canvas.tokens.placeables.find(x => x.actor?.id === actor?.id)
 		if (!source) {
-			devMessage("No Token Found!")
-			return
+			if (dev) throw new ErrorMsg('findAndAnimate was called with no token present!')
+			return log('No Token Found to animate with! Aborting.')
 		};
 
 		const animationTree = this.getMatchingAnimationTrees(rollOptions, item, game.userId)
@@ -223,6 +223,7 @@ export type TriggerTypes =
 	| 'toggle'
 	| 'startTurn'
 	| 'endTurn'
+	| 'self-effect' // Unimplemented, not sure if there are any applicable use for those message types
 
 interface AnimationDataObject {
 	trigger: TriggerTypes

diff --git a/src/triggers/chatMessage.ts b/src/triggers/chatMessage.ts
@@ -3,7 +3,7 @@ import { devMessage, log } from 'src/utils'
 
 const chatMessageHook = Hooks.on('createChatMessage', (message: ChatMessagePF2e, _options, _id: ChatMessagePF2e['id']) => {
 	const rollOptions = message.flags.pf2e.context?.options ?? []
-	let trigger = message.flags.pf2e.context?.type as TriggerTypes
+	let trigger: TriggerTypes | undefined = message.flags.pf2e.context?.type
 	if (!message.token) return
 
 	if (!trigger) {

diff --git a/src/triggers/effect.ts b/src/triggers/effect.ts
@@ -3,15 +3,13 @@ import { devMessage } from 'src/utils'
 const createItem = Hooks.on('createItem', (item: ItemPF2e, _options, _id: ItemPF2e['id']) => {
 	if (!(item.isOfType('effect') || item.isOfType('condition'))) return
 
-	const trigger = 'effect' as const
-
 	const deliverable = {
 		rollOptions: [...item.getRollOptions(), ...(item.actor?.getRollOptions() ?? [])],
-		trigger,
+		trigger: 'effect' as const,
 		item,
 	}
 
-	devMessage('Effect Hook Data', deliverable)
+	devMessage('Effect Hook Data', deliverable, _options)
 	window.pf2eGraphics.AnimCore.findAndAnimate(deliverable)
 })
 

diff --git a/src/triggers/template.ts b/src/triggers/template.ts
@@ -2,20 +2,17 @@ import { devMessage } from 'src/utils'
 
 const createMeasuredTemplateHook = Hooks.on('createMeasuredTemplate', (template: MeasuredTemplateDocumentPF2e, _options, _id: ChatMessagePF2e['id']) => {
 	const { actor, item, message, flags: { pf2e: { origin } } } = template
-	const trigger = 'place-template' as const
-	const additionalOptions = {}
 
 	const deliverable = {
 		rollOptions: [...(origin?.rollOptions ?? []), ...(message?.actor?.getRollOptions() ?? [])],
-		trigger,
+		trigger: 'place-template' as const,
 		targets: [template],
 		source: message?.token,
 		actor,
 		item,
-		...additionalOptions,
 	}
 
-	devMessage('Template Hook Data', deliverable)
+	devMessage('Template Hook Data', deliverable, _options)
 	window.pf2eGraphics.AnimCore.findAndAnimate(deliverable)
 })
 

diff --git a/src/triggers/toggle.ts b/src/triggers/toggle.ts
@@ -3,16 +3,14 @@ import { devMessage } from 'src/utils'
 function trifectaFunc(item: ItemPF2e, _options: { _id: string, system: Partial<ItemPF2e['system']> }, _id: ItemPF2e['id']) {
 	if (!item.actor || !item.system.rules.length) return
 
-	const trigger = 'toggle' as const
-
 	const deliverable = {
 		rollOptions: [...item.getRollOptions(), ...item.actor.getRollOptions()].sort(),
-		trigger,
+		trigger: 'toggle' as const,
 		actor: item.actor,
 		item,
 	}
 
-	devMessage('Toggle Hook Data', deliverable)
+	devMessage('Toggle Hook Data', deliverable, _options)
 	window.pf2eGraphics.AnimCore.findAndAnimate(deliverable)
 }
 

diff --git a/src/triggers/turn.ts b/src/triggers/turn.ts
@@ -1,14 +1,14 @@
 import { devMessage } from 'src/utils'
 
 function handler({ actor, token }: CombatantPF2e, _encounter: EncounterPF2e, type: 'start' | 'end') {
-	devMessage(`${type.toUpperCase()} Turn Hook Data`, actor)
-
 	const deliverable = {
 		trigger: `${type}Turn` as const,
 		source: token,
 		rollOptions: actor?.getRollOptions() || [],
 		actor,
 	}
+
+	devMessage(`${type.toUpperCase()} Turn Hook Data`, deliverable)
 	window.pf2eGraphics.AnimCore.findAndAnimate(deliverable)
 }