fix: upgrade/downgrade custom active effect changes not working properly

Author: Shourn

module/documents/actors/common/affinity-data-model.mjs

@@ -17,7 +17,7 @@ export class AffinityDataModel extends foundry.abstract.DataModel {
 	_initialize(options = {}) {
 		super._initialize(options);
 
-		let current = this.base;
+		let current = options.current ?? this.base;
 		Object.defineProperty(this, 'current', {
 			configurable: false,
 			enumerable: true,
@@ -45,4 +45,9 @@ export class AffinityDataModel extends foundry.abstract.DataModel {
 			},
 		});
 	}
+
+	clone(data = {}, context = {}) {
+		context.current = this.current;
+		return super.clone(data, context);
+	}
 }

module/documents/actors/common/attribute-data-model.mjs

@@ -24,9 +24,10 @@ export class AttributeDataModel extends foundry.abstract.DataModel {
 	_initialize(options = {}) {
 		super._initialize(options);
 		let thiz = this;
+		const { current } = options;
 		let holder = {
 			get current() {
-				return thiz.base;
+				return current ?? thiz.base;
 			},
 			set current(value) {
 				delete this.current;
@@ -58,4 +59,9 @@ export class AttributeDataModel extends foundry.abstract.DataModel {
 			},
 		});
 	}
+
+	clone(data = {}, context = {}) {
+		context.current = this.current;
+		return super.clone(data, context);
+	}
 }

module/documents/effects/active-effect.mjs

@@ -32,10 +32,20 @@ export function onRenderActiveEffectConfig(sheet, html) {
  * @param delta
  */
 export function onApplyActiveEffect(actor, change, current, delta) {
-	if (change.key.startsWith('system.') && current instanceof foundry.abstract.DataModel && Object.hasOwn(current, delta) && current[delta] instanceof Function) {
-		console.debug(`applying ${delta} to ${change.key}`);
-		current[delta]();
-		return false;
+	if (game.release.isNewer(12)) {
+		if (change.key.startsWith('system.') && current instanceof foundry.abstract.DataModel && Object.hasOwn(current, change.value) && current[change.value] instanceof Function) {
+			console.debug(`applying ${change.value} to ${change.key}`);
+			const newValue = current.clone();
+			newValue[change.value]();
+			foundry.utils.setProperty(actor, change.key, newValue);
+			return false;
+		}
+	} else {
+		if (change.key.startsWith('system.') && current instanceof foundry.abstract.DataModel && Object.hasOwn(current, delta) && current[delta] instanceof Function) {
+			console.debug(`applying ${delta} to ${change.key}`);
+			current[delta]();
+			return false;
+		}
 	}
 }