Merge branch 'main' into v14

* Migrations for ActiveEffect Mode
* Start on migration handlers

---------

Co-authored-by: Carlos Fernandez <cfern1990@gmail.com>

module/applications/dialogs/beastformDialog.mjs

@@ -315,15 +315,15 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat
 
                     const beastformEffect = selected.effects.find(x => x.type === 'beastform');
                     for (const traitBonus of app.modifications.traitBonuses) {
-                        const existingChange = beastformEffect.changes.find(
+                        const existingChange = beastformEffect.system.changes.find(
                             x => x.key === `system.traits.${traitBonus.trait}.value`
                         );
                         if (existingChange) {
                             existingChange.value = Number.parseInt(existingChange.value) + traitBonus.bonus;
                         } else {
-                            beastformEffect.changes.push({
+                            beastformEffect.system.changes.push({
                                 key: `system.traits.${traitBonus.trait}.value`,
-                                mode: 2,
+                                type: 'add',
                                 priority: null,
                                 value: traitBonus.bonus
                             });

module/applications/dialogs/deathMove.mjs

@@ -139,14 +139,16 @@ export default class DhDeathMove extends HandlebarsApplicationMixin(ApplicationV
                 name: game.i18n.localize('DAGGERHEART.CONFIG.DeathMoves.blazeOfGlory.name'),
                 description: game.i18n.localize('DAGGERHEART.CONFIG.DeathMoves.blazeOfGlory.description'),
                 img: CONFIG.DH.GENERAL.deathMoves.blazeOfGlory.img,
+                system: {
                     changes: [
                         {
                             key: 'system.rules.roll.guaranteedCritical',
-                        mode: 2,
+                            type: 'add',
                             value: 'true'
                         }
                     ]
                 }
+            }
         ]);
 
         await this.actor.setDeathMoveDefeated(CONFIG.DH.GENERAL.defeatedConditionChoices.dead.id);

module/config/encounterConfig.mjs

@@ -90,19 +90,21 @@ export const BPModifiers = {
                     name: 'DAGGERHEART.CONFIG.BPModifiers.increaseDamage.effect.name',
                     description: 'DAGGERHEART.CONFIG.BPModifiers.increaseDamage.effect.description',
                     img: 'icons/magic/control/buff-flight-wings-red.webp',
+                    system: {
                         changes: [
                             {
                                 key: 'system.bonuses.damage.physical.dice',
-                            mode: 2,
+                                type: 'add',
                                 value: '1d4'
                             },
                             {
                                 key: 'system.bonuses.damage.magical.dice',
-                            mode: 2,
+                                type: 'add',
                                 value: '1d4'
                             }
                         ]
                     }
+                }
             ]
         }
     },

module/config/itemConfig.mjs

@@ -37,14 +37,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.channeling.effects.channeling.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.channeling.effects.channeling.description',
                 img: 'icons/magic/symbols/rune-sigil-horned-blue.webp',
+                system: {       
                     changes: [
                         {
                             key: 'system.bonuses.roll.spellcast',
-                        mode: 2,
+                            type: 'add',
                             value: '1'
                         }
                     ]
                 }
+            }
         ]
     },
     difficult: {
@@ -55,44 +57,46 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.difficult.effects.difficult.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.difficult.effects.difficult.description',
                 img: 'icons/magic/control/buff-flight-wings-red.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.traits.agility.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.traits.strength.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.traits.finesse.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.traits.instinct.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.traits.presence.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.traits.knowledge.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     flexible: {
@@ -103,14 +107,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.flexible.effects.flexible.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.flexible.effects.flexible.description',
                 img: 'icons/magic/movement/abstract-ribbons-red-orange.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '1'
                         }
                     ]
                 }
+            }
         ]
     },
     fortified: {
@@ -121,14 +127,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.fortified.effects.fortified.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.fortified.effects.fortified.description',
                 img: 'icons/magic/defensive/shield-barrier-glowing-blue.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.rules.damageReduction.increasePerArmorMark',
-                        mode: 5,
+                            type: 'override',
                             value: '2'
                         }
                     ]
                 }
+            }
         ]
     },
     gilded: {
@@ -139,14 +147,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.gilded.effects.gilded.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.gilded.effects.gilded.description',
                 img: 'icons/magic/control/control-influence-crown-gold.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.traits.presence.value',
-                        mode: 2,
+                            type: 'add',
                             value: '1'
                         }
                     ]
                 }
+            }
         ]
     },
     heavy: {
@@ -157,14 +167,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.heavy.effects.heavy.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.heavy.effects.heavy.description',
                 img: 'icons/commodities/metal/ingot-worn-iron.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     hopeful: {
@@ -212,14 +224,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.magical.effects.magical.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.magical.effects.magical.description',
                 img: 'icons/magic/defensive/barrier-shield-dome-blue-purple.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.rules.damageReduction.magical',
-                        mode: 5,
+                            type: 'override',
                             value: 1
                         }
                     ]
                 }
+            }
         ]
     },
     painful: {
@@ -249,14 +263,16 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.physical.effects.physical.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.physical.effects.physical.description',
                 img: 'icons/commodities/stone/ore-pile-tan.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.rules.damageReduction.physical',
-                        mode: 5,
+                            type: 'override',
                             value: 1
                         }
                     ]
                 }
+            }
         ]
     },
     quiet: {
@@ -280,19 +296,21 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.reinforced.effects.reinforced.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.reinforced.effects.reinforced.description',
                 img: 'icons/magic/defensive/shield-barrier-glowing-triangle-green.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.bunuses.damageThresholds.major',
-                        mode: 2,
+                            type: 'add',
                             value: '2'
                         },
                         {
                             key: 'system.bunuses.damageThresholds.severe',
-                        mode: 2,
+                            type: 'add',
                             value: '2'
                         }
                     ]
                 }
+            }
         ]
     },
     resilient: {
@@ -326,19 +344,21 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.sharp.effects.sharp.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.sharp.effects.sharp.description',
                 img: 'icons/magic/defensive/shield-barrier-glowing-triangle-green.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.bonuses.damage.primaryWeapon.dice',
-                        mode: 2,
+                            type: 'add',
                             value: '1d4'
                         },
                         {
                             key: 'system.bonuses.damage.secondaryWeapon.dice',
-                        mode: 2,
+                            type: 'add',
                             value: '1d4'
                         }
                     ]
                 }
+            }
         ]
     },
     shifting: {
@@ -408,19 +428,21 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.veryHeavy.effects.veryHeavy.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.veryHeavy.effects.veryHeavy.description',
                 img: 'icons/commodities/metal/ingot-stamped-steel.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-2'
                         },
                         {
                             key: 'system.traits.agility.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     warded: {
@@ -431,15 +453,17 @@ export const armorFeatures = {
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.warded.effects.warded.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.warded.effects.warded.description',
                 img: 'icons/magic/defensive/barrier-shield-dome-pink.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.resistance.magical.reduction',
-                        mode: 2,
+                            type: 'add',
                             value: '@system.armorScore',
                             priority: 21
                         }
                     ]
                 }
+            }
         ]
     }
 };
@@ -488,10 +512,11 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.barrier.effects.barrier.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.barrier.effects.barrier.description',
                 img: 'icons/skills/melee/shield-block-bash-blue.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
@@ -504,6 +529,7 @@ export const weaponFeatures = {
                         }
                     ]
                 }
+            }
         ]
     },
     bonded: {
@@ -514,14 +540,16 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.bonded.effects.damage.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.bonded.effects.damage.description',
                 img: 'icons/magic/symbols/chevron-elipse-circle-blue.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.bonuses.damage.primaryWeapon.bonus',
-                        mode: 2,
+                            type: 'add',
                             value: '@system.levelData.level.current'
                         }
                     ]
                 }
+            }
         ]
     },
     bouncing: {
@@ -553,19 +581,21 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.brave.effects.brave.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.brave.effects.brave.description',
                 img: 'icons/magic/life/heart-cross-strong-flame-purple-orange.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         },
                         {
                             key: 'system.damageThresholds.severe',
-                        mode: 2,
+                            type: 'add',
                             value: 'ITEM.@system.tier'
                         }
                     ]
                 }
+            }
         ]
     },
     brutal: {
@@ -618,14 +648,16 @@ export const weaponFeatures = {
                         name: 'DAGGERHEART.CONFIG.WeaponFeature.charged.name',
                         description: 'DAGGERHEART.CONFIG.WeaponFeature.charged.description',
                         img: 'icons/magic/lightning/claws-unarmed-strike-teal.webp',
+                        system: {
                             changes: [
                                 {
                                     key: 'system.proficiency',
-                                mode: 2,
+                                    type: 'add',
                                     value: '1'
                                 }
                             ]
                         }
+                    }
                 ]
             }
         ]
@@ -660,14 +692,16 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.cumbersome.effects.cumbersome.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.cumbersome.effects.cumbersome.description',
                 img: 'icons/commodities/metal/mail-plate-steel.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.traits.finesse.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     deadly: {
@@ -707,15 +741,17 @@ export const weaponFeatures = {
                         name: 'DAGGERHEART.CONFIG.WeaponFeature.deflecting.effects.deflecting.name',
                         description: 'DAGGERHEART.CONFIG.WeaponFeature.deflecting.effects.deflecting.description',
                         img: 'icons/skills/melee/hand-grip-sword-strike-orange.webp',
+                        system: {
                             changes: [
                                 {
                                     key: 'system.evasion',
-                                mode: 2,
+                                    type: 'add',
                                     value: '@system.armorScore',
                                     priority: 21
                                 }
                             ]
                         }
+                    }
                 ]
             }
         ]
@@ -754,14 +790,16 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.destructive.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.destructive.effects.agility',
                 img: 'icons/skills/melee/strike-flail-spiked-pink.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.traits.agility.value',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     devastating: {
@@ -795,7 +833,7 @@ export const weaponFeatures = {
                     changes: [
                         {
                             key: 'system.bonuses.damage.primaryWeapon.bonus',
-                            mode: 2,
+                            type: 'add',
                             value: '1'
                         }
                     ],
@@ -902,14 +940,16 @@ export const weaponFeatures = {
                         name: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.actions.greed.name',
                         description: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.actions.greed.description',
                         img: 'icons/commodities/currency/coins-crown-stack-gold.webp',
+                        system: {
                             changes: [
                                 {
                                     key: 'system.proficiency',
-                                mode: 2,
+                                    type: 'add',
                                     value: '1'
                                 }
                             ]
                         }
+                    }
                 ]
             }
         ]
@@ -951,14 +991,16 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.heavy.effects.heavy.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.heavy.effects.heavy.description',
                 img: 'icons/commodities/metal/ingot-worn-iron.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     hooked: {
@@ -1066,14 +1108,16 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.massive.effects.massive.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.massive.effects.massive.description',
                 img: 'icons/skills/melee/strike-flail-destructive-yellow.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.evasion',
-                        mode: 2,
+                            type: 'add',
                             value: '-1'
                         }
                     ]
                 }
+            }
         ]
     },
     painful: {
@@ -1107,7 +1151,7 @@ export const weaponFeatures = {
                     changes: [
                         {
                             key: 'system.bonuses.damage.primaryWeapon.bonus',
-                            mode: 2,
+                            type: 'add',
                             value: 'ITEM.@system.tier + 1'
                         }
                     ],
@@ -1158,14 +1202,16 @@ export const weaponFeatures = {
                         name: 'DAGGERHEART.CONFIG.WeaponFeature.persuasive.effects.persuasive.name',
                         description: 'DAGGERHEART.CONFIG.WeaponFeature.persuasive.effects.persuasive.description',
                         img: 'icons/magic/control/hypnosis-mesmerism-eye.webp',
+                        system: {
                             changes: [
                                 {
                                     key: 'system.traits.presence.value',
-                                mode: 2,
+                                    type: 'add',
                                     value: '2'
                                 }
                             ]
                         }
+                    }
                 ]
             }
         ]
@@ -1203,6 +1249,7 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.protective.effects.protective.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.protective.effects.protective.description',
                 img: 'icons/skills/melee/shield-block-gray-orange.webp',
+                system: {
                     changes: [
                         {
                             key: 'Armor',
@@ -1215,6 +1262,8 @@ export const weaponFeatures = {
                         }
                     ]
                 }
+
+            }
         ]
     },
     quick: {
@@ -1244,14 +1293,16 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.reliable.effects.reliable.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.reliable.effects.reliable.description',
                 img: 'icons/skills/melee/strike-sword-slashing-red.webp',
+                system: {
                     changes: [
                         {
                             key: 'system.bonuses.roll.primaryWeapon.bonus',
-                        mode: 2,
+                            type: 'add',
                             value: 1
                         }
                     ]
                 }
+            }
         ]
     },
     reloading: {
@@ -1341,7 +1392,7 @@ export const weaponFeatures = {
                 changes: [
                     {
                         key: 'system.bonuses.damage.primaryWeapon.bonus',
-                        mode: 2,
+                        type: 'add',
                         value: '@system.traits.agility.value',
                         priority: 21
                     }

module/dice/d20Roll.mjs

@@ -185,8 +185,10 @@ export default class D20Roll extends DHRoll {
         return changeKeys;
     }
 
-    static postEvaluate(roll, config = {}) {
-        const data = super.postEvaluate(roll, config);
+    static async buildEvaluate(roll, config = {}, message = {}) {
+        await super.buildEvaluate(roll, config, message);
+
+        const data = config.roll;
         data.type = config.actionType;
         data.difficulty = config.roll.difficulty;
         if (config.targets?.length) {
@@ -222,7 +224,6 @@ export default class D20Roll extends DHRoll {
                 };
             });
         data.modifierTotal = roll.modifierTotal;
-        return data;
     }
 
     resetFormula() {

module/dice/damageRoll.mjs

@@ -13,32 +13,38 @@ export default class DamageRoll extends DHRoll {
 
     static DefaultDialog = DamageDialog;
 
+    /** @inheritdoc */
     static async buildEvaluate(roll, config = {}, message = {}) {
         if (config.dialog.configure === false) roll.constructFormula(config);
-        if (config.evaluate !== false) for (const roll of config.roll) await roll.roll.evaluate();
+        for (const roll of config.roll) await roll.roll.evaluate();
 
         roll._evaluated = true;
 
         const parts = [];
-        for (const roll of config.roll) {
-            parts.push(this.postEvaluate(roll));
-            roll.roll = JSON.stringify(roll.roll.toJSON());
+        for (const rollData of config.roll) {
+            const roll = rollData.roll;
+            parts.push({
+                ...rollData,
+                ...roll.options.roll,
+                total: roll.total,
+                formula: roll.formula,
+                dice: roll.dice.map(d => ({
+                    dice: d.denomination,
+                    total: d.total,
+                    formula: d.formula,
+                    results: d.results
+                })),
+                damageTypes: [...(rollData.damageTypes ?? [])],
+                roll,
+                type: config.type,
+                modifierTotal: this.calculateTotalModifiers(roll)
+            });
+            rollData.roll = JSON.stringify(roll.toJSON());
         }
 
         config.damage = this.unifyDamageRoll(parts);
     }
 
-    static postEvaluate(roll, config = {}) {
-        return {
-            ...roll,
-            ...super.postEvaluate(roll.roll, config),
-            damageTypes: [...(roll.damageTypes ?? [])],
-            roll: roll.roll,
-            type: config.type,
-            modifierTotal: this.calculateTotalModifiers(roll.roll)
-        };
-    }
-
     static async buildPost(roll, config, message) {
         const chatMessage = config.source?.message
             ? ui.chat.collection.get(config.source.message)

module/dice/dhRoll.mjs

@@ -33,7 +33,9 @@ export default class DHRoll extends Roll {
 
         if (config.skips?.createMessage) config.messageRoll = roll;
 
+        if (config.evaluate !== false) {
             await this.buildEvaluate(roll, config, (message = {}));
+        }
         await this.buildPost(roll, config, (message = {}));
         return config;
     }
@@ -72,27 +74,14 @@ export default class DHRoll extends Roll {
         return roll;
     }
 
+    /** 
+     * Evaluates the roll and assigns roll data into the config. 
+     * This is only called if config.evaluate is not set to false
+     * @protected
+     */
     static async buildEvaluate(roll, config = {}, message = {}) {
-        if (config.evaluate !== false) {
         await roll.evaluate();
-            config.roll = this.postEvaluate(roll, config);
-        }
-    }
-
-    static async buildPost(roll, config, message) {
-        for (const hook of config.hooks) {
-            if (Hooks.call(`${CONFIG.DH.id}.postRoll${hook.capitalize()}`, config, message) === false) return null;
-        }
-
-        if (config.skips?.createMessage) {
-            await triggerChatRollFx([roll]);
-        } else if (!config.source?.message) {
-            config.message = await this.toMessage(roll, config);
-        }
-    }
-
-    static postEvaluate(roll, config = {}) {
-        return {
+        config.roll = {
             ...roll.options.roll,
             total: roll.total,
             formula: roll.formula,
@@ -105,6 +94,22 @@ export default class DHRoll extends Roll {
         };
     }
 
+    /** 
+     * Runs any post configuration events that need to happen towards the end, such as hooks and dice so nice 
+     * @protected
+     */
+    static async buildPost(roll, config, message) {
+        for (const hook of config.hooks) {
+            if (Hooks.call(`${CONFIG.DH.id}.postRoll${hook.capitalize()}`, config, message) === false) return null;
+        }
+
+        if (config.skips?.createMessage) {
+            await triggerChatRollFx([roll]);
+        } else if (!config.source?.message) {
+            config.message = await this.toMessage(roll, config);
+        }
+    }
+
     static async toMessage(roll, config) {
         const item = config.data.parent?.items?.get?.(config.source.item) ?? null;
         const action = item ? item.system.actions.get(config.source.action) : null;

module/dice/dualityRoll.mjs

@@ -232,22 +232,10 @@ export default class DualityRoll extends D20Roll {
         return changeKeys;
     }
 
+    /** @inheritdoc */
     static async buildEvaluate(roll, config = {}, message = {}) {
         await super.buildEvaluate(roll, config, message);
-
-        await setDiceSoNiceForDualityRoll(
-            roll,
-            config.roll.advantage.type,
-            config.roll.hope.dice,
-            config.roll.fear.dice,
-            config.roll.advantage.dice
-        );
-    }
-
-    static postEvaluate(roll, config = {}) {
-        const data = super.postEvaluate(roll, config);
-
-        data.hope = {
+        config.roll.hope = {
             dice: roll.dHope.denomination,
             value: this.guaranteedCritical ? 0 : roll.dHope.total,
             rerolled: {
@@ -255,7 +243,7 @@ export default class DualityRoll extends D20Roll {
                 rerolls: roll.dHope.results.filter(x => x.rerolled)
             }
         };
-        data.fear = {
+        config.roll.fear = {
             dice: roll.dFear.denomination,
             value: this.guaranteedCritical ? 0 : roll.dFear.total,
             rerolled: {
@@ -263,11 +251,11 @@ export default class DualityRoll extends D20Roll {
                 rerolls: roll.dFear.results.filter(x => x.rerolled)
             }
         };
-        data.rally = {
+        config.roll.rally = {
             dice: roll.dRally?.denomination,
             value: roll.dRally?.total
         };
-        data.result = {
+        config.roll.result = {
             duality: roll.withHope ? 1 : roll.withFear ? -1 : 0,
             total: this.guaranteedCritical ? 0 : roll.dHope.total + roll.dFear.total,
             label: roll.totalLabel
@@ -275,11 +263,18 @@ export default class DualityRoll extends D20Roll {
 
         if (roll._rallyIndex && roll.data?.parent)
             roll.data.parent.deleteEmbeddedDocuments('ActiveEffect', [roll._rallyIndex]);
-
-        return data;
     }
     
+    /** @inheritdoc */
     static async buildPost(roll, config, message) {
+        await setDiceSoNiceForDualityRoll(
+            roll,
+            config.roll.advantage.type,
+            config.roll.hope.dice,
+            config.roll.fear.dice,
+            config.roll.advantage.dice
+        );
+
         await super.buildPost(roll, config, message);
 
         await DualityRoll.dualityUpdate(config);

module/dice/fateRoll.mjs

@@ -75,25 +75,23 @@ export default class FateRoll extends D20Roll {
         this.terms[0] = new foundry.dice.terms.Die({ faces: 12 });
     }
 
+    /** @inheritdoc */
     static async buildEvaluate(roll, config = {}, message = {}) {
         await super.buildEvaluate(roll, config, message);
+        config.roll.fate = {
+            dice: roll.fateDie === 'Hope' ? roll.dHope.denomination : roll.dFear.denomination,
+            value: roll.fateDie === 'Hope' ? roll.dHope.total : roll.dFear.total,
+            fateDie: roll.fateDie
+        };
+    }
 
+    /** @inheritdoc */
+    static async buildPost(roll, config, message) {
         if (roll.fateDie === 'Hope') {
             await setDiceSoNiceForHopeFateRoll(roll, config.roll.fate.dice);
         } else {
             await setDiceSoNiceForFearFateRoll(roll, config.roll.fate.dice);
         }
-    }
-
-    static postEvaluate(roll, config = {}) {
-        const data = super.postEvaluate(roll, config);
-
-        data.fate = {
-            dice: roll.fateDie === 'Hope' ? roll.dHope.denomination : roll.dFear.denomination,
-            value: roll.fateDie === 'Hope' ? roll.dHope.total : roll.dFear.total,
-            fateDie: roll.fateDie
-        };
-
-        return data;
+        return super.buildPost(roll, config, message);
     }
 }

module/enrichers/TemplateEnricher.mjs

@@ -58,7 +58,7 @@ export const renderMeasuredTemplate = async event => {
     if (!type || !range || !game.canvas.scene) return;
 
     const shapeData = CONFIG.Canvas.layers.regions.layerClass.getTemplateShape({
-        shapetype: type,
+        shapeType: type,
         angle,
         range,
         direction,

module/enrichers/_module.mjs

@@ -35,23 +35,24 @@ export const enricherConfig = [
 ];
 
 export const enricherRenderSetup = element => {
+    const clickWrapper = func => event => {
+        event.stopPropagation();
+        func(event);
+    };   
+
     element
         .querySelectorAll('.enriched-damage-button')
-        .forEach(element => element.addEventListener('click', renderDamageButton));
+        .forEach(element => element.addEventListener('click', clickWrapper(renderDamageButton)));
 
     element
         .querySelectorAll('.duality-roll-button')
-        .forEach(element => element.addEventListener('click', renderDualityButton));
+        .forEach(element => element.addEventListener('click', clickWrapper(renderDualityButton)));
 
     element
         .querySelectorAll('.fate-roll-button')
-        .forEach(element => element.addEventListener('click', renderFateButton));
+        .forEach(element => element.addEventListener('click', clickWrapper(renderFateButton)));
 
     element
         .querySelectorAll('.measured-template-button')
-        .forEach(element => element.addEventListener('click', renderMeasuredTemplate));
-
-    // element
-    //     .querySelectorAll('.enriched-effect')
-    //     .forEach(element => element.addEventListener('dragstart', dragEnrichedEffect));
+        .forEach(element => element.addEventListener('click', clickWrapper(renderMeasuredTemplate)));
 };

module/systemRegistration/migration-handlers/2_5_2.mjs

@@ -0,0 +1,38 @@
+import { MigrationHandlerBase } from './base.mjs';
+
+export class Migration_2_5_2 extends MigrationHandlerBase {
+    version = '2.5.2';
+
+    /** @inheritdoc */
+    async updateActiveEffectSource(effectSource, item) {
+        let shouldUpdate = false;
+        const newChanges = [];
+        const srdItem = item?._stats.compendiumSource ? 
+            await foundry.utils.fromUuid(item?._stats.compendiumSource) : 
+            null;
+        for (let i = 0; i < effectSource.system.changes.length; i++) {
+            const change = effectSource.system.changes[i];
+            const srdEffect = srdItem?.effects.find(x => x.name === effectSource.name);
+            if (change.type === 'custom') {
+                const srdChange = srdEffect ? srdEffect.system.changes[i] : null;
+                if (
+                    change.key === srdChange.key && 
+                    change.value === srdChange.value && 
+                    change.type !== srdChange.type
+                ) {
+                    shouldUpdate = true;
+                    newChanges.push(srdChange);
+                }
+            } else {
+                newChanges.push(change);
+            }
+        }
+
+        if (shouldUpdate) {
+            return {
+                _id: effectSource._id,
+                system: { changes: newChanges }
+            }
+        }
+    }
+}

module/systemRegistration/migration-handlers/base.mjs

@@ -0,0 +1,77 @@
+/** 
+ * @import DHItem from "../../documents/item.mjs";
+ */
+
+/** 
+ * The base class of an async migration. 
+ * These are generally run between versions for things that require compendiums or must be done in post.
+ * The migrate() functions calls the various updateXSource() functions.
+ * Generally a subclass will override the version and the updateXSource() functions.
+ */
+export class MigrationHandlerBase {
+    version = null;
+
+    /**
+     * Gets change data for an active effect's source, or null if no changes
+     * @param {object} effectSource 
+     * @param {DHItem} item 
+     * @returns {Promise<object>}
+     * @protected
+     */
+    async updateActiveEffectSource(effectSource, item) {
+        return null;
+    }
+
+    async migrate() {
+        // todo: handle more than just migrating effects. Right now this can only migrate effects
+        // NOTE: the preload is hardcoded, we should not hardcode it
+
+        const numActors = game.actors.size;
+        const numItems = game.items.size;
+        const finalUpdateProgress = 5;
+        const DhProgress = game.system.api.applications.ui.DhProgress;
+        const preRunProgress = game.packs.size;
+        
+        const progress = DhProgress.createMigrationProgress(
+            preRunProgress + numActors + numItems + finalUpdateProgress
+        );
+
+        // Preload. Avoid hardcoding in the future
+        for (const pack of game.packs) {
+            await pack.getDocuments();
+            progress.advance();
+        }
+
+        const batch = [];
+
+        const updateItem = async item => {
+            const itemUpdates = [];
+            for (const effect of item.effects) {
+                const changes = await this.updateActiveEffectSource(effect.toObject(), item);
+                if (changes) itemUpdates.push(changes);
+            }
+            if (itemUpdates.length) {
+                batch.push({
+                    action: 'update',
+                    documentName: 'ActiveEffect',
+                    updates: itemUpdates,
+                    parent: item
+                });
+            }
+        };
+
+        for (const actor of game.actors) {
+            for (const item of actor.items) {
+                await updateItem(item);
+            }
+            progress.advance();
+        }
+        for (const item of game.items) {
+            await updateItem(item);
+            progress.advance();
+        }
+
+        await foundry.documents.modifyBatch(batch);
+        progress.advance({ by: finalUpdateProgress });
+    }
+}

module/systemRegistration/migrations.mjs

@@ -1,4 +1,5 @@
 import { defaultRestOptions } from '../config/generalConfig.mjs';
+import { Migration_2_5_2 } from './migration-handlers/2_5_2.mjs';
 
 export async function runMigrations() {
     let lastMigrationVersion = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion);
@@ -320,7 +321,19 @@ export async function runMigrations() {
 
         lastMigrationVersion = '2.1.0';
     }
-    //#endregion
 
     await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion, lastMigrationVersion);
+
+    /* -------------------------------------------- */
+    /*  New Style migrations below this point       */
+    /* -------------------------------------------- */
+
+    const migrations = [
+        new Migration_2_5_2()
+    ].filter(m => m.version && foundry.utils.isNewerVersion(m.version, lastMigrationVersion));
+
+    for (const handler of migrations) {
+        await handler.migrate();
+        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion, handler.version);
+    }
 }

src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json

@@ -325,7 +325,7 @@
             "changes": [
               {
                 "key": "system.evasion",
-                "mode": 5,
+                "type": "override",
                 "value": "@system.evasion / 2",
                 "priority": 10
               }

src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json

@@ -328,7 +328,7 @@
             "changes": [
               {
                 "key": "system.disadvantageSources",
-                "mode": 2,
+                "type": "add",
                 "value": "Agility Rolls",
                 "priority": null
               }

src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json

@@ -338,7 +338,7 @@
             "changes": [
               {
                 "key": "system.advantageSources",
-                "mode": 2,
+                "type": "add",
                 "value": "On attacks if they are Hidden.",
                 "priority": null
               }

src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json

@@ -235,7 +235,7 @@
             "changes": [
               {
                 "key": "system.rules.conditionImmunities.restrained",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }
@@ -298,7 +298,7 @@
             "changes": [
               {
                 "key": "system.resistance.magical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json

@@ -462,7 +462,7 @@
             "changes": [
               {
                 "key": "system.bonuses.damage.physical.bonus",
-                "mode": 2,
+                "type": "add",
                 "value": "10",
                 "priority": null
               }

src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json

@@ -273,7 +273,7 @@
             "changes": [
               {
                 "key": "system.bonuses.roll.attack.bonus",
-                "mode": 2,
+                "type": "add",
                 "value": "ITEM.@system.resource.value",
                 "priority": 21
               }

src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json

@@ -241,7 +241,7 @@
             "changes": [
               {
                 "key": "system.rules.attack.damage.hpDamageMultiplier",
-                "mode": 5,
+                "type": "override",
                 "value": "2",
                 "priority": null
               }

src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json

@@ -243,7 +243,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }
@@ -306,7 +306,7 @@
             "changes": [
               {
                 "key": "system.rules.attack.damage.hpDamageMultiplier",
-                "mode": 5,
+                "type": "override",
                 "value": "2",
                 "priority": null
               }

src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json

@@ -268,7 +268,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "3",
                 "priority": null
               }

src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json

@@ -272,7 +272,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "2",
                 "priority": null
               }

src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json

@@ -343,7 +343,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.reduction",
-                "mode": 2,
+                "type": "add",
                 "value": "7",
                 "priority": null
               }

src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json

@@ -326,7 +326,7 @@
             "changes": [
               {
                 "key": "system.disadvantageSources",
-                "mode": 2,
+                "type": "add",
                 "value": "Your next action",
                 "priority": null
               }

src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json

@@ -237,7 +237,7 @@
             "changes": [
               {
                 "key": "system.rules.attack.damage.hpDamageMultiplier",
-                "mode": 5,
+                "type": "override",
                 "value": "2",
                 "priority": null
               }

src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json

@@ -378,7 +378,7 @@
             "changes": [
               {
                 "key": "system.advantageSources",
-                "mode": 2,
+                "type": "add",
                 "value": "Attacks made while Hidden",
                 "priority": null
               }

src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json

@@ -349,7 +349,7 @@
             "changes": [
               {
                 "key": "system.evasion",
-                "mode": 5,
+                "type": "override",
                 "value": "@system.evasion / 2",
                 "priority": 10
               }

src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json

@@ -253,7 +253,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "2",
                 "priority": null
               }
@@ -316,7 +316,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.reduction",
-                "mode": 2,
+                "type": "add",
                 "value": "3",
                 "priority": null
               }

src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json

@@ -238,7 +238,7 @@
             "changes": [
               {
                 "key": "system.resistance.magical.resistance",
-                "mode": 2,
+                "type": "add",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json

@@ -316,7 +316,7 @@
             "changes": [
               {
                 "key": "system.disadvantageSources",
-                "mode": 2,
+                "type": "add",
                 "value": "On your next action roll.",
                 "priority": null
               }

src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json

@@ -238,7 +238,7 @@
             "changes": [
               {
                 "key": "system.rules.attack.damage.hpDamageMultiplier",
-                "mode": 5,
+                "type": "override",
                 "value": "2",
                 "priority": null
               }

src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json

@@ -240,7 +240,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json

@@ -273,7 +273,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json

@@ -273,7 +273,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json

@@ -273,7 +273,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json

@@ -300,7 +300,7 @@
             "changes": [
               {
                 "key": "system.disadvantageSources",
-                "mode": 2,
+                "type": "add",
                 "value": "On attack rolls while you're within Very Close range of the Sentinel",
                 "priority": null
               }

src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json

@@ -305,7 +305,7 @@
             "changes": [
               {
                 "key": "system.evasion",
-                "mode": 5,
+                "type": "override",
                 "value": "@system.evasion / 2",
                 "priority": 10
               }

src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json

@@ -379,7 +379,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json

@@ -324,7 +324,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "3",
                 "priority": null
               }
@@ -387,7 +387,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json

@@ -262,7 +262,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }

src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json

@@ -27,13 +27,13 @@
         "changes": [
           {
             "key": "system.bonuses.rest.shortRest.shortMoves",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           },
           {
             "key": "system.bonuses.rest.longRest.longMoves",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }

src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Dread Visage: Rolls to intimidate hostile creatures",
             "priority": null
           }

src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json

@@ -27,13 +27,13 @@
         "changes": [
           {
             "key": "system.bonuses.rest.shortRest.longMoves",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           },
           {
             "key": "system.bonuses.rest.shortRest.shortMoves",
-            "mode": 2,
+            "type": "add",
             "value": "-1",
             "priority": null
           }

src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.resources.hitPoints.max",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }

src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.resources.stress.max",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }

src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Agility Rolls that involve balancing and climbing",
             "priority": null
           }

src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }

src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.stressDamageReduction.severe.cost",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }

src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json

@@ -27,13 +27,13 @@
         "changes": [
           {
             "key": "system.damageThresholds.major",
-            "mode": 2,
+            "type": "add",
             "value": "@prof",
             "priority": 21
           },
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "@prof",
             "priority": 21
           }

src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.stressDamageReduction.minor.cost",
-            "mode": 5,
+            "type": "override",
             "value": "2",
             "priority": null
           }

src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json

@@ -90,13 +90,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "1d6",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "1d6",
             "priority": null
           }

src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json

@@ -57,7 +57,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "2",
             "priority": null
           }

src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json

@@ -62,25 +62,25 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "0",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "agility",
           "priority": null
         }

src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "6",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "agility",
           "priority": null
         }

src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json

@@ -62,25 +62,25 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "0",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "agility",
           "priority": null
         }

src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json

@@ -65,31 +65,31 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "10",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "agility",
           "priority": null
         }

src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "8",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "6",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "finesse",
           "priority": null
         }

src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json

@@ -62,25 +62,25 @@
       "changes": [
         {
           "key": "system.traits.instinct.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "instinct",
           "priority": null
         }

src/packs/beastforms/beastform_Legendary_Beast_mqP6z4Wg4K3oDAom.json

@@ -49,13 +49,13 @@
       "changes": [
         {
           "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
+          "type": "add",
           "value": "6",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         }

src/packs/beastforms/beastform_Legendary_Hybrid_rRUtgcUjimlpPhnn.json

@@ -49,31 +49,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "8",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json

@@ -66,31 +66,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "12",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.instinct.value",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "7",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "instinct",
           "priority": null
         }

src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "agility",
           "priority": null
         }

src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json

@@ -65,31 +65,31 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "11",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "finesse",
           "priority": null
         }

src/packs/beastforms/beastform_Mythic_Beast_kObobka52JdpWBSu.json

@@ -49,19 +49,19 @@
       "changes": [
         {
           "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
+          "type": "add",
           "value": "9",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": 60
         }

src/packs/beastforms/beastform_Mythic_Hybrid_WAbxCf2An8qmxyJ1.json

@@ -49,31 +49,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "10",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json

@@ -62,25 +62,25 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "agility",
           "priority": null
         }

src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.instinct.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "6",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "instinct",
           "priority": null
         }

src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "finesse",
           "priority": null
         }

src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "finesse",
           "priority": null
         }

src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json

@@ -65,31 +65,31 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "4",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "10",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "strength",
           "priority": null
         }

src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json

@@ -62,31 +62,31 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         },
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.diceIndex",
-          "mode": 5,
+          "type": "override",
           "value": "0",
           "priority": null
         },
         {
           "key": "system.rules.attack.damage.bonus",
-          "mode": 5,
+          "type": "override",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.rules.attack.roll.trait",
-          "mode": 5,
+          "type": "override",
           "value": "finesse",
           "priority": null
         }

src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json

@@ -60,7 +60,7 @@
       "changes": [
         {
           "key": "system.resistance.physical.resistance",
-          "mode": 5,
+          "type": "override",
           "value": "1",
           "priority": null
         }
@@ -98,7 +98,7 @@
       "changes": [
         {
           "key": "system.resistance.physical.reduction",
-          "mode": 2,
+          "type": "add",
           "value": "@system.armorScore",
           "priority": 21
         }

src/packs/beastforms/feature_Hollow_Bones_xVgmXhj2YgeqS1KK.json

@@ -25,13 +25,13 @@
       "changes": [
         {
           "key": "system.damageThresholds.major",
-          "mode": 2,
+          "type": "add",
           "value": "-2",
           "priority": null
         },
         {
           "key": "system.damageThresholds.severe",
-          "mode": 2,
+          "type": "add",
           "value": "-2",
           "priority": null
         }

src/packs/beastforms/feature_Physical_Defense_StabkQ3BzWRZa8Tz.json

@@ -25,13 +25,13 @@
       "changes": [
         {
           "key": "system.damageThresholds.major",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         },
         {
           "key": "system.damageThresholds.severe",
-          "mode": 2,
+          "type": "add",
           "value": "3",
           "priority": null
         }

src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json

@@ -62,7 +62,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }

src/packs/beastforms/feature_Takedown_0ey4kM9ssj2otHvb.json

@@ -108,7 +108,7 @@
       "changes": [
         {
           "key": "system.proficiency",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         }

src/packs/beastforms/feature_Thick_Hide_ZYbdXaWVj2zdcmaK.json

@@ -25,13 +25,13 @@
       "changes": [
         {
           "key": "system.damageThresholds.major",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.damageThresholds.severe",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         }

src/packs/beastforms/feature_Undaunted_ODudjX88Te4vDP57.json

@@ -25,13 +25,13 @@
       "changes": [
         {
           "key": "system.damageThresholds.major",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         },
         {
           "key": "system.damageThresholds.severe",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         }

src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json

@@ -24,13 +24,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.levelData.level.current",
             "priority": null
           },
           {
             "key": "system.rules.burden.ignore",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }

src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json

@@ -55,7 +55,7 @@
         "changes": [
           {
             "key": "system.bonuses.rally",
-            "mode": 2,
+            "type": "add",
             "value": "6 + min((floor(@system.levelData.level.current / 5)*2), 2)",
             "priority": null
           }

src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json

@@ -28,13 +28,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "@tierd6",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "@tierd6",
             "priority": null
           }

src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json

@@ -65,31 +65,31 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ORIGIN.@item.resource.value",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ORIGIN.@item.resource.value",
             "priority": null
           },
           {
             "key": "system.rules.damageReduction.reduceSeverity.physical",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           },
           {
             "key": "system.rules.conditionImmunities.vulnerable",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           },
           {
             "key": "system.rules.conditionImmunities.restrained",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }

src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Move without being heard.",
             "priority": null
           }

src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json

@@ -27,19 +27,19 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Consort with nobles",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Negotiate prices",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Leverage your reputation to get what you want",
             "priority": null
           }

src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json

@@ -27,19 +27,19 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Negotiate with criminals",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Detect lies",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Find a safe place to hide",
             "priority": null
           }

src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json

@@ -27,19 +27,19 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Traverse dangerous cliffs and ledges",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Navigate harsh environment",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Use your survival knowledge",
             "priority": null
           }

src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json

@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "History, culture, or politics of a prominent person or place",
             "priority": null
           }

src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json

@@ -68,7 +68,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.spellcast.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+1",
             "priority": null
           }

src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json

@@ -27,13 +27,13 @@
         "changes": [
           {
             "key": "system.bonuses.roll.attack.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "2",
             "priority": null
           },
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "4",
             "priority": null
           }

src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json

@@ -35,13 +35,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.strength.value",
             "priority": 21
           },
           {
             "key": "system.bonuses.damage.secondaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.strength.value",
             "priority": 21
           }

src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json

@@ -88,7 +88,7 @@
         "changes": [
           {
             "key": "system.traits.presence.value",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.strength.value",
             "priority": null
           }

src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json

@@ -60,7 +60,7 @@
         "changes": [
           {
             "key": "system.traits.agility.value",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }

src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json

@@ -26,7 +26,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.maxArmorMarked.stressExtra",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }