Version bump

- context menu option to clone filter selector filters
- fixed scroll position targeting for PresetSearch app
- implemented sorting for filter drag/drop placeables detection
- control and form added to allow editing of preset name/defaultTexture
- expanded preset searches to the param types
- updating default presets to include latest filters

Author: Aedif

CHANGELOG.md

@@ -1,3 +1,20 @@
+# Token Magic FX - Update v0.7.6
+
+**Filter Editor**
+
+- `Clone` context menu option has been added
+  - Clones/Duplicates selected filter
+- Scroll position is now retained when deleting presets
+- Filters/Presets dragged onto canvas will now apply to top-most placeable based on `elevation` and `sort`
+- New control added to `Preset Search`; `Edit`
+  - Opens a form to change preset name and/or default texture
+- Searches within `Preset Search` app in addition to name will now also match against filter types contained within the preset params
+
+**Misc**
+
+- New default presets have been added:
+  - `DungeonDraft Tint`, `Replace Color`, `Dot Shade`, `CRT Monitor`, `RGB Split`, `Criss-Cross`, `Star Mask`
+
 # Token Magic FX - Update v0.7.5.1
 
 **Filter Editor**

tokenmagic/gui/apps/FilterEditor.js

@@ -443,6 +443,27 @@ class FilterSelector extends HandlebarsApplicationMixin(ApplicationV2) {
 			});
 			this._hooks.push({ hook, id });
 		}
+
+		this._createContextMenu(this._getFilterContextOptions, '.filter', {
+			hookName: 'getFilterContextOptions',
+		});
+	}
+
+	_getFilterContextOptions() {
+		return [
+			{
+				id: 'clone',
+				name: 'TMFX.app.filterSelector.controls.clone',
+				icon: '<i class="fa-solid fa-clone"></i>',
+				callback: (element) => this._onCloneFilter(element),
+			},
+		];
+	}
+
+	_onCloneFilter(element) {
+		const { filterId, filterType, filterInternalId } = element.dataset;
+		const filter = FilterSelector.getFilter(this._document, { filterId, filterType, filterInternalId });
+		if (filter) TokenMagic.addFilters(this._document, [deepClone(filter)]);
 	}
 
 	/**

tokenmagic/gui/apps/PresetSearch.js

@@ -25,12 +25,13 @@ export class PresetSearch extends HandlebarsApplicationMixin(ApplicationV2) {
 			resizable: true,
 		},
 		position: {
-			width: 300,
+			width: 350,
 			height: 500,
 		},
 		classes: ['tokenmagic', 'search', 'flexcol'],
 		actions: {
 			delete: PresetSearch._onDeletePreset,
+			edit: PresetSearch._onEditPreset,
 			toggleTemplates: PresetSearch._onToggleTemplates,
 		},
 	};
@@ -45,7 +46,7 @@ export class PresetSearch extends HandlebarsApplicationMixin(ApplicationV2) {
 		},
 		presets: {
 			template: `modules/tokenmagic/templates/apps/filter-editor/filter-list.hbs`,
-			scrollable: ['.filter-list'],
+			scrollable: [''],
 		},
 	};
 
@@ -60,7 +61,7 @@ export class PresetSearch extends HandlebarsApplicationMixin(ApplicationV2) {
 				context.controls = [
 					{
 						action: 'toggleTemplates',
-						tooltip: 'Toggle Template presets',
+						tooltip: game.i18n.localize('TMFX.app.searchPreset.controls.templateToggle'),
 						icon: 'fa-fw fa-solid fa-ruler-combined',
 						active: Boolean(this._templates),
 					},
@@ -88,16 +89,23 @@ export class PresetSearch extends HandlebarsApplicationMixin(ApplicationV2) {
 			if (terms.length) {
 				presets = presets.filter((p) => {
 					const name = p.name.toLocaleLowerCase();
-					return terms.every((t) => name.includes(t));
+					const filterTypes = p.params.map((param) => param.filterType.toLocaleLowerCase());
+					return terms.every((t) => name.includes(t) || filterTypes.some((type) => type.includes(t)));
 				});
 			}
 		}
 
 		const controls = [
+			{
+				class: 'edit',
+				action: 'edit',
+				tooltip: game.i18n.localize('SIDEBAR.Edit'),
+				icon: 'fa-solid fa-pen-to-square',
+			},
 			{
 				class: 'delete',
 				action: 'delete',
-				tooltip: 'Delete',
+				tooltip: game.i18n.localize('SIDEBAR.Delete'),
 				icon: 'fa-solid fa-trash',
 			},
 		];
@@ -169,4 +177,87 @@ export class PresetSearch extends HandlebarsApplicationMixin(ApplicationV2) {
 			this.render({ parts: ['presets'] });
 		}
 	}
+
+	static async _onEditPreset(event, element) {
+		const { filterId: name, filterType: library } = element.closest('.filter').dataset;
+		const preset = TokenMagic.getPresets(library).find((p) => p.name === name);
+		if (preset) new PresetEdit({ preset, parentApp: this }).render(true);
+	}
+}
+
+export class PresetEdit extends HandlebarsApplicationMixin(ApplicationV2) {
+	constructor({ preset, parentApp }) {
+		super({});
+		this._preset = foundry.utils.deepClone(preset);
+		this._parentApp = parentApp;
+	}
+
+	/** @override */
+	static DEFAULT_OPTIONS = {
+		id: 'tmfx-preset-edit',
+		tag: 'form',
+		window: {
+			resizable: false,
+			contentClasses: ['standard-form'],
+		},
+		form: {
+			handler: PresetEdit._onSubmit,
+			submitOnChange: false,
+			closeOnSubmit: true,
+		},
+		position: {
+			width: 450,
+			height: 'auto',
+		},
+		classes: ['tokenmagic', 'flexcol'],
+		actions: {
+			delete: PresetSearch._onDeletePreset,
+			edit: PresetSearch._onEditPreset,
+			toggleTemplates: PresetSearch._onToggleTemplates,
+		},
+	};
+
+	get title() {
+		return this._preset.name;
+	}
+
+	/** @override */
+	static PARTS = {
+		main: {
+			template: `modules/tokenmagic/templates/apps/preset-search/preset-edit.hbs`,
+		},
+		footer: { template: 'templates/generic/form-footer.hbs' },
+	};
+
+	/** @override */
+	async _preparePartContext(partId, context, options) {
+		context.partId = partId;
+		switch (partId) {
+			case 'main':
+				context.name = this._preset.name;
+				context.library = this._preset.library;
+				context.defaultTexture = this._preset.defaultTexture;
+				context.params = JSON.stringify(this._preset.params, null, 2);
+				break;
+			case 'footer':
+				context.buttons = [
+					{ type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('TMFX.save'), action: 'save' },
+				];
+				break;
+		}
+		return context;
+	}
+
+	static async _onSubmit(event, form, formData) {
+		const name = formData.object.name.trim();
+		const defaultTexture = formData.object.defaultTexture?.trim();
+		if (this._preset.name === name && this._preset.defaultTexture === defaultTexture) return;
+		if (!name) return;
+
+		await TokenMagic.deletePreset({ name: this._preset.name, library: this._preset.library }, true);
+		await TokenMagic.addPreset({ name, library: this._preset.library, defaultTexture }, this._preset.params, true);
+		if (this._parentApp.state === ApplicationV2.RENDER_STATES.RENDERED) {
+			this._parentApp.render({ parts: ['presets'] });
+		}
+	}
 }

tokenmagic/import/TMFX-update-presets-v044.json

@@ -0,0 +1,173 @@
+[
+    {
+        "name": "DungeonDraft Tint",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "ddTint",
+                "filterId": "DungeonDraft Tint",
+                "tint": [
+                    0,
+                    1,
+                    0
+                ],
+                "rank": 10001,
+                "enabled": true
+            }
+        ]
+    },
+    {
+        "name": "Replace Color",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "replaceColor",
+                "filterId": "Replace Color",
+                "originalColor": [
+                    1,
+                    0,
+                    0
+                ],
+                "newColor": [
+                    0,
+                    1,
+                    0
+                ],
+                "epsilon": 0.7,
+                "rank": 10001,
+                "enabled": true,
+                "animated": {}
+            }
+        ]
+    },
+    {
+        "name": "Dot Shade",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "dot",
+                "filterId": "Dot Shade",
+                "scale": 0.76,
+                "angle": 0,
+                "grayscale": true,
+                "rank": 10002,
+                "enabled": true
+            }
+        ]
+    },
+    {
+        "name": "CRT Monitor",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "crt",
+                "filterId": "CRT Monitor",
+                "curvature": 4,
+                "lineWidth": 5,
+                "lineContrast": 0.25,
+                "verticalLine": false,
+                "noise": 0.3,
+                "noiseSize": 1,
+                "vignetting": 0,
+                "vignettingAlpha": 1,
+                "vignettingBlur": 0.3,
+                "animated": {
+                    "seed": {
+                        "active": true,
+                        "animType": "randomNumber",
+                        "val1": 0,
+                        "val2": 1
+                    },
+                    "time": {
+                        "active": true,
+                        "speed": -0.01,
+                        "animType": "move"
+                    }
+                },
+                "enabled": true,
+                "rank": 10003
+            },
+            {
+                "filterType": "outline",
+                "filterId": "CRT Monitor",
+                "color": 0,
+                "thickness": 0,
+                "zOrder": 321,
+                "enabled": true,
+                "rank": 10004
+            }
+        ]
+    },
+    {
+        "name": "RGB Split",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "rgbSplit",
+                "filterId": "RGB Split",
+                "redX": -10,
+                "redY": 0,
+                "greenX": 0,
+                "greenY": 10,
+                "blueX": 0,
+                "blueY": 0,
+                "enabled": true,
+                "rank": 10005
+            }
+        ]
+    },
+    {
+        "name": "Criss-Cross",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "sprite",
+                "filterId": "Criss-Cross",
+                "imagePath": "modules/tokenmagic/fx/assets/box.webp",
+                "repeat": true,
+                "alphaDiscard": true,
+                "colorize": true,
+                "color": 16688682,
+                "inverse": true,
+                "gridPadding": 1,
+                "maintainAspectRatio": false,
+                "maintainScale": false,
+                "scaleX": 0.16,
+                "scaleY": 0.16,
+                "translationX": 0,
+                "translationY": 0,
+                "rotation": 45,
+                "alpha": 1,
+                "top": true,
+                "animated": {},
+                "rank": 10006,
+                "enabled": true,
+                "play": true,
+                "loop": true
+            }
+        ]
+    },
+    {
+        "name": "Star Mask",
+        "library": "tmfx-main",
+        "params": [
+            {
+                "filterType": "spriteMask",
+                "filterId": "Star Mask",
+                "imagePath": "modules/tokenmagic/fx/assets/star.webp",
+                "repeat": false,
+                "gridPadding": 1,
+                "maintainAspectRatio": false,
+                "maintainScale": false,
+                "scaleX": 1,
+                "scaleY": 1,
+                "translationX": 0,
+                "translationY": 0,
+                "rotation": 0,
+                "alpha": 1,
+                "rank": 10000,
+                "enabled": true
+            }
+        ]
+    }
+]

tokenmagic/lang/en.json

@@ -62,6 +62,7 @@
 	"TMFX.app.filterSelector.controls.save": "Save as Preset",
 	"TMFX.app.filterSelector.controls.macro": "Display as a Macro",
 	"TMFX.app.filterSelector.controls.randomize": "Re-roll Randomized Fields",
+	"TMFX.app.filterSelector.controls.clone": "Clone",
 	"TMFX.app.filterEditor.title": "Filter",
 	"TMFX.app.animationEditor.title": "Animate",
 	"TMFX.app.randomizationEditor.title": "Randomize",
@@ -87,5 +88,8 @@
 	"TMFX.app.savePreset.autoDestroy.hint": "Check to auto-destroy/remove filter once a looping animation finishes.",
 	"TMFX.app.savePreset.confirm.title": "Overwrite Preset",
 	"TMFX.app.savePreset.confirm.message": "A preset with the same name already exists. Would you like to overwrite it?",
+	"TMFX.app.searchPreset.controls.templateToggle": "Toggle Template Presets",
+	"TMFX.app.editPreset.option.library": "Library",
+	"TMFX.app.editPreset.option.defaultTexture": "Default Texture",
 	"TMFX.save": "Save"
 }