[#3444] Re-implement summoned item modifications using enchantments

Rather than changing items on summoned actors directly, this now uses an enchantment with a fixed ID for those changes to ensure that it can be properly updated on re-summoning linked actors. In order to get this to work on all actor types this removes the restriction on applying enchantments. Enchantments can still only be added manually to item types marked `enchantable`, but any enchantments created programatically on those items can be properly applied.
foundryvtt · May 17, 2024 · 5371560 · 5371560
1 parent fedcc64
commit 5371560
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 23 deletions.
diff --git a/module/data/item/fields/summons-field.mjs b/module/data/item/fields/summons-field.mjs
@@ -455,7 +455,7 @@ export class SummonsData extends foundry.abstract.DataModel {
     const saveDamageBonus = Roll.replaceFormulaData(this.bonuses.saveDamage, rollData);
     const healingBonus = Roll.replaceFormulaData(this.bonuses.healing, rollData);
     for ( const item of actor.items ) {
-      const itemUpdates = {};
+      const changes = [];
 
       // Match attacks
       if ( this.match.attacks && item.hasAttack ) {
@@ -466,33 +466,52 @@ export class SummonsData extends foundry.abstract.DataModel {
           prof,
           rollData.bonuses?.[typeMapping[item.system.actionType] ?? item.system.actionType]?.attack
         ].filter(p => p);
-        itemUpdates["system.attack.bonus"] = parts.join(" + ");
-        itemUpdates["system.attack.flat"] = true;
+        changes.push({
+          key: "system.attack.bonus",
+          mode: CONST.ACTIVE_EFFECT_MODES.OVERRIDE,
+          value: parts.join(" + ")
+        }, {
+          key: "system.attack.flat",
+          mode: CONST.ACTIVE_EFFECT_MODES.OVERRIDE,
+          value: true
+        });
       }
 
       // Match saves
-      if ( this.match.saves && item.hasSave ) {
-        itemUpdates["system.save.dc"] = rollData.item.save.dc ?? rollData.attributes.spelldc;
-        itemUpdates["system.save.scaling"] = "flat";
-      }
+      if ( this.match.saves && item.hasSave ) changes.push({
+        key: "system.save.dc",
+        mode: CONST.ACTIVE_EFFECT_MODES.OVERRIDE,
+        value: rollData.item.save.dc ?? rollData.attributes.spelldc
+      }, {
+        key: "system.save.scaling",
+        mode: CONST.ACTIVE_EFFECT_MODES.OVERRIDE,
+        value: "flat"
+      });
 
       // Damage bonus
       let damageBonus;
       if ( item.hasAttack ) damageBonus = attackDamageBonus;
       else if ( item.system.actionType === "save" ) damageBonus = saveDamageBonus;
       else if ( item.isHealing ) damageBonus = healingBonus;
-      if ( damageBonus && item.hasDamage ) {
-        const damage = foundry.utils.deepClone(item.system.damage.parts);
-        damage[0][0] = `${damage[0][0] ?? ""} + ${damageBonus}`;
-        itemUpdates["system.damage.parts"] = damage;
-        if ( item.system.damage.versatile ) {
-          itemUpdates["system.damage.versatile"] = `${item.system.damage.versatile} + ${damageBonus}`;
-        }
-      }
+      if ( damageBonus && item.hasDamage ) changes.push({
+        key: "system.damage.parts",
+        mode: CONST.ACTIVE_EFFECT_MODES.ADD,
+        value: JSON.stringify([[`${damageBonus}`, ""]])
+      });
 
-      if ( !foundry.utils.isEmpty(itemUpdates) ) {
-        itemUpdates._id = item.id;
-        actorUpdates.items.push(itemUpdates);
+      if ( changes.length ) {
+        const effect = (new ActiveEffect({
+          _id: staticID("dnd5eItemChanges"),
+          changes,
+          disabled: false,
+          icon: "icons/skills/melee/strike-slashes-orange.webp",
+          name: game.i18n.localize("DND5E.Summoning.ItemChanges.Label"),
+          origin: this.item.uuid,
+          flags: {
+            dnd5e: { type: "enchantment" }
+          }
+        })).toObject();
+        actorUpdates.items.push({ _id: item.id, effects: [effect] });
       }
     }
 

diff --git a/module/documents/active-effect.mjs b/module/documents/active-effect.mjs
@@ -41,7 +41,6 @@ export default class ActiveEffect5e extends ActiveEffect {
    */
   get isAppliedEnchantment() {
     return (this.getFlag("dnd5e", "type") === "enchantment")
-      && (this.parent.system.metadata?.enchantable === true)
       && !!this.origin && (this.origin !== this.parent.uuid);
   }
 

diff --git a/module/documents/item.mjs b/module/documents/item.mjs
@@ -423,10 +423,6 @@ export default class Item5e extends SystemDocumentMixin(Item) {
    */
   applyActiveEffects() {
     const overrides = {};
-    if ( !this.system?.metadata?.enchantable ) {
-      this.overrides = overrides;
-      return;
-    }
 
     // Organize non-disabled effects by their application priority
     const changes = [];