0.3.3

Author: MrVauxs

CHANGELOG.md

@@ -5,8 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+> Dictionary
+> (P) - A premium version of that animation is available.
+
 ## [Unreleased]
 
+## [0.3.3] - 2024-08-09
+
+### Added
+
+- **New Animations**: Inner Radiance Torrent (P)
+
+### Fixed
+
+- Animations not properly inheriting multi-layer deep options and predicates.
+
 ## [0.3.2] - 2024-08-09
 
 ### Fixed
@@ -31,8 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Item Custom Animations Menu (#3)
 - `opacity`, `size`, `loopProperty`, and `animateProperty` effect options.
 
-  #### Animations
-  - Rage
+  - **New Animations**: Rage
 
 ### Fixed
 
@@ -63,10 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added a toggle to see the predicate data in the Token Image Manager.
 - Added an option to use existing feats in the Token Image Manager.
-
-  #### Animations
-
-  - Jaws
+- **New Animations**: Jaws
 
 ## [0.1.1] - 2024-08-01
 
@@ -80,12 +89,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - "Developer mode" setting. Puts into console what is being played with what roll options. Automatically on in `npm run dev`.
 - Token Image Manager (#4)
-
-  #### Animations
-
-  - Melee Ignition
-  - Jaws
-  - Unarmed Attack / Fist
+- **New Animations**: Melee Ignition, Jaws, Unarmed Attack / Fist
 
 ### Changed
 
@@ -110,22 +114,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `options.shape.value` to `options.shape.type`
-
-  #### Animations
-
-  - Light Pick
-  - Firearm Group
-  - Arquebus
-
-  #### Sounds
-
-  - Chain Lightning / Electric Arc
-  - Bow Shots
-  - Crossbow Shots
-
-  #### Unfinished
-
-  - Actor Animations Menu (#3)
+- **New Animations**: Light Pick, Firearm Group, Arquebus
+- **New Sounds**: Chain Lightning / Electric Arc, Bow Shots, Crossbow Shots
 
 ### Fixed
 
@@ -153,15 +143,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved internal structure
 - Pre-release versions to be semver compliant
 
-  [Unreleased]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.2.0...HEAD
-  [0.2.0]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.1.3...v0.2.0
-  [0.1.3]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.1.2...v0.1.3
-  [0.1.2]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.1.1...v0.1.2
-  [0.1.1]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.1.0...v0.1.1
-  [0.1.0]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.0.9...v0.1.0
-  [0.0.9]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.0.8-alpha...v0.0.9
-
-[Unreleased]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.3.2...HEAD
+[Unreleased]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/MrVauxs/pf2e-graphics/compare/v0.2.1...v0.3.0

animations/spells.json

@@ -101,7 +101,7 @@
 			"file": "jb2a.unarmed_strike.magical.{01,02}.blue"
 		}
 	],
-	"item:slug:fireball": [
+	"origin:item:slug:fireball": [
 		{
 			"trigger": "place-template",
 			"default": true,
@@ -132,5 +132,20 @@
 				}
 			]
 		}
+	],
+	"origin:item:slug:inner-radiance-torrent": [
+		{
+			"trigger": "place-template",
+			"preset": "ranged",
+			"file": "jb2a.ranged.beam.001.01.orange",
+			"options": {
+				"atLocation": {
+					"offset": {
+						"x": 0.5
+					},
+					"gridUnits": true
+				}
+			}
+		}
 	]
-}
+}

src/storage/AnimCore.ts

@@ -1,4 +1,4 @@
-import { ErrorMsg, dedupeStrings, dev, devMessage, findTokenByActor, getPlayerOwners, log, nonNullable } from 'src/utils.ts'
+import { ErrorMsg, dedupeStrings, dev, devMessage, findTokenByActor, getPlayerOwners, log, mergeObjectsConcatArrays, nonNullable } from 'src/utils.ts'
 import type { Entries, TokenOrDoc } from 'src/extensions'
 import { settings } from 'src/settings'
 import { type PresetKeys, presets } from './presets'
@@ -157,20 +157,8 @@ export let AnimCore = class AnimCore {
 		if (!isFolder(folder)) return [folder]
 		const { contents, ...parentProps } = folder
 
-		// Function to merge two arrays without duplicates
-		const mergeArrays = (arr1: PredicateStatement[], arr2: PredicateStatement[]) => {
-			return Array.from(new Set([...(arr1 || []), ...(arr2 || [])]))
-		}
-
 		const mergeProps = (parent: FolderObject, child: AnimationDataObject) => {
-			const result = foundry.utils.mergeObject(child, parent, { overwrite: false })
-
-			// Merge arrays
-			for (const [key, val] of Object.entries(parent) as Entries<FolderObject>) {
-				if (Array.isArray(val) && key !== 'contents') {
-					result[key] = mergeArrays(parent[key], child[key] || [])
-				}
-			}
+			const result = mergeObjectsConcatArrays(parent, child)
 
 			return result
 		}
@@ -344,6 +332,7 @@ interface AnimationDataObject {
 	default?: boolean
 	predicate?: PredicateStatement[]
 	options?: any
+	[key: string]: any
 }
 
 // #endregion

src/storage/presets.ts

@@ -42,6 +42,8 @@ export const helpers = {
 	},
 	genericSequencerFunctions<T extends PresetKeys>(seq: EffectSection, _item: ItemPF2e, _target: Target, options?: EffectOptions<T>) {
 		options = clearEmpties(options || {})
+		if (options?.zIndex)
+			seq.zIndex(options.zIndex)
 		if (options?.scale)
 			seq.scale(options.scale.min, options.scale.max)
 		if (options?.scaleToObject)
@@ -142,6 +144,7 @@ export interface EffectOptions<T extends PresetKeys> {
 	tieToDocuments?: true
 	belowTokens?: boolean
 	waitUntilFinished?: number
+	zIndex?: number
 	duration?: number
 	tint?: string
 	rotate?: number

src/utils.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 /* eslint-disable no-console */
 export class ErrorMsg extends Error {
 	constructor(message: string) {
@@ -74,3 +75,41 @@ export function clearEmpties(o: Record<string, any>) {
 	}
 	return o
 }
+
+type Primitive = string | number | boolean | null | undefined
+type Mergeable = Primitive | MergeableObject | MergeableArray
+type MergeableArray = Mergeable[]
+interface MergeableObject {
+	[key: string]: Mergeable
+}
+
+export function mergeObjectsConcatArrays<T extends MergeableObject, U extends MergeableObject>(obj1: T, obj2: U): T & U {
+	const result: any = {}
+
+	for (const key in obj1) {
+		if (obj1.hasOwnProperty(key)) {
+			if (obj2.hasOwnProperty(key)) {
+				const value1 = obj1[key]
+				const value2 = obj2[key]
+
+				if (Array.isArray(value1) && Array.isArray(value2)) {
+					result[key] = value1.concat(value2)
+				} else if (typeof value1 === 'object' && typeof value2 === 'object' && value1 !== null && value2 !== null) {
+					result[key] = mergeObjectsConcatArrays(value1 as MergeableObject, value2 as MergeableObject)
+				} else {
+					result[key] = value2
+				}
+			} else {
+				result[key] = obj1[key]
+			}
+		}
+	}
+
+	for (const key in obj2) {
+		if (obj2.hasOwnProperty(key) && !result.hasOwnProperty(key)) {
+			result[key] = obj2[key]
+		}
+	}
+
+	return result as T & U
+}

src/view/_components/SubAnimationEditor.svelte

@@ -60,6 +60,7 @@
 					type='text'
 					bind:value={animation.file}
 				/>
+				<!-- svelte-ignore missing-declaration -->
 				<button
 					class='fas fa-database w-min h-full'
 					data-tooltip='SEQUENCER.SidebarButtons.Database'