diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs index d586a1ce..a3e785c3 100644 --- a/module/config/itemConfig.mjs +++ b/module/config/itemConfig.mjs @@ -493,18 +493,14 @@ export const weaponFeatures = { key: 'system.evasion', mode: 2, value: '-1' - } - ] - }, - { - type: 'armor', - 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: 'Armor', type: 'armor', - max: 'ITEM.@system.tier + 1' + typeData: { + type: 'armor', + max: 'ITEM.@system.tier + 1' + } } ] } @@ -812,24 +808,20 @@ export const weaponFeatures = { } }, { - type: 'armor', name: 'DAGGERHEART.CONFIG.WeaponFeature.doubleDuty.effects.doubleDuty.name', description: 'DAGGERHEART.CONFIG.WeaponFeature.doubleDuty.effects.doubleDuty.description', img: 'icons/skills/melee/sword-shield-stylized-white.webp', changes: [ { + key: 'Armor', type: 'armor', - max: 1 + value: 0, + typeData: { + type: 'armor', + max: 1 + } } - ], - system: { - rangeDependence: { - enabled: true, - range: 'melee', - target: 'hostile', - type: 'withinRange' - } - } + ] } ] }, @@ -1208,14 +1200,18 @@ export const weaponFeatures = { description: 'DAGGERHEART.CONFIG.WeaponFeature.protective.description', effects: [ { - type: 'armor', 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', - max: 'ITEM.@system.tier' + value: 0, + typeData: { + type: 'armor', + max: 'ITEM.@system.tier' + } } ] } diff --git a/module/data/activeEffect/changeTypes/armor.mjs b/module/data/activeEffect/changeTypes/armor.mjs index f368fa78..5f6047fd 100644 --- a/module/data/activeEffect/changeTypes/armor.mjs +++ b/module/data/activeEffect/changeTypes/armor.mjs @@ -26,6 +26,8 @@ export default class Armor extends foundry.abstract.DataModel { label: 'Armor', defaultPriortiy: 20, handler: (actor, change, _options, _field, replacementData) => { + const parsedMax = itemAbleRollParse(change.typeData.max, actor, change.effect.parent); + game.system.api.documents.DhActiveEffect.applyChange( actor, { @@ -42,7 +44,7 @@ export default class Armor extends foundry.abstract.DataModel { ...change, key: 'system.armorScore.max', type: CONFIG.DH.GENERAL.activeEffectModes.add.id, - value: change.typeData.max + value: parsedMax }, replacementData ); diff --git a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json index 91d8cdd2..e328325d 100644 --- a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json +++ b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json @@ -90,19 +90,22 @@ "effects": [ { "name": "Armorer", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "1" + "typeData": { + "type": "armor", + "max": "1", + "armorInteraction": "active" + } } - ], - "armorInteraction": "active" + ] }, "_id": "tJw2JIPcT9hEMRXg", "img": "icons/tools/hand/hammer-and-nail.webp", diff --git a/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json b/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json index 40af13a7..69d1a2b2 100644 --- a/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json +++ b/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json @@ -22,19 +22,22 @@ "effects": [ { "name": "Bare Bones Armor", - "type": "armor", + "type": "base", "system": { "changes": [ { "value": 0, - "max": "3 + @system.traits.strength.value", - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", - "priority": 20 + "priority": 20, + "typeData": { + "type": "armor", + "max": "3 + @system.traits.strength.value", + "armorInteraction": "inactive" + } } - ], - "armorInteraction": "inactive" + ] }, "_id": "FCsgz7Tdsw6QUzBs", "img": "icons/magic/control/buff-strength-muscle-damage-orange.webp", diff --git a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json index 04f7c2aa..7852356b 100644 --- a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json +++ b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json @@ -253,7 +253,7 @@ "origin": "Compendium.daggerheart.domains.Item.YtZzYBtR0yLPPA93", "transfer": false, "_id": "ptYT10JZ2WJHvFMd", - "type": "armor", + "type": "base", "system": { "rangeDependence": { "enabled": false, @@ -263,12 +263,15 @@ }, "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "1" + "typeData": { + "type": "armor", + "max": "1" + } } ], "duration": { diff --git a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json index 05537863..870ff246 100644 --- a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json +++ b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json @@ -91,16 +91,19 @@ "effects": [ { "name": "Valor-Touched", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "1" + "typeData": { + "type": "armor", + "max": "1" + } } ] }, 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 91b1f890..1be3d76b 100644 --- a/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json +++ b/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json @@ -65,18 +65,21 @@ "_key": "!items.effects!LzLOJ9EVaHWAjoq9.qlzHOAnpBYzosQxK" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, 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 f1dd3086..60cc3da9 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 @@ -70,18 +70,21 @@ "_key": "!items.effects!crIbCb9NZ4K0VpoU.awdHgEaM54G3emOU" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, 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 1618fe85..c8bf64d5 100644 --- a/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json +++ b/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json @@ -65,18 +65,21 @@ "_key": "!items.effects!epkAmlZVk7HOfUUT.Fq9Q93IHCchhfSss" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json b/src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json index b7a63b40..6597bea0 100644 --- a/src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json +++ b/src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json @@ -27,18 +27,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, 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 9242aed9..a5ac42ba 100644 --- a/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json +++ b/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json @@ -65,18 +65,21 @@ "_key": "!items.effects!WuoVwZA53XRAIt6d.Hy0sNtFS1JAXxgwC" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json b/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json index cc245d50..12f9441c 100644 --- a/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json +++ b/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json @@ -65,18 +65,21 @@ "_key": "!items.effects!mNN6pvcsS10ChrWF.s8KtTIngTjnOlaTP" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, diff --git a/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json b/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json index a45cfa04..e1e8be0a 100644 --- a/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json +++ b/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json @@ -65,18 +65,21 @@ "_key": "!items.effects!haULhuEg37zUUvhb.ZfO5NjpqEIzZVlPq" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, diff --git a/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json b/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json index 6f8ec29d..e4a50d08 100644 --- a/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json +++ b/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json @@ -65,18 +65,21 @@ "_key": "!items.effects!vMJxEWz1srfwMsoj.8bwf1Ri3jYkjphEv" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json b/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json index 335ab56f..d7a9e182 100644 --- a/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json +++ b/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json @@ -64,18 +64,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json b/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json index fe37485c..91a58fcf 100644 --- a/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json +++ b/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json @@ -90,18 +90,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "7" + "typeData": { + "type": "armor", + "max": "7" + } } ] }, 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 e19c363b..c217a626 100644 --- a/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json +++ b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json @@ -66,18 +66,21 @@ "_key": "!items.effects!Q6LxmtFetDDkoZVZ.xGxqTCO8MjNq5Cw6" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, diff --git a/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json b/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json index 03662d06..dfdefdcb 100644 --- a/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json +++ b/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json @@ -88,18 +88,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, 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 52aa784b..4a3bcdc9 100644 --- a/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json +++ b/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json @@ -65,18 +65,21 @@ "_key": "!items.effects!7emTSt6nhZuTlvt5.QIefVb73cm9gYju8" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, 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 c603305b..4427c082 100644 --- a/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json +++ b/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json @@ -70,18 +70,21 @@ "_key": "!items.effects!UdUJNa31WxFW2noa.mfKMW9SX3Mnos1nY" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, diff --git a/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json b/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json index 36484785..a0bdf8d6 100644 --- a/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json +++ b/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json @@ -65,18 +65,21 @@ "_key": "!items.effects!yJFp1bfpecDcStVK.v1FNEsypRF5W6vVc" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "3" + "typeData": { + "type": "armor", + "max": "3" + } } ] }, diff --git a/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json b/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json index a6397482..2bfc3ff6 100644 --- a/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json +++ b/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json @@ -81,18 +81,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, 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 dd674a8b..79c52596 100644 --- a/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json +++ b/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json @@ -65,18 +65,21 @@ "_key": "!items.effects!K5WkjS0NGqHYmhU3.JHupzYULxdQzFzuj" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, 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 00b2afa9..bbbd6183 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 @@ -70,18 +70,21 @@ "_key": "!items.effects!9f7RozpPTqrzJS1m.wstJ1aKKtmXgCwxB" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, 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 3e2a52ba..6c32e3ca 100644 --- a/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json +++ b/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json @@ -65,18 +65,21 @@ "_key": "!items.effects!jphnMZjnS2FkOH3s.BFwU3ErPaajUSMUz" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, diff --git a/src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json b/src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json index 7dfe14e7..26092645 100644 --- a/src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json +++ b/src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json @@ -27,18 +27,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, 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 8b978654..756fccdc 100644 --- a/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json +++ b/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json @@ -77,18 +77,21 @@ "_key": "!items.effects!tzZntboNtHL5C6VM.P3aCN8PQgPXP4C9M" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, diff --git a/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json b/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json index 1b3cae95..601cf23c 100644 --- a/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json +++ b/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json @@ -27,18 +27,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "3" + "typeData": { + "type": "armor", + "max": "3" + } } ] }, 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 fd3d1f9f..867c2420 100644 --- a/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json +++ b/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json @@ -65,18 +65,21 @@ "_key": "!items.effects!EsIN5OLKe9ZYFNXZ.8Oa6Y375X8UpcPph" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "7" + "typeData": { + "type": "armor", + "max": "7" + } } ] }, 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 a32a6be5..2fb8c064 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 @@ -70,18 +70,21 @@ "_key": "!items.effects!SXWjUR2aUR6bYvdl.zvzkRX2Uevemmbz4" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "7" + "typeData": { + "type": "armor", + "max": "7" + } } ] }, 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 85fdb01b..8ab2894d 100644 --- a/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json +++ b/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json @@ -65,18 +65,21 @@ "_key": "!items.effects!c6tMXz4rPf9ioQrf.3AUNxBoj7mp1ziJQ" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, diff --git a/src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json b/src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json index 7019a908..44c29bfb 100644 --- a/src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json +++ b/src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json @@ -27,18 +27,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, 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 464d6505..db0c20d1 100644 --- a/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json +++ b/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json @@ -65,18 +65,21 @@ "_key": "!items.effects!AQzU2RsqS5V5bd1v.3n4O7PyAWMEFdr5p" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, diff --git a/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json b/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json index 172e100b..55cc6eb8 100644 --- a/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json +++ b/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json @@ -57,18 +57,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json b/src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json index 66a88157..2ca27f45 100644 --- a/src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json +++ b/src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json @@ -64,18 +64,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, diff --git a/src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json b/src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json index 3039c375..54f6322e 100644 --- a/src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json +++ b/src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json @@ -64,18 +64,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "typeData": { + "type": "armor", + "max": "4" + } } ] }, diff --git a/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json b/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json index 739f15d9..f40df5c7 100644 --- a/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json +++ b/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json @@ -95,18 +95,21 @@ "_key": "!items.effects!8X16lJQ3xltTwynm.rkrqlwqtR9REgRx7" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "8" + "typeData": { + "type": "armor", + "max": "8" + } } ] }, 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 b8b12bc3..8f15ae28 100644 --- a/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json +++ b/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json @@ -70,18 +70,21 @@ "_key": "!items.effects!QjwsIhXKqnlvRBMv.V8CcTcVAIxHq8KNd" }, { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json b/src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json index 8be5ce42..eb89421d 100644 --- a/src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json +++ b/src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json @@ -57,18 +57,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "typeData": { + "type": "armor", + "max": "5" + } } ] }, diff --git a/src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json b/src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json index 301c1d25..6e5f24bc 100644 --- a/src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json +++ b/src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json @@ -57,18 +57,21 @@ }, "effects": [ { - "type": "armor", + "type": "base", "name": "Armor Effect", "img": "icons/equipment/chest/breastplate-helmet-metal.webp", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "typeData": { + "type": "armor", + "max": "6" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json b/src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json index c7f9aac1..85321808 100644 --- a/src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json +++ b/src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json @@ -114,16 +114,19 @@ "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", "_id": "7285CRGdZfHCEtT2", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json b/src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json index 666fae0f..568e7ebc 100644 --- a/src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json +++ b/src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json @@ -152,16 +152,19 @@ "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", "_id": "J0f7zqqOr61ADpdy", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier + 1" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier + 1" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json b/src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json index 14977b0c..322682d9 100644 --- a/src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json +++ b/src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json @@ -114,16 +114,19 @@ "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", "_id": "pZCrWd7zLTarvEQK", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json b/src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json index 7e3b178b..70647216 100644 --- a/src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json +++ b/src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json @@ -152,16 +152,19 @@ "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", "_id": "XugJeHJdnC6IymSa", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier + 1" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier + 1" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json b/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json index 9c454119..1adda37c 100644 --- a/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json +++ b/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json @@ -114,16 +114,19 @@ "description": "Add your character's Tier to your Armor Score", "img": "icons/skills/melee/shield-block-gray-orange.webp", "_id": "vnR4Zhnb0rOqwrFw", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json b/src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json index af83aaaf..7e0d5374 100644 --- a/src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json +++ b/src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json @@ -114,16 +114,19 @@ "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", "_id": "EixxJrRHyc6kj3Wg", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json b/src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json index 70e71d6c..945678e5 100644 --- a/src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json +++ b/src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json @@ -152,16 +152,19 @@ "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", "_id": "1fgUIaXl6VQrhP7j", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier + 1" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier + 1" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json b/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json index 997ce4d0..987892b2 100644 --- a/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json +++ b/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json @@ -114,16 +114,19 @@ "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", "_id": "eV4lFIpQMiKERj4U", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier" + } } ] }, diff --git a/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json b/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json index fe01d808..fed95455 100644 --- a/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json +++ b/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json @@ -160,17 +160,20 @@ "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "1" + "typeData": { + "type": "armor", + "max": "1" + } } ] }, "_id": "mvUY9LGfwICak7cE", - "type": "armor", + "type": "base", "disabled": false, "duration": { "value": null, diff --git a/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json b/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json index 5d72d4f5..5cf27983 100644 --- a/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json +++ b/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json @@ -152,16 +152,19 @@ "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", "_id": "tLRc4UAnGuIq7er3", - "type": "armor", + "type": "base", "system": { "changes": [ { - "key": "system.armorScore", + "key": "Armor", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "ITEM.@system.tier + 1" + "typeData": { + "type": "armor", + "max": "ITEM.@system.tier + 1" + } } ] }, diff --git a/templates/sheets/activeEffect/changes.hbs b/templates/sheets/activeEffect/changes.hbs index e687c2e9..a699e951 100644 --- a/templates/sheets/activeEffect/changes.hbs +++ b/templates/sheets/activeEffect/changes.hbs @@ -20,7 +20,7 @@
{{localize "EFFECT.FIELDS.changes.element.value.label"}}
{{localize "DAGGERHEART.GENERAL.max"}}
-
{{localize "DAGGERHEART.EFFECTS.Armor.FIELDS.armorInteraction.label"}}
+
{{localize "DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.armorInteraction.label"}}
{{localize "EFFECT.FIELDS.changes.element.priority.label"}}