From 0fbfe388b0cd32f77894f38ab57f12f54c6e51c2 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Date: Fri, 10 Jul 2026 19:52:50 -0400
Subject: [PATCH 1/6] Remove postEvaluate static method (#2073)

---
 module/dice/d20Roll.mjs     |  7 +++---
 module/dice/damageRoll.mjs  | 36 ++++++++++++++++------------
 module/dice/dhRoll.mjs      | 47 ++++++++++++++++++++-----------------
 module/dice/dualityRoll.mjs | 35 ++++++++++++---------------
 module/dice/fateRoll.mjs    | 22 ++++++++---------
 5 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index e9c447e4..7dc06741 100644
--- a/module/dice/d20Roll.mjs
+++ b/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() {
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index ef810ed7..3f2f79e0 100644
--- a/module/dice/damageRoll.mjs
+++ b/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)
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index 1c6ec829..16472fea 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -33,7 +33,9 @@ export default class DHRoll extends Roll {
 
         if (config.skips?.createMessage) config.messageRoll = roll;
 
-        await this.buildEvaluate(roll, config, (message = {}));
+        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 {
+        await roll.evaluate();
+        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;
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index e2d967a3..38d9315f 100644
--- a/module/dice/dualityRoll.mjs
+++ b/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);
diff --git a/module/dice/fateRoll.mjs b/module/dice/fateRoll.mjs
index 114fad59..f8276ce1 100644
--- a/module/dice/fateRoll.mjs
+++ b/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);
     }
 }

From 780aaf216c8bcef1ea79af11273cdbfd69bf5a56 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sat, 11 Jul 2026 21:05:15 +0200
Subject: [PATCH 2/6] Fixed a typo in getTemplateShape and added stopPropagaton
 when clicking enriched buttons (#2074)

---
 module/enrichers/TemplateEnricher.mjs |  2 +-
 module/enrichers/_module.mjs          | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs
index 4478ea14..b951f41e 100644
--- a/module/enrichers/TemplateEnricher.mjs
+++ b/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,
diff --git a/module/enrichers/_module.mjs b/module/enrichers/_module.mjs
index b80f166c..02002884 100644
--- a/module/enrichers/_module.mjs
+++ b/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)));
 };

From 2c980708369c9c14fd4424c98848a885d6622d38 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sat, 11 Jul 2026 22:27:38 +0200
Subject: [PATCH 3/6] Fixed so that the v13/v14 change from mode to type is
 fixed in SRD (#2075)

---
 ...ersary_Adult_Flickerfly_G7jiltRjgvVhZewm.json |  2 +-
 .../adversary_Archer_Guard_JRhrrEg5UroURiAD.json |  2 +-
 ...rsary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json |  2 +-
 .../adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json  |  4 ++--
 .../adversary_Construct_uOP5oT9QzXPlnf3p.json    |  2 +-
 ...ersary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json |  2 +-
 ...ersary_Demon_of_Despair_kE4dfhqmIQpNd44e.json |  2 +-
 ...rsary_Failed_Experiment_ChwwVqowFw8hJQwT.json |  4 ++--
 .../adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json  |  2 +-
 ...ersary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json |  2 +-
 ...Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json |  2 +-
 ...Greater_Water_Elemental_xIICT6tEdnA7dKDV.json |  2 +-
 ...versary_Hallowed_Archer_kabueAo6BALApWqp.json |  2 +-
 ...ary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json |  2 +-
 ...ary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json |  2 +-
 ...ary_Knight_of_the_Realm_7ai2opemrclQe3VF.json |  4 ++--
 ...y_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json |  2 +-
 ...uter_Realms_Abomination_A0SeeDzwjvqOsyof.json |  2 +-
 ...versary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json |  2 +-
 ...ersary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json |  2 +-
 ...versary_Spectral_Archer_5tCkhnBByUIN5UdG.json |  2 +-
 ...ersary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json |  2 +-
 ...rsary_Spectral_Guardian_UFVGl1osOsJTneLf.json |  2 +-
 ...Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json |  2 +-
 ...y_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json |  2 +-
 ...ic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json |  2 +-
 ...agon__Obsidian_Predator_ladm7wykhZczYzrQ.json |  4 ++--
 ...adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json |  2 +-
 ...eature_Celestial_Trance_TfolXWFG2W2hx6sK.json |  4 ++--
 .../feature_Dread_Visage_i92lYjDhVB0LyPid.json   |  2 +-
 .../feature_Efficient_2xlqKOkDxWHbuj4t.json      |  4 ++--
 .../feature_Endurance_tXWEMdLXafUSZTbK.json      |  2 +-
 .../feature_High_Stamina_HMXNJZ7ynzajR2KT.json   |  2 +-
 ...feature_Natural_Climber_soQvPL0MrTLLcc31.json |  2 +-
 .../feature_Nimble_3lNqft3LmOlEIEkw.json         |  2 +-
 .../feature_Scales_u8ZhV962rNmUlzkp.json         |  2 +-
 .../feature_Shell_A6a87OWA3tx16g9V.json          |  4 ++--
 .../feature_Thick_Skin_S0Ww7pYOSREt8qKg.json     |  2 +-
 .../feature_Tusks_YhxD1ujZpftPu19w.json          |  4 ++--
 .../feature_Wings_WquAjoOcso8lwySW.json          |  2 +-
 .../beastform_Agile_Scout_a9UoCwtrbgKk02mK.json  |  8 ++++----
 ...stform_Aquatic_Predator_ItBVeCl2u5uetgy7.json | 10 +++++-----
 ...beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json |  8 ++++----
 ...eastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json | 10 +++++-----
 ...form_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json | 10 +++++-----
 ...eastform_Great_Predator_afbMt4Ld6nY3mw0N.json | 10 +++++-----
 ...form_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json | 10 +++++-----
 ...stform_Household_Friend_iDmOtiHJJ80AIAVT.json |  8 ++++----
 ...astform_Legendary_Beast_mqP6z4Wg4K3oDAom.json |  4 ++--
 ...stform_Legendary_Hybrid_rRUtgcUjimlpPhnn.json | 10 +++++-----
 ...stform_Massive_Behemoth_qjwMzPn33aKZACkv.json | 10 +++++-----
 ...beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json | 10 +++++-----
 ...eastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json | 10 +++++-----
 ...rm_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json | 10 +++++-----
 .../beastform_Mythic_Beast_kObobka52JdpWBSu.json |  6 +++---
 ...beastform_Mythic_Hybrid_WAbxCf2An8qmxyJ1.json | 10 +++++-----
 ...beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json |  8 ++++----
 ...beastform_Pack_Predator_YLisKYYhAGca50WM.json | 10 +++++-----
 ...tform_Pouncing_Predator_33oFSZ1PwFqInHPe.json | 10 +++++-----
 ...eastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json | 10 +++++-----
 ...tform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json | 10 +++++-----
 ...stform_Striking_Serpent_1XrZWGDttBAAUxR1.json | 10 +++++-----
 ...astform_Terrible_Lizard_5BABxRe2XVrYTj8N.json | 10 +++++-----
 .../beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json | 10 +++++-----
 .../feature_Armored_Shell_nDQZdIF2epKlhauX.json  |  4 ++--
 .../feature_Hollow_Bones_xVgmXhj2YgeqS1KK.json   |  4 ++--
 ...eature_Physical_Defense_StabkQ3BzWRZa8Tz.json |  4 ++--
 .../feature_Rampage_8upqfcZvi7b5hRLE.json        |  2 +-
 .../feature_Takedown_0ey4kM9ssj2otHvb.json       |  2 +-
 .../feature_Thick_Hide_ZYbdXaWVj2zdcmaK.json     |  4 ++--
 .../feature_Undaunted_ODudjX88Te4vDP57.json      |  4 ++--
 ...feature_Combat_Training_eoSmuAJmgHUyULtp.json |  4 ++--
 .../classes/feature_Rally_PydiMnNCKpd44SGS.json  |  2 +-
 .../feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json   |  4 ++--
 .../feature_Unstoppable_PnD2UCgzIlwX6cY3.json    | 10 +++++-----
 .../feature_Lightfoot_TQ1AIQjndC4mYmmU.json      |  2 +-
 .../feature_Privilege_C7NR6qRatawZusmg.json      |  6 +++---
 .../feature_Scoundrel_ZmEuBdL0JrvuA8le.json      |  6 +++---
 .../feature_Steady_DYmmr5CknLtHnwuj.json         |  6 +++---
 .../feature_Well_Read_JBZJmywisJg5X3tH.json      |  2 +-
 ...mainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json |  2 +-
 ...omainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json |  4 ++--
 .../domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json |  4 ++--
 ...omainCard_Bold_Presence_tdsL00yTSLNgZWs6.json |  2 +-
 ...domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json |  2 +-
 .../domainCard_Brace_QXs4vssSqNGQu5b8.json       |  2 +-
 ...omainCard_Codex_Touched_7Pu83ABdMukTxu3e.json |  2 +-
 ...ainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json |  6 +++---
 ...ainCard_Cruel_Precision_bap1eCWryPNowbyo.json |  8 ++++----
 ...domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json |  2 +-
 ...omainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json |  2 +-
 ...mainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json |  2 +-
 .../domainCard_Forager_06UapZuaA5S6fAKl.json     |  2 +-
 ...ainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json |  6 +++---
 ...mainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json |  2 +-
 ...ainCard_Fortified_Armor_oVa49lI107eZILZr.json |  4 ++--
 .../domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json |  2 +-
 ...mainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json |  2 +-
 ...domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json |  2 +-
 .../domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json  |  2 +-
 ...omainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json |  2 +-
 ...inCard_Natural_Familiar_Tag303LoRNC5zGgl.json |  4 ++--
 ...ainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json |  2 +-
 ...mainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json | 16 ++++++++--------
 ...domainCard_On_the_Brink_zbxPl81kbWEegKQN.json |  2 +-
 ...omainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json |  6 +++---
 .../domainCard_Recovery_gsiQFT6q3WOgqerJ.json    |  8 ++++----
 .../domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json     |  2 +-
 .../domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json  |  4 ++--
 ...domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json |  6 +++---
 ...domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json |  2 +-
 .../domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json |  2 +-
 ...domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json |  2 +-
 ...ard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json |  2 +-
 ...inCard_Splendor_Touched_JT5dM3gVL6chDBYU.json |  2 +-
 ...inCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json |  2 +-
 .../domainCard_Untouchable_9QElncQUDSakuSdR.json |  2 +-
 .../domainCard_Vitality_sWUlSPOJEaXyQLCj.json    |  8 ++++----
 ...ainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json |  6 +++---
 ...environment_Cult_Ritual_QAXXiOKBDmCTauHD.json |  6 +++---
 ...nment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json |  8 ++++----
 ...nvironment_Haunted_City_OzYbizKraK92FDiI.json |  2 +-
 ...dvanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json |  2 +-
 ...vanced_Full_Plate_Armor_crIbCb9NZ4K0VpoU.json |  4 ++--
 ...Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json |  2 +-
 ...mor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json |  2 +-
 .../armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json  |  2 +-
 .../armor_Chainmail_Armor_haULhuEg37zUUvhb.json  |  2 +-
 .../armor_Channeling_Armor_vMJxEWz1srfwMsoj.json |  2 +-
 ...r_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json |  2 +-
 ...or_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json |  2 +-
 .../armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json |  4 ++--
 .../armor_Gambeson_Armor_yJFp1bfpecDcStVK.json   |  2 +-
 ...mproved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json |  2 +-
 ...proved_Full_Plate_Armor_9f7RozpPTqrzJS1m.json |  4 ++--
 ...Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json |  2 +-
 ...ntree_Breastplate_Armor_tzZntboNtHL5C6VM.json |  4 ++--
 ...gendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json |  2 +-
 ...endary_Full_Plate_Armor_SXWjUR2aUR6bYvdl.json |  4 ++--
 ...egendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json |  2 +-
 .../armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json   |  2 +-
 .../armor_Savior_Chainmail_8X16lJQ3xltTwynm.json | 14 +++++++-------
 ...rmor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json |  4 ++--
 ...onsumable_Attune_Potion_JGD3M9hBHtVAA8XP.json |  2 +-
 ...nsumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json |  2 +-
 ...consumable_Charm_Potion_CVBbFfOY75YwyQsp.json |  2 +-
 ...nsumable_Control_Potion_eeBhZSGLjuNZuJuI.json |  2 +-
 ...umable_Enlighten_Potion_aWHSO2AqDufi7nL4.json |  2 +-
 ...able_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json |  2 +-
 ...oved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json |  2 +-
 ...ble_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json |  2 +-
 ...le_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json |  2 +-
 ...able_Major_Charm_Potion_IJLAUlQymbSjzsri.json |  2 +-
 ...le_Major_Control_Potion_80s1FLmTLtohZ5GH.json |  2 +-
 ..._Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json |  2 +-
 .../consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json |  2 +-
 ...ble_Potion_of_Stability_dvL8oaxpEF6jKvYN.json |  4 ++--
 ...sumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json |  2 +-
 ...onsumable_Stride_Potion_lNtcrkgFGOJNaroE.json |  2 +-
 .../loot/loot_Arcane_Prism_Mn1eo2Mdtu1kzyxB.json |  2 +-
 .../loot/loot_Attune_Relic_vK6bKyQTT3m8WvMh.json |  2 +-
 .../loot_Bolster_Relic_m3EpxlDgxn2tCDDR.json     |  2 +-
 .../loot_Charging_Quiver_gsUDP90d4SRtLEUn.json   |  4 ++--
 .../loot/loot_Charm_Relic_9P9jqGSlxVCbTdLe.json  |  2 +-
 .../loot_Control_Relic_QPGBDItjrRhXU6iJ.json     |  2 +-
 .../loot_Enlighten_Relic_vSGx1f9SYUiA29L3.json   |  2 +-
 .../loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json   |  4 ++--
 ...loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json |  4 ++--
 .../loot/loot_Stride_Relic_FfJISMzYATaPQPLc.json |  2 +-
 .../weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json     |  2 +-
 ...Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json |  2 +-
 ...pon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json |  2 +-
 ...pon_Advanced_Greatsword_MAC6YWTo4lzSotQc.json |  2 +-
 ...weapon_Advanced_Halberd_C8gQn7onAc9wsrCs.json |  2 +-
 ..._Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json |  2 +-
 ...weapon_Advanced_Longbow_M5CywMAyPKGgebsJ.json |  2 +-
 ...pon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json |  2 +-
 ...n_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json |  2 +-
 ...apon_Advanced_Warhammer_8Lipw3RRKDgBVP0p.json |  2 +-
 ...Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json |  2 +-
 .../weapon_Bravesword_QZrWAkprA2tL2MOI.json      |  4 ++--
 .../weapon_Broadsword_1cwWNt4sqlgA8gCT.json      |  2 +-
 .../weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json |  2 +-
 .../weapon_Curved_Dagger_Fk69R40svV0kanZD.json   |  2 +-
 .../weapon_Finehair_Bow_ykF3jouxHZ6YR8Bg.json    |  2 +-
 ...weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json |  2 +-
 .../weapon_Fusion_Gloves_uK1RhtYAsDeoPNGx.json   |  2 +-
 .../weapon_Gilded_Bow_ctTgFfMbM3YtmsYU.json      |  2 +-
 .../weapon_Greatsword_70ysaFJDREwTgvZa.json      |  2 +-
 .../weapons/weapon_Halberd_qT7FfmauAumOjJoq.json |  2 +-
 ..._Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json |  2 +-
 ...Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json |  2 +-
 ...pon_Improved_Broadsword_OcKeLJxvmdT81VBc.json |  2 +-
 ...pon_Improved_Greatsword_FPX4ouDrxXiQ5MDf.json |  2 +-
 ...weapon_Improved_Halberd_F9PETfCQGwczBPif.json |  2 +-
 ..._Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json |  2 +-
 ...weapon_Improved_Longbow_NacNonjbzyoVMNhI.json |  2 +-
 ...pon_Improved_Shortsword_rSyBNRwemBVuTo3H.json |  2 +-
 ...n_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json |  2 +-
 ...apon_Improved_Warhammer_pxaN4ZK4eqKrjtWj.json |  2 +-
 .../weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json  |  2 +-
 ...Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json |  2 +-
 ...on_Legendary_Broadsword_y3hfTPfZhMognyaJ.json |  2 +-
 ...on_Legendary_Greatsword_zMZ46F9VR7zdTxb9.json |  2 +-
 ...eapon_Legendary_Halberd_1AuMNiJz96Ez9fur.json |  2 +-
 ..._Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json |  2 +-
 ...eapon_Legendary_Longbow_Utt1GpoH1fhaTOtN.json |  2 +-
 ...on_Legendary_Shortsword_dEumq3BIZBk5xYTk.json |  2 +-
 ..._Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json |  2 +-
 ...pon_Legendary_Warhammer_W9ymfEDck2icfvla.json |  2 +-
 .../weapons/weapon_Longbow_YfVs6Se903az4Yet.json |  2 +-
 .../weapon_Midas_Scythe_BdLfy5i488VZgkjP.json    |  2 +-
 ...weapon_Powered_Gauntlet_bW3xw5S9DbaLCN3E.json |  2 +-
 .../weapon_Shortsword_cjGZpXCoshEqi1FI.json      |  2 +-
 .../weapon_Sledge_Axe_OxsEmffWriiQmqJK.json      |  2 +-
 .../weapon_Small_Dagger_wKklDxs5nkzILNp4.json    |  2 +-
 .../weapon_Thistlebow_I1nDGpulg29GpWOW.json      |  2 +-
 ...on_Wand_of_Enthrallment_tP6vmnrmTq2h5sj7.json |  2 +-
 .../weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json      |  2 +-
 .../weapon_Warhammer_ZXh1GQahBiODfSTC.json       |  2 +-
 .../feature_Adrenaline_uByM34yQlw38yf1V.json     |  4 ++--
 ...ature_Advanced_Training_uGcs785h94RMtueH.json |  2 +-
 .../feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json  |  2 +-
 .../feature_Ascendant_fefLgx6kcYWusjBb.json      |  2 +-
 .../feature_At_Ease_xPWFvGvtUjIcqgJq.json        |  2 +-
 .../feature_Battlemage_Y9eGMewnFZgPvX0M.json     |  2 +-
 .../feature_Conjure_Shield_oirsCnN66GOlK3Fa.json |  2 +-
 ...ture_Elemental_Dominion_EFUJHrkTuyv8uA9l.json |  4 ++--
 ...e_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json |  6 +++---
 .../feature_Elementalist_dPcqKN5NeDkjB1HW.json   |  6 +++---
 .../feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json    |  2 +-
 ...feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json |  2 +-
 ...feature_Expert_Training_iCXtOWBKv1FdKdWz.json |  2 +-
 ...feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json |  2 +-
 .../feature_Iron_Will_7AVRNyBcd1Nffjtn.json      |  2 +-
 ...ature_Ruthless_Predator_Qny2J3R35bvC0Cey.json |  2 +-
 .../feature_Transcendence_th6HZwEFnVBjUtqm.json  |  2 +-
 .../feature_Undaunted_866b2jjyzXP8nPRQ.json      |  4 ++--
 .../feature_Unrelenting_4qP7bNyxVHBmr4Rb.json    |  4 ++--
 .../feature_Unwavering_WBiFZaYNoQNhysmN.json     |  4 ++--
 .../feature_Wings_of_Light_KkQH0tYhagIqe2MT.json |  4 ++--
 241 files changed, 416 insertions(+), 416 deletions(-)

diff --git a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
index 9fef39f0..ad558d43 100644
--- a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
index 46dc3777..d9399007 100644
--- a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
index f156174d..51eb7273 100644
--- a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
index 8739fb2e..3db27edd 100644
--- a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
index 840f030b..02f6d587 100644
--- a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
index e80c91d3..ebd41544 100644
--- a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
index 6ac0279c..219136ff 100644
--- a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
index 325530b0..fa963fce 100644
--- a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
index dd10483a..044d51a0 100644
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@@ -268,7 +268,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "3",
                 "priority": null
               }
diff --git a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
index 74fd0b04..fef1d858 100644
--- a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
+++ b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
@@ -272,7 +272,7 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "2",
                 "priority": null
               }
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index a3ae5de3..2fe67f24 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
index f0f68c11..ef2cf6d5 100644
--- a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
index 34e40c70..64a4dfb6 100644
--- a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
index a8600966..6b005769 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
index c9fbb78a..72f4626d 100644
--- a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
index da767edc..f86717fc 100644
--- a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
index b22bbe51..7c4bbdba 100644
--- a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
index bb5b99fe..e9a0b5f7 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
index e9cfde91..5e2e8200 100644
--- a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
index 288089a5..4cf72b0b 100644
--- a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
index 6acbcf61..bda82248 100644
--- a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
index 73d06ee6..20668427 100644
--- a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
index dcb4e57e..e9792485 100644
--- a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
index 4d70cf28..8afe5f9e 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
index 9ecd43fc..906e05ff 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
index 9052287b..04663981 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
index 2959c66f..29117035 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
+++ b/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
               }
diff --git a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
index 322b23af..ee324e16 100644
--- a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
+++ b/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
               }
diff --git a/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json b/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json
index b1022f1f..0321223a 100644
--- a/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json b/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json
index 0b38aebc..5d72e579 100644
--- a/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json b/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json
index fad97bdf..5a567695 100644
--- a/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json b/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json
index 9d4710ab..ecf3d148 100644
--- a/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json b/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json
index b93562e1..c653d13b 100644
--- a/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json b/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json
index 8b33dc70..3817b5bd 100644
--- a/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json b/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json
index 07d894e3..d7bf9dd4 100644
--- a/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json
+++ b/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json
@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json b/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json
index 6bf571ab..956d4aa3 100644
--- a/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json b/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json
index 4dbfbc34..3063966e 100644
--- a/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json b/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json
index d9fc92de..e3712cd5 100644
--- a/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json b/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json
index 3581bb7f..53c3de82 100644
--- a/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json
+++ b/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
           }
diff --git a/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json b/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json
index 0db94fb2..b90b6076 100644
--- a/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json
+++ b/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json
@@ -57,7 +57,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "2",
             "priority": null
           }
diff --git a/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json b/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
index bd9bfffb..0fc7a23d 100644
--- a/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json b/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
index 5287de84..9cf209e2 100644
--- a/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json b/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
index 95bea914..7816fd93 100644
--- a/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json b/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
index ba18c05f..bc9187f5 100644
--- a/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json b/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
index 0dfe9c20..5131fd69 100644
--- a/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json b/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
index 450a1312..d8d41890 100644
--- a/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json b/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
index c04b2182..e3842c7e 100644
--- a/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json b/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
index cfb6aea7..ff7daa91 100644
--- a/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Legendary_Beast_mqP6z4Wg4K3oDAom.json b/src/packs/beastforms/beastform_Legendary_Beast_mqP6z4Wg4K3oDAom.json
index 60ba7cd0..dd35735b 100644
--- a/src/packs/beastforms/beastform_Legendary_Beast_mqP6z4Wg4K3oDAom.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Legendary_Hybrid_rRUtgcUjimlpPhnn.json b/src/packs/beastforms/beastform_Legendary_Hybrid_rRUtgcUjimlpPhnn.json
index 4575820e..58edfabc 100644
--- a/src/packs/beastforms/beastform_Legendary_Hybrid_rRUtgcUjimlpPhnn.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json b/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
index 35715056..1b34daf9 100644
--- a/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json b/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
index 390bf054..8f76f675 100644
--- a/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json b/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
index adb9627b..5393c188 100644
--- a/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json b/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
index dc373c27..80571c43 100644
--- a/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Mythic_Beast_kObobka52JdpWBSu.json b/src/packs/beastforms/beastform_Mythic_Beast_kObobka52JdpWBSu.json
index cd879ac0..84dfb32b 100644
--- a/src/packs/beastforms/beastform_Mythic_Beast_kObobka52JdpWBSu.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Mythic_Hybrid_WAbxCf2An8qmxyJ1.json b/src/packs/beastforms/beastform_Mythic_Hybrid_WAbxCf2An8qmxyJ1.json
index fa35eaac..691d9972 100644
--- a/src/packs/beastforms/beastform_Mythic_Hybrid_WAbxCf2An8qmxyJ1.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json b/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
index 183ad150..30523e41 100644
--- a/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json b/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
index 834493bb..82a0dded 100644
--- a/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json b/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
index d172d8f3..f058d649 100644
--- a/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json b/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
index 7fa832e6..6ad91eed 100644
--- a/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json b/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
index 16520a9c..cf6f49f2 100644
--- a/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json b/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
index f78500c9..16111887 100644
--- a/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json b/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
index 49818b74..e9993526 100644
--- a/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
+++ b/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
         }
diff --git a/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json b/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
index 4ca44471..ccb67283 100644
--- a/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
+++ b/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
         }
diff --git a/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json b/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json
index 7aaefef8..395a1d7d 100644
--- a/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json
+++ b/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
         }
diff --git a/src/packs/beastforms/feature_Hollow_Bones_xVgmXhj2YgeqS1KK.json b/src/packs/beastforms/feature_Hollow_Bones_xVgmXhj2YgeqS1KK.json
index d047a501..23b2317f 100644
--- a/src/packs/beastforms/feature_Hollow_Bones_xVgmXhj2YgeqS1KK.json
+++ b/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
         }
diff --git a/src/packs/beastforms/feature_Physical_Defense_StabkQ3BzWRZa8Tz.json b/src/packs/beastforms/feature_Physical_Defense_StabkQ3BzWRZa8Tz.json
index f4c86b8c..6edc64da 100644
--- a/src/packs/beastforms/feature_Physical_Defense_StabkQ3BzWRZa8Tz.json
+++ b/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
         }
diff --git a/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json b/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json
index 03c3b2c7..8c86458b 100644
--- a/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json
+++ b/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json
@@ -62,7 +62,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/beastforms/feature_Takedown_0ey4kM9ssj2otHvb.json b/src/packs/beastforms/feature_Takedown_0ey4kM9ssj2otHvb.json
index 531b30ea..591f4857 100644
--- a/src/packs/beastforms/feature_Takedown_0ey4kM9ssj2otHvb.json
+++ b/src/packs/beastforms/feature_Takedown_0ey4kM9ssj2otHvb.json
@@ -108,7 +108,7 @@
       "changes": [
         {
           "key": "system.proficiency",
-          "mode": 2,
+          "type": "add",
           "value": "2",
           "priority": null
         }
diff --git a/src/packs/beastforms/feature_Thick_Hide_ZYbdXaWVj2zdcmaK.json b/src/packs/beastforms/feature_Thick_Hide_ZYbdXaWVj2zdcmaK.json
index 6eba9342..932749bf 100644
--- a/src/packs/beastforms/feature_Thick_Hide_ZYbdXaWVj2zdcmaK.json
+++ b/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
         }
diff --git a/src/packs/beastforms/feature_Undaunted_ODudjX88Te4vDP57.json b/src/packs/beastforms/feature_Undaunted_ODudjX88Te4vDP57.json
index 092efe51..d13c8a1c 100644
--- a/src/packs/beastforms/feature_Undaunted_ODudjX88Te4vDP57.json
+++ b/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
         }
diff --git a/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json b/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json
index 8b4ad82e..34f242ed 100644
--- a/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json
+++ b/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
           }
diff --git a/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json b/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
index e4f84a9f..9ecb926b 100644
--- a/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
+++ b/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
           }
diff --git a/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json b/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
index 4b5ce9bd..83db7d06 100644
--- a/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
+++ b/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
           }
diff --git a/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json b/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
index 56362824..5477f2c4 100644
--- a/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
+++ b/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
           }
diff --git a/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json b/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json
index 91c771fc..84134bbb 100644
--- a/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json
+++ b/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
           }
diff --git a/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json b/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json
index caae7322..85ef1ec3 100644
--- a/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json
+++ b/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
           }
diff --git a/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json b/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json
index 55605a00..7f7a34ae 100644
--- a/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json
+++ b/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
           }
diff --git a/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json b/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json
index ee9c683c..292fd773 100644
--- a/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json
+++ b/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
           }
diff --git a/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json b/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json
index 3ce8fd16..28d4c962 100644
--- a/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json b/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json
index 70e2d23c..361558d3 100644
--- a/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json b/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json
index 8cc9834e..ba8c56a9 100644
--- a/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json b/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json
index 7c5a7ef1..fc49b640 100644
--- a/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json b/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json
index 95b73ff5..3d7a26e2 100644
--- a/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json b/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json
index 35f8a4d0..3fc45037 100644
--- a/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json b/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json
index 23b15eba..321de80a 100644
--- a/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json
+++ b/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
           }
diff --git a/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json b/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json
index f07e89be..3eb4da35 100644
--- a/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json
+++ b/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json
@@ -89,7 +89,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.spellcast.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json b/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json
index 62f42054..0b581925 100644
--- a/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json
+++ b/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json
@@ -66,19 +66,19 @@
         "changes": [
           {
             "key": "system.bonuses.roll.attack.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "-2",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "+2",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+2",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json b/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json
index c71dfa04..fbe1d7c7 100644
--- a/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json
+++ b/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json
@@ -26,13 +26,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.agility.value",
             "priority": 21
           },
           {
             "key": "system.bonuses.damage.secondaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.agility.value",
             "priority": 21
           }
@@ -69,13 +69,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.finesse.value",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.secondaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.traits.finesse.value",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json b/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json
index 938f2daf..e794241f 100644
--- a/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json
+++ b/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json
@@ -60,7 +60,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json b/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json
index dac804e2..f8696f52 100644
--- a/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json
+++ b/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json
@@ -66,7 +66,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Deceive or trick someone into believing a lie you told them",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json b/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json
index 6cb59b2c..671d1233 100644
--- a/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json
+++ b/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json
@@ -68,7 +68,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.attack.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json b/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json
index cfa183d1..00786add 100644
--- a/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json
+++ b/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json
@@ -260,7 +260,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.spellcast.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "2",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json b/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json
index 9db4016c..913de9e0 100644
--- a/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json
+++ b/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json
@@ -95,19 +95,19 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "10",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "10",
             "priority": null
           },
           {
             "key": "system.rules.conditionImmunities.restrained",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json b/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json
index f345262a..164b3a71 100644
--- a/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json
+++ b/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json
@@ -91,7 +91,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.attack.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+3",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json b/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json
index 7162c664..90ed8d89 100644
--- a/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json
+++ b/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json
@@ -26,13 +26,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
           }
diff --git a/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json b/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
index f4cc2cbf..fde3f546 100644
--- a/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
+++ b/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.stressDamageReduction.severe.cost",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json b/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json
index 7998b6c4..ad1c1580 100644
--- a/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json
+++ b/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json
@@ -66,7 +66,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "+1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json b/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json
index 11610aac..884324f7 100644
--- a/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json
+++ b/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json
@@ -109,7 +109,7 @@
         "changes": [
           {
             "key": "system.disadvantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Attacking the goading creature",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json b/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json
index 790acf08..d7f1d82d 100644
--- a/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json
+++ b/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json
@@ -26,7 +26,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "If you failed your previous action roll",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json b/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json
index 8c0122f4..4941eddd 100644
--- a/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json
+++ b/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json
@@ -96,7 +96,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Presence Rolls to avoid scrutiny.",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json b/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json
index f561e0be..68ed1c54 100644
--- a/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json
+++ b/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json
@@ -142,13 +142,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "d6",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "d6",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json b/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json
index 81c0734e..42734531 100644
--- a/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json
+++ b/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json
@@ -112,7 +112,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.spellcast.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+2",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json b/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json
index 4662a882..396b7153 100644
--- a/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json
+++ b/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json
@@ -214,13 +214,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+5",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+5",
             "priority": null
           }
@@ -257,13 +257,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+10",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+10",
             "priority": null
           }
@@ -300,13 +300,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+15",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+15",
             "priority": null
           }
@@ -343,13 +343,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+20",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+20",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json b/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json
index c4c89d17..2dc7b95e 100644
--- a/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json
+++ b/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json
@@ -26,7 +26,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.thresholdImmunities.minor",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json b/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json
index 250bc539..1a5e40df 100644
--- a/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json
+++ b/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json
@@ -26,19 +26,19 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Pick nonmagical locks",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Disarm nonmagical traps",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Steal items from a target (either through stealth or by force)",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json b/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json
index 83e3a22c..bf6ffbf3 100644
--- a/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json
+++ b/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json
@@ -60,13 +60,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
           }
@@ -99,13 +99,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
           }
diff --git a/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json b/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json
index 74f6293f..09c82b6e 100644
--- a/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json
+++ b/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json
@@ -95,7 +95,7 @@
         "changes": [
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": 21
           }
diff --git a/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json b/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json
index de4872a2..14c79df8 100644
--- a/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json
+++ b/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json
@@ -66,13 +66,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
           }
diff --git a/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json b/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json
index 082f8620..a289fd30 100644
--- a/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json
+++ b/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json
@@ -108,7 +108,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.spellcast.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+2",
             "priority": null
           }
@@ -149,7 +149,7 @@
         "changes": [
           {
             "key": "system.traits.agility.value",
-            "mode": 1,
+            "type": "multiply",
             "value": "2",
             "priority": null
           }
@@ -186,7 +186,7 @@
         "changes": [
           {
             "key": "system.traits.instinct.value",
-            "mode": 1,
+            "type": "multiply",
             "value": "2",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json b/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json
index 9c9a31c7..b942cc20 100644
--- a/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json
+++ b/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json
@@ -57,7 +57,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Attack rolls while shrouded in low light or darkness.",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json b/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json
index 6a2b565c..03155bf1 100644
--- a/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json
+++ b/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json
@@ -68,7 +68,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.increasePerArmorMark",
-            "mode": 2,
+            "type": "add",
             "value": "+1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json b/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json
index b6461215..f73deba0 100644
--- a/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json
+++ b/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json
@@ -82,7 +82,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.stressDamageReduction.any.cost",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json b/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json
index 0ee15cb9..5291c31c 100644
--- a/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json
+++ b/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json
@@ -66,7 +66,7 @@
         "changes": [
           {
             "key": "system.resistance.physical.immunity",
-            "mode": 5,
+            "type": "override",
             "value": "true",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json b/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json
index a7609b62..730ac290 100644
--- a/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json
+++ b/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json
@@ -27,7 +27,7 @@
         "changes": [
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "+3",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json b/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json
index 6088f1dc..e0a2d403 100644
--- a/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json
+++ b/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json
@@ -100,7 +100,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Presence Rolls to avoid scrutiny",
             "priority": null
           }
diff --git a/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json b/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json
index a5326403..9693b6bf 100644
--- a/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json
+++ b/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json
@@ -26,7 +26,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "ceil(@system.traits.agility.value / 2)",
             "priority": 21
           }
diff --git a/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json b/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
index 2d42ef9f..6b4f1740 100644
--- a/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
+++ b/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
@@ -69,7 +69,7 @@
         "changes": [
           {
             "key": "system.resources.hitPoints.max",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
@@ -106,7 +106,7 @@
         "changes": [
           {
             "key": "system.resources.stress.max",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
@@ -143,13 +143,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
           }
diff --git a/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json b/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json
index 5b6c21ca..86305f00 100644
--- a/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json
+++ b/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json
@@ -26,13 +26,13 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "De-escalate violent situations.",
             "priority": null
           },
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Convince someone to follow your lead.",
             "priority": null
           }
@@ -69,7 +69,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "+1",
             "priority": null
           }
diff --git a/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json b/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
index f3845f23..d6809cd1 100644
--- a/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
+++ b/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
@@ -186,7 +186,7 @@
             "changes": [
               {
                 "key": "system.rules.dualityRoll.defaultHopeDice",
-                "mode": 5,
+                "type": "override",
                 "value": "d10",
                 "priority": null
               }
@@ -312,13 +312,13 @@
             "changes": [
               {
                 "key": "system.bonuses.damage.physical.dice",
-                "mode": 2,
+                "type": "add",
                 "value": "1d10",
                 "priority": null
               },
               {
                 "key": "system.bonuses.damage.magical.dice",
-                "mode": 2,
+                "type": "add",
                 "value": "1d10",
                 "priority": null
               }
diff --git a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
index e7ca7832..339ac5cd 100644
--- a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
+++ b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
@@ -425,25 +425,25 @@
             "changes": [
               {
                 "key": "system.difficulty",
-                "mode": 2,
+                "type": "add",
                 "value": "0",
                 "priority": null
               },
               {
                 "key": "system.bonuses.damage.physical.bonus",
-                "mode": 2,
+                "type": "add",
                 "value": "0",
                 "priority": null
               },
               {
                 "key": "system.bonuses.damage.magical.bonus",
-                "mode": 2,
+                "type": "add",
                 "value": "0",
                 "priority": null
               },
               {
                 "key": "system.bonuses.roll.attack.bonus",
-                "mode": 2,
+                "type": "add",
                 "value": "0",
                 "priority": null
               }
diff --git a/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json b/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
index f2da690b..564612cb 100644
--- a/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
+++ b/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
@@ -206,7 +206,7 @@
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
-                "mode": 5,
+                "type": "override",
                 "value": "1",
                 "priority": null
               }
diff --git a/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json b/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json
index 4566396a..53f9bf79 100644
--- a/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json
+++ b/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Advanced_Full_Plate_Armor_crIbCb9NZ4K0VpoU.json b/src/packs/items/armors/armor_Advanced_Full_Plate_Armor_crIbCb9NZ4K0VpoU.json
index 52adc7aa..5fde7416 100644
--- a/src/packs/items/armors/armor_Advanced_Full_Plate_Armor_crIbCb9NZ4K0VpoU.json
+++ b/src/packs/items/armors/armor_Advanced_Full_Plate_Armor_crIbCb9NZ4K0VpoU.json
@@ -45,12 +45,12 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-2"
         },
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json b/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json
index 36edec39..fe6a96fb 100644
--- a/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json
+++ b/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json b/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json
index c470de87..8df5162f 100644
--- a/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json
+++ b/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.traits.presence.value",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json b/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json
index 4ee73939..70a8b229 100644
--- a/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json
+++ b/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.rules.damageReduction.physical",
-          "mode": 5,
+          "type": "override",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json b/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json
index 4f0719a7..c41978b9 100644
--- a/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json
+++ b/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json b/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json
index e805d5d1..9f24ee70 100644
--- a/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json
+++ b/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.bonuses.roll.spellcast",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
index 1cf74e2e..d8de4497 100644
--- a/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
+++ b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.resistance.magical.reduction",
-          "mode": 2,
+          "type": "add",
           "value": "@system.armorScore",
           "priority": 21
         }
diff --git a/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json b/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json
index 9f2d7ece..acc8c125 100644
--- a/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json
+++ b/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.rules.damageReduction.increasePerArmorMark",
-          "mode": 5,
+          "type": "override",
           "value": "2"
         }
       ],
diff --git a/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json b/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json
index 7701d063..7d08e57e 100644
--- a/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json
+++ b/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json
@@ -45,12 +45,12 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-2"
         },
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json b/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json
index 0ede5b60..0ab7203b 100644
--- a/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json
+++ b/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json b/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json
index ef93ecdd..c87b1f51 100644
--- a/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json
+++ b/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Improved_Full_Plate_Armor_9f7RozpPTqrzJS1m.json b/src/packs/items/armors/armor_Improved_Full_Plate_Armor_9f7RozpPTqrzJS1m.json
index 1723c53a..85b4ed88 100644
--- a/src/packs/items/armors/armor_Improved_Full_Plate_Armor_9f7RozpPTqrzJS1m.json
+++ b/src/packs/items/armors/armor_Improved_Full_Plate_Armor_9f7RozpPTqrzJS1m.json
@@ -45,12 +45,12 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-2"
         },
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json b/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json
index a2ff6554..4f2f3c2b 100644
--- a/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json
+++ b/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json b/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json
index a664ad9c..d73d5e45 100644
--- a/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json
+++ b/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json
@@ -45,13 +45,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
         }
diff --git a/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json b/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json
index 6c93cbe4..472b243c 100644
--- a/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json
+++ b/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Legendary_Full_Plate_Armor_SXWjUR2aUR6bYvdl.json b/src/packs/items/armors/armor_Legendary_Full_Plate_Armor_SXWjUR2aUR6bYvdl.json
index f66e4c38..52f52882 100644
--- a/src/packs/items/armors/armor_Legendary_Full_Plate_Armor_SXWjUR2aUR6bYvdl.json
+++ b/src/packs/items/armors/armor_Legendary_Full_Plate_Armor_SXWjUR2aUR6bYvdl.json
@@ -45,12 +45,12 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-2"
         },
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json b/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json
index 4cf1c856..a703c7c7 100644
--- a/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json
+++ b/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json b/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json
index 6bb479a4..a160aeee 100644
--- a/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json
+++ b/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json
@@ -45,7 +45,7 @@
       "changes": [
         {
           "key": "system.rules.damageReduction.magical",
-          "mode": 5,
+          "type": "override",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json b/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json
index 6826254a..0a7f55ba 100644
--- a/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json
+++ b/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json
@@ -45,37 +45,37 @@
       "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"
         }
       ],
diff --git a/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json b/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json
index ac9115a2..8f91f92b 100644
--- a/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json
+++ b/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json
@@ -45,12 +45,12 @@
       "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"
         }
       ],
diff --git a/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json b/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
index e034976a..d17ae550 100644
--- a/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
+++ b/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.instinct.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json b/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
index 421acdc3..d200d825 100644
--- a/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
+++ b/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json b/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
index f1d7b058..015f334e 100644
--- a/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
+++ b/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.presence.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json b/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
index 2c6b9a93..dbb6b796 100644
--- a/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
+++ b/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json b/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
index bff70126..5d9712b1 100644
--- a/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
+++ b/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.knowledge.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json b/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
index 1472c00a..22cc7723 100644
--- a/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
+++ b/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
@@ -63,7 +63,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "1d6",
             "priority": null
           }
diff --git a/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json b/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
index ed8ca562..3e5907d8 100644
--- a/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
+++ b/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
@@ -63,7 +63,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "1d8",
             "priority": null
           }
diff --git a/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json b/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
index b27fee91..784ed534 100644
--- a/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
+++ b/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.instinct.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json b/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
index 95cd6c92..fc35ef93 100644
--- a/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
+++ b/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json b/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
index c7e22aeb..c70ff759 100644
--- a/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
+++ b/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.presence.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json b/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
index 1dabf6c6..3f8786d2 100644
--- a/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
+++ b/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json b/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
index 5a9a2d28..ea3e4ffc 100644
--- a/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
+++ b/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.knowledge.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json b/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
index 62d9e6bf..596b5ac8 100644
--- a/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
+++ b/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
@@ -63,7 +63,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "1d12",
             "priority": null
           }
diff --git a/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json b/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
index ddff33f0..ecfc34ea 100644
--- a/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
+++ b/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
@@ -63,13 +63,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
         }
diff --git a/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json b/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
index 0a2b6469..ec8e6d5a 100644
--- a/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
+++ b/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
@@ -63,7 +63,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "1d12",
             "priority": null
           }
diff --git a/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json b/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
index 76d43d33..c13af610 100644
--- a/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
+++ b/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
@@ -63,7 +63,7 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Arcane_Prism_Mn1eo2Mdtu1kzyxB.json b/src/packs/items/loot/loot_Arcane_Prism_Mn1eo2Mdtu1kzyxB.json
index 016c7262..2a6729d2 100644
--- a/src/packs/items/loot/loot_Arcane_Prism_Mn1eo2Mdtu1kzyxB.json
+++ b/src/packs/items/loot/loot_Arcane_Prism_Mn1eo2Mdtu1kzyxB.json
@@ -53,7 +53,7 @@
       "changes": [
         {
           "key": "system.bonuses.roll.spellcast.bonus",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Attune_Relic_vK6bKyQTT3m8WvMh.json b/src/packs/items/loot/loot_Attune_Relic_vK6bKyQTT3m8WvMh.json
index abed8a55..60afc84c 100644
--- a/src/packs/items/loot/loot_Attune_Relic_vK6bKyQTT3m8WvMh.json
+++ b/src/packs/items/loot/loot_Attune_Relic_vK6bKyQTT3m8WvMh.json
@@ -23,7 +23,7 @@
       "changes": [
         {
           "key": "system.traits.instinct.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Bolster_Relic_m3EpxlDgxn2tCDDR.json b/src/packs/items/loot/loot_Bolster_Relic_m3EpxlDgxn2tCDDR.json
index d45af6dc..2d7c360e 100644
--- a/src/packs/items/loot/loot_Bolster_Relic_m3EpxlDgxn2tCDDR.json
+++ b/src/packs/items/loot/loot_Bolster_Relic_m3EpxlDgxn2tCDDR.json
@@ -23,7 +23,7 @@
       "changes": [
         {
           "key": "system.traits.strength.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json b/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json
index 8f9a5904..a31a4e93 100644
--- a/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json
+++ b/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json
@@ -23,13 +23,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.tier",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.tier",
             "priority": null
           }
diff --git a/src/packs/items/loot/loot_Charm_Relic_9P9jqGSlxVCbTdLe.json b/src/packs/items/loot/loot_Charm_Relic_9P9jqGSlxVCbTdLe.json
index f3313941..514df12b 100644
--- a/src/packs/items/loot/loot_Charm_Relic_9P9jqGSlxVCbTdLe.json
+++ b/src/packs/items/loot/loot_Charm_Relic_9P9jqGSlxVCbTdLe.json
@@ -23,7 +23,7 @@
       "changes": [
         {
           "key": "system.traits.presence.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Control_Relic_QPGBDItjrRhXU6iJ.json b/src/packs/items/loot/loot_Control_Relic_QPGBDItjrRhXU6iJ.json
index 254f4017..5df7b228 100644
--- a/src/packs/items/loot/loot_Control_Relic_QPGBDItjrRhXU6iJ.json
+++ b/src/packs/items/loot/loot_Control_Relic_QPGBDItjrRhXU6iJ.json
@@ -23,7 +23,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Enlighten_Relic_vSGx1f9SYUiA29L3.json b/src/packs/items/loot/loot_Enlighten_Relic_vSGx1f9SYUiA29L3.json
index a6ca361e..a99e6b9b 100644
--- a/src/packs/items/loot/loot_Enlighten_Relic_vSGx1f9SYUiA29L3.json
+++ b/src/packs/items/loot/loot_Enlighten_Relic_vSGx1f9SYUiA29L3.json
@@ -23,7 +23,7 @@
       "changes": [
         {
           "key": "system.traits.knowledge.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json b/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json
index 1dcf503c..3d0493c4 100644
--- a/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json
+++ b/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json
@@ -46,13 +46,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": null
           }
diff --git a/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json b/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json
index 47f38431..6db909b2 100644
--- a/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json
+++ b/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json
@@ -53,13 +53,13 @@
         "changes": [
           {
             "key": "system.resistance.magical.resistance",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           },
           {
             "key": "system.resistance.physical.resistance",
-            "mode": 5,
+            "type": "override",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/items/loot/loot_Stride_Relic_FfJISMzYATaPQPLc.json b/src/packs/items/loot/loot_Stride_Relic_FfJISMzYATaPQPLc.json
index 703d8439..50917309 100644
--- a/src/packs/items/loot/loot_Stride_Relic_FfJISMzYATaPQPLc.json
+++ b/src/packs/items/loot/loot_Stride_Relic_FfJISMzYATaPQPLc.json
@@ -23,7 +23,7 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "1",
           "priority": null
         }
diff --git a/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json b/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
index 975b2489..195d3ef9 100644
--- a/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
+++ b/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
index 8910a1a4..042d922a 100644
--- a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
+++ b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
@@ -118,7 +118,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json b/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
index 23c78cc8..f7e1f872 100644
--- a/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
+++ b/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Advanced_Greatsword_MAC6YWTo4lzSotQc.json b/src/packs/items/weapons/weapon_Advanced_Greatsword_MAC6YWTo4lzSotQc.json
index 9e04bf7a..39d1b6f2 100644
--- a/src/packs/items/weapons/weapon_Advanced_Greatsword_MAC6YWTo4lzSotQc.json
+++ b/src/packs/items/weapons/weapon_Advanced_Greatsword_MAC6YWTo4lzSotQc.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Advanced_Halberd_C8gQn7onAc9wsrCs.json b/src/packs/items/weapons/weapon_Advanced_Halberd_C8gQn7onAc9wsrCs.json
index 6c11724c..92841972 100644
--- a/src/packs/items/weapons/weapon_Advanced_Halberd_C8gQn7onAc9wsrCs.json
+++ b/src/packs/items/weapons/weapon_Advanced_Halberd_C8gQn7onAc9wsrCs.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json b/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json
index 7f5bb9c7..1e9a6441 100644
--- a/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json
+++ b/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json
@@ -115,7 +115,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Advanced_Longbow_M5CywMAyPKGgebsJ.json b/src/packs/items/weapons/weapon_Advanced_Longbow_M5CywMAyPKGgebsJ.json
index 14327a8c..4bf1375d 100644
--- a/src/packs/items/weapons/weapon_Advanced_Longbow_M5CywMAyPKGgebsJ.json
+++ b/src/packs/items/weapons/weapon_Advanced_Longbow_M5CywMAyPKGgebsJ.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json b/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json
index 64337b2b..2a24d0cc 100644
--- a/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json
+++ b/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json b/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
index 55bcc11f..2e313ace 100644
--- a/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
+++ b/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Advanced_Warhammer_8Lipw3RRKDgBVP0p.json b/src/packs/items/weapons/weapon_Advanced_Warhammer_8Lipw3RRKDgBVP0p.json
index bb142281..8770ef57 100644
--- a/src/packs/items/weapons/weapon_Advanced_Warhammer_8Lipw3RRKDgBVP0p.json
+++ b/src/packs/items/weapons/weapon_Advanced_Warhammer_8Lipw3RRKDgBVP0p.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
index 4ee53b92..cdb26ca6 100644
--- a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
+++ b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Bravesword_QZrWAkprA2tL2MOI.json b/src/packs/items/weapons/weapon_Bravesword_QZrWAkprA2tL2MOI.json
index 412a7083..281ec542 100644
--- a/src/packs/items/weapons/weapon_Bravesword_QZrWAkprA2tL2MOI.json
+++ b/src/packs/items/weapons/weapon_Bravesword_QZrWAkprA2tL2MOI.json
@@ -116,12 +116,12 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         },
         {
           "key": "system.damageThresholds.severe",
-          "mode": 2,
+          "type": "add",
           "value": "ITEM.@system.tier"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json b/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
index 3e7662da..1bed724d 100644
--- a/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
+++ b/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json b/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json
index be147888..911dd4c3 100644
--- a/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json
+++ b/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json
@@ -154,7 +154,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "@system.armorScore",
           "priority": 21
         }
diff --git a/src/packs/items/weapons/weapon_Curved_Dagger_Fk69R40svV0kanZD.json b/src/packs/items/weapons/weapon_Curved_Dagger_Fk69R40svV0kanZD.json
index 1af2c372..ddaa12d0 100644
--- a/src/packs/items/weapons/weapon_Curved_Dagger_Fk69R40svV0kanZD.json
+++ b/src/packs/items/weapons/weapon_Curved_Dagger_Fk69R40svV0kanZD.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.rules.damage.flipMinDiceValue",
-          "mode": 5,
+          "type": "override",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Finehair_Bow_ykF3jouxHZ6YR8Bg.json b/src/packs/items/weapons/weapon_Finehair_Bow_ykF3jouxHZ6YR8Bg.json
index d1bd58b5..4523ad41 100644
--- a/src/packs/items/weapons/weapon_Finehair_Bow_ykF3jouxHZ6YR8Bg.json
+++ b/src/packs/items/weapons/weapon_Finehair_Bow_ykF3jouxHZ6YR8Bg.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.bonuses.roll.primaryWeapon.attack",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json b/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json
index acf0cfd6..ffd6531f 100644
--- a/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json
+++ b/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
+          "type": "add",
           "value": "@system.traits.agility.value",
           "priority": 21
         }
diff --git a/src/packs/items/weapons/weapon_Fusion_Gloves_uK1RhtYAsDeoPNGx.json b/src/packs/items/weapons/weapon_Fusion_Gloves_uK1RhtYAsDeoPNGx.json
index 034ad5cf..e2e61ec7 100644
--- a/src/packs/items/weapons/weapon_Fusion_Gloves_uK1RhtYAsDeoPNGx.json
+++ b/src/packs/items/weapons/weapon_Fusion_Gloves_uK1RhtYAsDeoPNGx.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
+          "type": "add",
           "value": "@system.levelData.level.current"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Gilded_Bow_ctTgFfMbM3YtmsYU.json b/src/packs/items/weapons/weapon_Gilded_Bow_ctTgFfMbM3YtmsYU.json
index 0147cfdb..0f5b5c71 100644
--- a/src/packs/items/weapons/weapon_Gilded_Bow_ctTgFfMbM3YtmsYU.json
+++ b/src/packs/items/weapons/weapon_Gilded_Bow_ctTgFfMbM3YtmsYU.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.rules.damage.flipMinDiceValue",
-          "mode": 5,
+          "type": "override",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Greatsword_70ysaFJDREwTgvZa.json b/src/packs/items/weapons/weapon_Greatsword_70ysaFJDREwTgvZa.json
index f0e450a4..74aa3cf3 100644
--- a/src/packs/items/weapons/weapon_Greatsword_70ysaFJDREwTgvZa.json
+++ b/src/packs/items/weapons/weapon_Greatsword_70ysaFJDREwTgvZa.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Halberd_qT7FfmauAumOjJoq.json b/src/packs/items/weapons/weapon_Halberd_qT7FfmauAumOjJoq.json
index 5a990da3..8d58b29b 100644
--- a/src/packs/items/weapons/weapon_Halberd_qT7FfmauAumOjJoq.json
+++ b/src/packs/items/weapons/weapon_Halberd_qT7FfmauAumOjJoq.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json b/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json
index e74ff4aa..a8187c25 100644
--- a/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json
+++ b/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
index 71f03625..f7d1a9d3 100644
--- a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
+++ b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
@@ -118,7 +118,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json b/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
index c0b2d460..cd7f62d4 100644
--- a/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
+++ b/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Improved_Greatsword_FPX4ouDrxXiQ5MDf.json b/src/packs/items/weapons/weapon_Improved_Greatsword_FPX4ouDrxXiQ5MDf.json
index 60e5dd53..ec618f0b 100644
--- a/src/packs/items/weapons/weapon_Improved_Greatsword_FPX4ouDrxXiQ5MDf.json
+++ b/src/packs/items/weapons/weapon_Improved_Greatsword_FPX4ouDrxXiQ5MDf.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Improved_Halberd_F9PETfCQGwczBPif.json b/src/packs/items/weapons/weapon_Improved_Halberd_F9PETfCQGwczBPif.json
index fb5a1dcc..79c3a31b 100644
--- a/src/packs/items/weapons/weapon_Improved_Halberd_F9PETfCQGwczBPif.json
+++ b/src/packs/items/weapons/weapon_Improved_Halberd_F9PETfCQGwczBPif.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json b/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json
index e65cc221..1443e76f 100644
--- a/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json
+++ b/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json
@@ -115,7 +115,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Improved_Longbow_NacNonjbzyoVMNhI.json b/src/packs/items/weapons/weapon_Improved_Longbow_NacNonjbzyoVMNhI.json
index c197f726..cc083a33 100644
--- a/src/packs/items/weapons/weapon_Improved_Longbow_NacNonjbzyoVMNhI.json
+++ b/src/packs/items/weapons/weapon_Improved_Longbow_NacNonjbzyoVMNhI.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json b/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
index 070e2374..498b5dfb 100644
--- a/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
+++ b/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json b/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
index 5b0282f1..01f3fc8e 100644
--- a/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
+++ b/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Improved_Warhammer_pxaN4ZK4eqKrjtWj.json b/src/packs/items/weapons/weapon_Improved_Warhammer_pxaN4ZK4eqKrjtWj.json
index aa24c4ad..47b553a6 100644
--- a/src/packs/items/weapons/weapon_Improved_Warhammer_pxaN4ZK4eqKrjtWj.json
+++ b/src/packs/items/weapons/weapon_Improved_Warhammer_pxaN4ZK4eqKrjtWj.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json b/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
index f511af8b..e72607cb 100644
--- a/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
+++ b/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
index 6d022c8a..935584a8 100644
--- a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
+++ b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
@@ -118,7 +118,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json b/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
index 3a09f8e4..4570fa8b 100644
--- a/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Legendary_Greatsword_zMZ46F9VR7zdTxb9.json b/src/packs/items/weapons/weapon_Legendary_Greatsword_zMZ46F9VR7zdTxb9.json
index aa9d2ef0..97464c6b 100644
--- a/src/packs/items/weapons/weapon_Legendary_Greatsword_zMZ46F9VR7zdTxb9.json
+++ b/src/packs/items/weapons/weapon_Legendary_Greatsword_zMZ46F9VR7zdTxb9.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Legendary_Halberd_1AuMNiJz96Ez9fur.json b/src/packs/items/weapons/weapon_Legendary_Halberd_1AuMNiJz96Ez9fur.json
index af6b2a07..2b411f11 100644
--- a/src/packs/items/weapons/weapon_Legendary_Halberd_1AuMNiJz96Ez9fur.json
+++ b/src/packs/items/weapons/weapon_Legendary_Halberd_1AuMNiJz96Ez9fur.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json b/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json
index d8816fc9..9139a7b0 100644
--- a/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json
+++ b/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json
@@ -115,7 +115,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Legendary_Longbow_Utt1GpoH1fhaTOtN.json b/src/packs/items/weapons/weapon_Legendary_Longbow_Utt1GpoH1fhaTOtN.json
index bd5ab13b..e9e95967 100644
--- a/src/packs/items/weapons/weapon_Legendary_Longbow_Utt1GpoH1fhaTOtN.json
+++ b/src/packs/items/weapons/weapon_Legendary_Longbow_Utt1GpoH1fhaTOtN.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json b/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
index cfc648de..c01a6d5e 100644
--- a/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
+++ b/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json b/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
index 33859bf4..42a977f6 100644
--- a/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Legendary_Warhammer_W9ymfEDck2icfvla.json b/src/packs/items/weapons/weapon_Legendary_Warhammer_W9ymfEDck2icfvla.json
index 562122d2..91d26e71 100644
--- a/src/packs/items/weapons/weapon_Legendary_Warhammer_W9ymfEDck2icfvla.json
+++ b/src/packs/items/weapons/weapon_Legendary_Warhammer_W9ymfEDck2icfvla.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Longbow_YfVs6Se903az4Yet.json b/src/packs/items/weapons/weapon_Longbow_YfVs6Se903az4Yet.json
index 43af46ab..f2995cb5 100644
--- a/src/packs/items/weapons/weapon_Longbow_YfVs6Se903az4Yet.json
+++ b/src/packs/items/weapons/weapon_Longbow_YfVs6Se903az4Yet.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.traits.finesse.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Midas_Scythe_BdLfy5i488VZgkjP.json b/src/packs/items/weapons/weapon_Midas_Scythe_BdLfy5i488VZgkjP.json
index 57fe2367..143d4910 100644
--- a/src/packs/items/weapons/weapon_Midas_Scythe_BdLfy5i488VZgkjP.json
+++ b/src/packs/items/weapons/weapon_Midas_Scythe_BdLfy5i488VZgkjP.json
@@ -145,7 +145,7 @@
       "changes": [
         {
           "key": "system.proficiency",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Powered_Gauntlet_bW3xw5S9DbaLCN3E.json b/src/packs/items/weapons/weapon_Powered_Gauntlet_bW3xw5S9DbaLCN3E.json
index 3c4ebd1c..9ba6f1b1 100644
--- a/src/packs/items/weapons/weapon_Powered_Gauntlet_bW3xw5S9DbaLCN3E.json
+++ b/src/packs/items/weapons/weapon_Powered_Gauntlet_bW3xw5S9DbaLCN3E.json
@@ -152,7 +152,7 @@
       "changes": [
         {
           "key": "system.proficiency",
-          "mode": 2,
+          "type": "add",
           "value": "1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json b/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
index 61f91b58..e8d49d15 100644
--- a/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
+++ b/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1",
             "priority": null
           }
diff --git a/src/packs/items/weapons/weapon_Sledge_Axe_OxsEmffWriiQmqJK.json b/src/packs/items/weapons/weapon_Sledge_Axe_OxsEmffWriiQmqJK.json
index d0230362..3e43c85a 100644
--- a/src/packs/items/weapons/weapon_Sledge_Axe_OxsEmffWriiQmqJK.json
+++ b/src/packs/items/weapons/weapon_Sledge_Axe_OxsEmffWriiQmqJK.json
@@ -171,7 +171,7 @@
       "changes": [
         {
           "key": "system.traits.agility.value",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json b/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
index ddaa312f..184b1ff0 100644
--- a/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
+++ b/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
@@ -123,7 +123,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "ITEM.@system.tier + 1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json b/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
index 3821342f..4cd9ad55 100644
--- a/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
+++ b/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Wand_of_Enthrallment_tP6vmnrmTq2h5sj7.json b/src/packs/items/weapons/weapon_Wand_of_Enthrallment_tP6vmnrmTq2h5sj7.json
index 84c7b3f2..ea13be12 100644
--- a/src/packs/items/weapons/weapon_Wand_of_Enthrallment_tP6vmnrmTq2h5sj7.json
+++ b/src/packs/items/weapons/weapon_Wand_of_Enthrallment_tP6vmnrmTq2h5sj7.json
@@ -152,7 +152,7 @@
       "changes": [
         {
           "key": "system.traits.presence.value",
-          "mode": 2,
+          "type": "add",
           "value": "2"
         }
       ],
diff --git a/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json b/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
index df9186ac..fc893901 100644
--- a/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
+++ b/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
@@ -119,7 +119,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.primaryWeapon.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "1"
           }
         ]
diff --git a/src/packs/items/weapons/weapon_Warhammer_ZXh1GQahBiODfSTC.json b/src/packs/items/weapons/weapon_Warhammer_ZXh1GQahBiODfSTC.json
index a94950c7..17724919 100644
--- a/src/packs/items/weapons/weapon_Warhammer_ZXh1GQahBiODfSTC.json
+++ b/src/packs/items/weapons/weapon_Warhammer_ZXh1GQahBiODfSTC.json
@@ -116,7 +116,7 @@
       "changes": [
         {
           "key": "system.evasion",
-          "mode": 2,
+          "type": "add",
           "value": "-1"
         }
       ],
diff --git a/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json b/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json
index 764dd92a..95cb2263 100644
--- a/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json
+++ b/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json
@@ -28,13 +28,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.levelData.level.current",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "@system.levelData.level.current",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json b/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json
index f15d1efa..b551ef50 100644
--- a/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json
+++ b/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.companionData.levelupChoices",
-            "mode": 2,
+            "type": "add",
             "value": "2",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json b/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json
index c884bc6f..e563668d 100644
--- a/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json
+++ b/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json
@@ -32,7 +32,7 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+10",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json b/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json
index 845e287d..abdbe271 100644
--- a/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json
+++ b/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "+4",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json b/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json
index abc5fbfc..f63b0e42 100644
--- a/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json
+++ b/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.resources.stress.max",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json b/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json
index c9b54d71..36706909 100644
--- a/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json
+++ b/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.resources.hitPoints.max",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json b/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json
index 0455de3d..8f542544 100644
--- a/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json
+++ b/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": 21
           }
diff --git a/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json b/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
index 5035393f..0adda762 100644
--- a/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
+++ b/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
@@ -144,7 +144,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
@@ -223,7 +223,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json b/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json
index e7e282b4..87150aa0 100644
--- a/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json
+++ b/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json
@@ -246,13 +246,13 @@
         "changes": [
           {
             "key": "system.damageThresholds.major",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": 21
           },
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "@system.proficiency",
             "priority": 21
           }
@@ -289,7 +289,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Advantage on Agility Rolls",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json b/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json
index 8ab51263..dd989364 100644
--- a/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json
+++ b/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json
@@ -101,7 +101,7 @@
         "changes": [
           {
             "key": "system.bonuses.roll.action.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+2",
             "priority": null
           }
@@ -138,13 +138,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+3",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.physical.bonus",
-            "mode": 2,
+            "type": "add",
             "value": "+3",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json b/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json
index c5814cdc..2367f220 100644
--- a/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json
+++ b/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json
@@ -23,7 +23,7 @@
         "changes": [
           {
             "key": "system.bonuses.rally",
-            "mode": 5,
+            "type": "override",
             "value": "d10",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json b/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json
index 59164f27..15871e9f 100644
--- a/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json
+++ b/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.advantageSources",
-            "mode": 2,
+            "type": "add",
             "value": "Presence rolls while flying",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json b/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json
index e356c3a9..0ae1a60d 100644
--- a/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json
+++ b/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.companionData.levelupChoices",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json b/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json
index 2b338bb3..fe3f252f 100644
--- a/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json
+++ b/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.evasion",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json b/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json
index e45f91e0..fa8516ca 100644
--- a/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json
+++ b/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json
@@ -24,7 +24,7 @@
         "changes": [
           {
             "key": "system.rules.damageReduction.maxArmorMarked.value",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json b/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json
index 64bde511..ba92472f 100644
--- a/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json
+++ b/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json
@@ -63,7 +63,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json b/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
index 6d43ed30..32d8181c 100644
--- a/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
+++ b/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
@@ -133,7 +133,7 @@
         "changes": [
           {
             "key": "system.proficiency",
-            "mode": 2,
+            "type": "add",
             "value": "+1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json b/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json
index 79c51474..792dfd3c 100644
--- a/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json
+++ b/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json
@@ -24,13 +24,13 @@
         "changes": [
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "3",
             "priority": null
           },
           {
             "key": "system.damageThresholds.major",
-            "mode": 2,
+            "type": "add",
             "value": "3",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json b/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json
index 0b5e89f6..287a54c1 100644
--- a/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json
+++ b/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json
@@ -24,13 +24,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
           }
diff --git a/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json b/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json
index bd7172ea..dc183879 100644
--- a/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json
+++ b/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json
@@ -24,13 +24,13 @@
         "changes": [
           {
             "key": "system.damageThresholds.major",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           },
           {
             "key": "system.damageThresholds.severe",
-            "mode": 2,
+            "type": "add",
             "value": "1",
             "priority": null
           }
diff --git a/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json b/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
index 51a203fc..b7d8af3f 100644
--- a/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
+++ b/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
@@ -97,13 +97,13 @@
         "changes": [
           {
             "key": "system.bonuses.damage.physical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "+1d8",
             "priority": null
           },
           {
             "key": "system.bonuses.damage.magical.dice",
-            "mode": 2,
+            "type": "add",
             "value": "+1d8",
             "priority": null
           }

From c6411ef0fea48994eab7ef20e209672c122b461b Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sat, 11 Jul 2026 22:51:44 +0200
Subject: [PATCH 4/6] Cleaned up uses of 'mode' for activeEffects in configs
 (#2076)

---
 .../applications/dialogs/beastformDialog.mjs  |   6 +-
 module/applications/dialogs/deathMove.mjs     |  16 +-
 module/config/encounterConfig.mjs             |  26 +-
 module/config/itemConfig.mjs                  | 527 ++++++++++--------
 4 files changed, 315 insertions(+), 260 deletions(-)

diff --git a/module/applications/dialogs/beastformDialog.mjs b/module/applications/dialogs/beastformDialog.mjs
index 8ae6d5fe..8aca1844 100644
--- a/module/applications/dialogs/beastformDialog.mjs
+++ b/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
                             });
diff --git a/module/applications/dialogs/deathMove.mjs b/module/applications/dialogs/deathMove.mjs
index 4a949b99..8e0ed6af 100644
--- a/module/applications/dialogs/deathMove.mjs
+++ b/module/applications/dialogs/deathMove.mjs
@@ -139,13 +139,15 @@ 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,
-                changes: [
-                    {
-                        key: 'system.rules.roll.guaranteedCritical',
-                        mode: 2,
-                        value: 'true'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.rules.roll.guaranteedCritical',
+                            type: 'add',
+                            value: 'true'
+                        }
+                    ]
+                }
             }
         ]);
 
diff --git a/module/config/encounterConfig.mjs b/module/config/encounterConfig.mjs
index 4e0f8a6e..6ea03fcf 100644
--- a/module/config/encounterConfig.mjs
+++ b/module/config/encounterConfig.mjs
@@ -90,18 +90,20 @@ 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',
-                    changes: [
-                        {
-                            key: 'system.bonuses.damage.physical.dice',
-                            mode: 2,
-                            value: '1d4'
-                        },
-                        {
-                            key: 'system.bonuses.damage.magical.dice',
-                            mode: 2,
-                            value: '1d4'
-                        }
-                    ]
+                    system: {
+                        changes: [
+                            {
+                                key: 'system.bonuses.damage.physical.dice',
+                                type: 'add',
+                                value: '1d4'
+                            },
+                            {
+                                key: 'system.bonuses.damage.magical.dice',
+                                type: 'add',
+                                value: '1d4'
+                            }
+                        ]
+                    }
                 }
             ]
         }
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index 9ebfd1e2..61ed3703 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -37,13 +37,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.bonuses.roll.spellcast',
-                        mode: 2,
-                        value: '1'
-                    }
-                ]
+                system: {       
+                    changes: [
+                        {
+                            key: 'system.bonuses.roll.spellcast',
+                            type: 'add',
+                            value: '1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -55,43 +57,45 @@ 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',
-                changes: [
-                    {
-                        key: 'system.traits.agility.value',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.traits.strength.value',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.traits.finesse.value',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.traits.instinct.value',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.traits.presence.value',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.traits.knowledge.value',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.traits.agility.value',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.traits.strength.value',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.traits.finesse.value',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.traits.instinct.value',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.traits.presence.value',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.traits.knowledge.value',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -103,13 +107,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -121,13 +127,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.rules.damageReduction.increasePerArmorMark',
-                        mode: 5,
-                        value: '2'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.rules.damageReduction.increasePerArmorMark',
+                            type: 'override',
+                            value: '2'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -139,13 +147,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.traits.presence.value',
-                        mode: 2,
-                        value: '1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.traits.presence.value',
+                            type: 'add',
+                            value: '1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -157,13 +167,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -212,13 +224,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.rules.damageReduction.magical',
-                        mode: 5,
-                        value: 1
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.rules.damageReduction.magical',
+                            type: 'override',
+                            value: 1
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -249,13 +263,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.rules.damageReduction.physical',
-                        mode: 5,
-                        value: 1
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.rules.damageReduction.physical',
+                            type: 'override',
+                            value: 1
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -280,18 +296,20 @@ 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',
-                changes: [
-                    {
-                        key: 'system.bunuses.damageThresholds.major',
-                        mode: 2,
-                        value: '2'
-                    },
-                    {
-                        key: 'system.bunuses.damageThresholds.severe',
-                        mode: 2,
-                        value: '2'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.bunuses.damageThresholds.major',
+                            type: 'add',
+                            value: '2'
+                        },
+                        {
+                            key: 'system.bunuses.damageThresholds.severe',
+                            type: 'add',
+                            value: '2'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -326,18 +344,20 @@ 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',
-                changes: [
-                    {
-                        key: 'system.bonuses.damage.primaryWeapon.dice',
-                        mode: 2,
-                        value: '1d4'
-                    },
-                    {
-                        key: 'system.bonuses.damage.secondaryWeapon.dice',
-                        mode: 2,
-                        value: '1d4'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.bonuses.damage.primaryWeapon.dice',
+                            type: 'add',
+                            value: '1d4'
+                        },
+                        {
+                            key: 'system.bonuses.damage.secondaryWeapon.dice',
+                            type: 'add',
+                            value: '1d4'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -408,18 +428,20 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-2'
-                    },
-                    {
-                        key: 'system.traits.agility.value',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-2'
+                        },
+                        {
+                            key: 'system.traits.agility.value',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -431,14 +453,16 @@ 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',
-                changes: [
-                    {
-                        key: 'system.resistance.magical.reduction',
-                        mode: 2,
-                        value: '@system.armorScore',
-                        priority: 21
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.resistance.magical.reduction',
+                            type: 'add',
+                            value: '@system.armorScore',
+                            priority: 21
+                        }
+                    ]
+                }
             }
         ]
     }
@@ -488,21 +512,23 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'Armor',
-                        type: 'armor',
-                        typeData: {
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'Armor',
                             type: 'armor',
-                            max: 'ITEM.@system.tier + 1'
+                            typeData: {
+                                type: 'armor',
+                                max: 'ITEM.@system.tier + 1'
+                            }
                         }
-                    }
-                ]
+                    ]
+                }
             }
         ]
     },
@@ -514,13 +540,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.bonuses.damage.primaryWeapon.bonus',
-                        mode: 2,
-                        value: '@system.levelData.level.current'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.bonuses.damage.primaryWeapon.bonus',
+                            type: 'add',
+                            value: '@system.levelData.level.current'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -553,18 +581,20 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-1'
-                    },
-                    {
-                        key: 'system.damageThresholds.severe',
-                        mode: 2,
-                        value: 'ITEM.@system.tier'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-1'
+                        },
+                        {
+                            key: 'system.damageThresholds.severe',
+                            type: 'add',
+                            value: 'ITEM.@system.tier'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -618,13 +648,15 @@ export const weaponFeatures = {
                         name: 'DAGGERHEART.CONFIG.WeaponFeature.charged.name',
                         description: 'DAGGERHEART.CONFIG.WeaponFeature.charged.description',
                         img: 'icons/magic/lightning/claws-unarmed-strike-teal.webp',
-                        changes: [
-                            {
-                                key: 'system.proficiency',
-                                mode: 2,
-                                value: '1'
-                            }
-                        ]
+                        system: {
+                            changes: [
+                                {
+                                    key: 'system.proficiency',
+                                    type: 'add',
+                                    value: '1'
+                                }
+                            ]
+                        }
                     }
                 ]
             }
@@ -660,13 +692,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.traits.finesse.value',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.traits.finesse.value',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -707,14 +741,16 @@ 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',
-                        changes: [
-                            {
-                                key: 'system.evasion',
-                                mode: 2,
-                                value: '@system.armorScore',
-                                priority: 21
-                            }
-                        ]
+                        system: {
+                            changes: [
+                                {
+                                    key: 'system.evasion',
+                                    type: 'add',
+                                    value: '@system.armorScore',
+                                    priority: 21
+                                }
+                            ]
+                        }
                     }
                 ]
             }
@@ -754,13 +790,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.traits.agility.value',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.traits.agility.value',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -795,7 +833,7 @@ export const weaponFeatures = {
                     changes: [
                         {
                             key: 'system.bonuses.damage.primaryWeapon.bonus',
-                            mode: 2,
+                            type: 'add',
                             value: '1'
                         }
                     ],
@@ -902,13 +940,15 @@ 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',
-                        changes: [
-                            {
-                                key: 'system.proficiency',
-                                mode: 2,
-                                value: '1'
-                            }
-                        ]
+                        system: {
+                            changes: [
+                                {
+                                    key: 'system.proficiency',
+                                    type: 'add',
+                                    value: '1'
+                                }
+                            ]
+                        }
                     }
                 ]
             }
@@ -951,13 +991,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -1066,13 +1108,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.evasion',
-                        mode: 2,
-                        value: '-1'
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.evasion',
+                            type: 'add',
+                            value: '-1'
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -1107,7 +1151,7 @@ export const weaponFeatures = {
                     changes: [
                         {
                             key: 'system.bonuses.damage.primaryWeapon.bonus',
-                            mode: 2,
+                            type: 'add',
                             value: 'ITEM.@system.tier + 1'
                         }
                     ],
@@ -1158,13 +1202,15 @@ 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',
-                        changes: [
-                            {
-                                key: 'system.traits.presence.value',
-                                mode: 2,
-                                value: '2'
-                            }
-                        ]
+                        system: {
+                            changes: [
+                                {
+                                    key: 'system.traits.presence.value',
+                                    type: 'add',
+                                    value: '2'
+                                }
+                            ]
+                        }
                     }
                 ]
             }
@@ -1203,17 +1249,20 @@ 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',
-                changes: [
-                    {
-                        key: 'Armor',
-                        type: 'armor',
-                        value: 0,
-                        typeData: {
+                system: {
+                    changes: [
+                        {
+                            key: 'Armor',
                             type: 'armor',
-                            max: 'ITEM.@system.tier'
+                            value: 0,
+                            typeData: {
+                                type: 'armor',
+                                max: 'ITEM.@system.tier'
+                            }
                         }
-                    }
-                ]
+                    ]
+                }
+
             }
         ]
     },
@@ -1244,13 +1293,15 @@ 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',
-                changes: [
-                    {
-                        key: 'system.bonuses.roll.primaryWeapon.bonus',
-                        mode: 2,
-                        value: 1
-                    }
-                ]
+                system: {
+                    changes: [
+                        {
+                            key: 'system.bonuses.roll.primaryWeapon.bonus',
+                            type: 'add',
+                            value: 1
+                        }
+                    ]
+                }
             }
         ]
     },
@@ -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
                     }

From 76ee7779851e25b818c25f184ca6f9f7208a70b7 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sun, 12 Jul 2026 00:37:02 +0200
Subject: [PATCH 5/6] [Fix] ActiveEffect Mode OneTime Migration (#2078)

* Migrations for ActiveEffect Mode
* Start on migration handlers

---------

Co-authored-by: Carlos Fernandez <cfern1990@gmail.com>
---
 .../migration-handlers/2_5_2.mjs              | 38 +++++++++
 .../migration-handlers/base.mjs               | 77 +++++++++++++++++++
 module/systemRegistration/migrations.mjs      | 15 +++-
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 module/systemRegistration/migration-handlers/2_5_2.mjs
 create mode 100644 module/systemRegistration/migration-handlers/base.mjs

diff --git a/module/systemRegistration/migration-handlers/2_5_2.mjs b/module/systemRegistration/migration-handlers/2_5_2.mjs
new file mode 100644
index 00000000..f6d9ea77
--- /dev/null
+++ b/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 }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/module/systemRegistration/migration-handlers/base.mjs b/module/systemRegistration/migration-handlers/base.mjs
new file mode 100644
index 00000000..7426570d
--- /dev/null
+++ b/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 });
+    }
+}
\ No newline at end of file
diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index 6971c34c..fef97b8f 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/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);
+    }
 }

From 783505da0ace8667dd134bf5d6c961ebf6aea03d Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sun, 12 Jul 2026 00:37:37 +0200
Subject: [PATCH 6/6] Raised verison

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 3f1b49a6..43e06254 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.5.1",
+    "version": "2.5.2",
     "compatibility": {
         "minimum": "14.364",
         "verified": "14.364",
@@ -10,7 +10,7 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.5.1/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.5.2/system.zip",
     "authors": [
         {
             "name": "WBHarry"