diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs index 02914143..7d80e597 100644 --- a/module/config/itemConfig.mjs +++ b/module/config/itemConfig.mjs @@ -435,7 +435,8 @@ export const armorFeatures = { { key: 'system.resistance.magical.reduction', mode: 2, - value: '@system.armorScore' + value: '@system.armorScore', + priority: 21 } ] } @@ -709,7 +710,8 @@ export const weaponFeatures = { { key: 'system.evasion', mode: 2, - value: '@system.armorScore' + value: '@system.armorScore', + priority: 21 } ] } @@ -1324,7 +1326,8 @@ export const weaponFeatures = { { key: 'system.bonuses.damage.primaryWeapon.bonus', mode: 2, - value: '@system.traits.agility.value' + value: '@system.traits.agility.value', + priority: 21 } ] } @@ -1416,9 +1419,9 @@ export const orderedWeaponFeatures = () => { }; export const featureForm = { - passive: "DAGGERHEART.CONFIG.FeatureForm.passive", - action: "DAGGERHEART.CONFIG.FeatureForm.action", - reaction: "DAGGERHEART.CONFIG.FeatureForm.reaction" + passive: 'DAGGERHEART.CONFIG.FeatureForm.passive', + action: 'DAGGERHEART.CONFIG.FeatureForm.action', + reaction: 'DAGGERHEART.CONFIG.FeatureForm.reaction' }; export const featureTypes = { diff --git a/module/data/activeEffect/baseEffect.mjs b/module/data/activeEffect/baseEffect.mjs index 770e3462..ea74531d 100644 --- a/module/data/activeEffect/baseEffect.mjs +++ b/module/data/activeEffect/baseEffect.mjs @@ -1,3 +1,17 @@ +/** -- Changes Type Priorities -- + * - Base Number - + * Custom: 0 + * Multiply: 10 + * Add: 20 + * Downgrade: 30 + * Upgrade: 40 + * Override: 50 + * + * - Changes Value Priorities - + * Standard: +0 + * "Anything that uses another data model value as its value": +1 - Effects that increase traits have to be calculated first at Base priority. (EX: Raise evasion by half your agility) + */ + export default class BaseEffect extends foundry.abstract.TypeDataModel { static defineSchema() { const fields = foundry.data.fields; diff --git a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json index 6bfb88a6..e4ba41fb 100644 --- a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json +++ b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json @@ -284,7 +284,7 @@ "key": "system.bonuses.roll.attack.bonus", "mode": 2, "value": "ITEM.@system.resource.value", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json b/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json index 0620296a..f07fff69 100644 --- a/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json +++ b/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json @@ -36,13 +36,13 @@ "key": "system.damageThresholds.major", "mode": 2, "value": "@prof", - "priority": null + "priority": 21 }, { "key": "system.damageThresholds.severe", "mode": 2, "value": "@prof", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json b/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json index e56cfa68..7aaefef8 100644 --- a/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json +++ b/src/packs/beastforms/feature_Armored_Shell_nDQZdIF2epKlhauX.json @@ -100,7 +100,7 @@ "key": "system.resistance.physical.reduction", "mode": 2, "value": "@system.armorScore", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json b/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json index dfb5af6d..f0d4c988 100644 --- a/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json +++ b/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json @@ -38,13 +38,13 @@ "key": "system.bonuses.damage.primaryWeapon.bonus", "mode": 2, "value": "@system.traits.strength.value", - "priority": null + "priority": 21 }, { "key": "system.bonuses.damage.secondaryWeapon.bonus", "mode": 2, "value": "@system.traits.strength.value", - "priority": null + "priority": 21 } ], "disabled": false, @@ -57,7 +57,7 @@ "startRound": null, "startTurn": null }, - "description": "

On a successful attack using a weapon with a Melee range, gain a bonus to your damage roll equal to your Strength.

", + "description": "

On a successful attack using a weapon with a Melee range, gain a bonus to your damage roll equal to your Strength.

", "origin": null, "tint": "#ffffff", "transfer": true, diff --git a/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json b/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json index cdb5ffe6..9e5c414e 100644 --- a/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json +++ b/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json @@ -37,13 +37,13 @@ "key": "system.bonuses.damage.primaryWeapon.bonus", "mode": 2, "value": "@system.traits.agility.value", - "priority": null + "priority": 21 }, { "key": "system.bonuses.damage.secondaryWeapon.bonus", "mode": 2, "value": "@system.traits.agility.value", - "priority": null + "priority": 21 } ], "disabled": true, diff --git a/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json b/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json index e5282328..cc04c9c9 100644 --- a/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json +++ b/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json @@ -101,7 +101,7 @@ "key": "system.traits.presence.value", "mode": 5, "value": "@cast", - "priority": null + "priority": 51 } ], "disabled": false, diff --git a/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json b/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json index 94472445..6f8b481d 100644 --- a/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json +++ b/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json @@ -113,13 +113,13 @@ "key": "system.bonuses.damage.magical.bonus", "mode": 2, "value": "2*@system.traits.strength.value", - "priority": null + "priority": 21 }, { "key": "system.bonuses.damage.physical.bonus", "mode": 2, "value": "2*@system.traits.strength.value", - "priority": null + "priority": 21 } ], "disabled": false, @@ -162,13 +162,13 @@ "key": "system.bonuses.damage.magical.bonus", "mode": 2, "value": "4*@system.traits.strength.value", - "priority": null + "priority": 21 }, { "key": "system.bonuses.damage.physical.bonus", "mode": 2, "value": "4*@system.traits.strength.value", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json b/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json index 28fd2f1f..38c900b2 100644 --- a/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json +++ b/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json @@ -106,7 +106,7 @@ "key": "system.damageThresholds.severe", "mode": 2, "value": "@system.proficiency", - "priority": null + "priority": 21 } ], "disabled": false, @@ -119,7 +119,7 @@ "startRound": null, "startTurn": null }, - "description": "

Gain a bonus to your Severe threshold equal to your Proficiency.

", + "description": "

Gain a bonus to your Severe threshold equal to your Proficiency.

", "origin": null, "tint": "#ffffff", "transfer": true, diff --git a/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json b/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json index b1563416..11a1a841 100644 --- a/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json +++ b/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json @@ -37,7 +37,7 @@ "key": "system.evasion", "mode": 2, "value": "ceil(@system.traits.agility.value / 2)", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/src/packs/domains/domainCard_Zone_of_Protection_lOZaRb4fCVgQsWB5.json b/src/packs/domains/domainCard_Zone_of_Protection_lOZaRb4fCVgQsWB5.json index 681dc276..5669173d 100644 --- a/src/packs/domains/domainCard_Zone_of_Protection_lOZaRb4fCVgQsWB5.json +++ b/src/packs/domains/domainCard_Zone_of_Protection_lOZaRb4fCVgQsWB5.json @@ -4,7 +4,7 @@ "type": "domainCard", "folder": "OwsbTSWzKq2WJmQN", "system": { - "description": "

Make a Spellcast Roll (16). Once per long rest on a success, choose a point within Far range and create a visible zone of protection there for all allies within Very Close range of that point. When you do, place a d6 on this card with the 1 value facing up. When an ally in this zone takes damage, they reduce it by the die’s value. You then increase the die’s value by one. When the die’s value would exceed 6, this effect ends.

@Template[type:emanation|range:vc]

", + "description": "

Make a Spellcast Roll (16). Once per long rest on a success, choose a point within Far range and create a visible zone of protection there for all allies within Very Close range of that point. When you do, place a d6 on this card with the 1 value facing up. When an ally in this zone takes damage, they reduce it by the die’s value. You then increase the die’s value by one. When the die’s value would exceed 6, this effect ends.

@Template[type:emanation|range:vc]

", "domain": "splendor", "recallCost": 2, "level": 6, diff --git a/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json b/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json index 5c061083..5158b100 100644 --- a/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json +++ b/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json @@ -39,7 +39,7 @@ "key": "system.armorScore", "mode": 2, "value": "@system.traits.strength.value", - "priority": null + "priority": 21 } ], "disabled": false, 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 abf81dae..d63ce4df 100644 --- a/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json +++ b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json @@ -42,7 +42,8 @@ { "key": "system.resistance.magical.reduction", "mode": 2, - "value": "@system.armorScore" + "value": "@system.armorScore", + "priority": 21 } ], "_id": "xGxqTCO8MjNq5Cw6", diff --git a/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json b/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json index 86859acd..4d815a6c 100644 --- a/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json +++ b/src/packs/items/weapons/weapon_Buckler_EmFTp9wzT6MHSaNz.json @@ -155,7 +155,8 @@ { "key": "system.evasion", "mode": 2, - "value": "@system.armorScore" + "value": "@system.armorScore", + "priority": 21 } ], "transfer": false, diff --git a/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json b/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json index a00d4767..5dd5f04e 100644 --- a/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json +++ b/src/packs/items/weapons/weapon_Flickerfly_Blade_xLJ5RRpUoTRmAC3G.json @@ -117,7 +117,8 @@ { "key": "system.bonuses.damage.primaryWeapon.bonus", "mode": 2, - "value": "@system.traits.agility.value" + "value": "@system.traits.agility.value", + "priority": 21 } ], "_id": "jMIrOhpPUncn7dWg", diff --git a/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json b/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json index 8847b7af..99b04487 100644 --- a/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json +++ b/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json @@ -35,7 +35,7 @@ "key": "system.evasion", "mode": 2, "value": "@system.proficiency", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json b/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json index 6dcd5f13..30ffb50b 100644 --- a/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json +++ b/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json @@ -255,13 +255,13 @@ "key": "system.damageThresholds.major", "mode": 2, "value": "@system.proficiency", - "priority": null + "priority": 21 }, { "key": "system.damageThresholds.severe", "mode": 2, "value": "@system.proficiency", - "priority": null + "priority": 21 } ], "disabled": false, diff --git a/system.json b/system.json index 9f1e46c7..84e83d86 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "id": "daggerheart", "title": "Daggerheart", "description": "An unofficial implementation of the Daggerheart system", - "version": "1.4.4", + "version": "1.4.5", "compatibility": { "minimum": "13.346", "verified": "13.351",