Make sure inline weapon effects last until end of scene

Author: Azurelol

module/helpers/inline-effects.mjs

@@ -85,6 +85,14 @@ function createStatusAnchor(effectValue, status, config) {
 	return anchor;
 }
 
+/**
+ * @typedef InlineEffectConfiguration
+ * @property {String} name
+ * @property {FUEffectDuration} event e:
+ * @property {Number} interval i:
+ * @property {String} tracking t:
+ */
+
 /**
  * @param match
  * @returns {InlineEffectConfiguration}

module/helpers/inline-weapon.mjs

@@ -112,21 +112,21 @@ function createAlterDamageTypeEffect(weapon, type, label) {
 		key = 'system.data.damage.type';
 	}
 	const localizedDamageType = game.i18n.localize(`FU.Damage${StringUtils.capitalize(type)}`);
+	let changes = [];
+	if (key) {
+		changes.push({
+			key: key,
+			mode: CONST.ACTIVE_EFFECT_MODES.OVERRIDE,
+			value: type,
+		});
+	}
 
 	return {
 		fuid: `alter-damage-type-${type}`,
 		name: label ? `${label} (${localizedDamageType})` : game.i18n.format('FU.InlineWeaponActiveEffectName', { damageType: localizedDamageType }),
 		img: type === 'untyped' ? 'icons/svg/circle.svg' : `systems/projectfu/styles/static/affinities/${type}.svg`,
 		transfer: false,
-		changes: key
-			? [
-					{
-						key: key,
-						mode: CONST.ACTIVE_EFFECT_MODES.OVERRIDE,
-						value: type,
-					},
-				]
-			: [],
+		changes: changes,
 	};
 }
 
@@ -151,6 +151,7 @@ async function applyEffectToWeapon(actor, sourceInfo, choices, config) {
 				const effectData = createAlterDamageTypeEffect(weapon, choice, config.name);
 				// The name is modified
 				config.name = effectData.name;
+				config.event = 'endOfScene';
 
 				Effects.applyEffect(weapon, effectData, sourceInfo, config).then((effect) => {
 					console.info(`Created effect: ${effect.uuid} on weapon uuid: ${weapon.uuid}`);

module/pipelines/effects.mjs

@@ -312,14 +312,6 @@ function isStatusEffect(id) {
 	return id in Effects.STATUS_EFFECTS || id in Effects.BOONS_AND_BANES;
 }
 
-/**
- * @typedef InlineEffectConfiguration
- * @property {String} name
- * @property {String} event e:
- * @property {Number} interval i:
- * @property {String} tracking t:
- */
-
 /**
  * A helper function to toggle a status effect on an Actor.
  * Designed based off TokenDocument#toggleActiveEffect to properly interact with token hud.