diff --git a/lang/en.json b/lang/en.json index 9f528c14..14218311 100755 --- a/lang/en.json +++ b/lang/en.json @@ -751,11 +751,6 @@ "bruiser": "for each Bruiser adversary.", "solo": "for each Solo adversary." }, - "ArmorInteraction": { - "none": { "label": "Ignores Armor" }, - "active": { "label": "Only Active With Armor" }, - "inactive": { "label": "Only Active Without Armor" } - }, "ArmorFeature": { "burning": { "name": "Burning", @@ -1856,13 +1851,7 @@ "transferHint": "If checked, this effect will be applied to any actor that owns this Effect's parent Item. The effect is always applied if this Item is attached to another one." }, "Armor": { - "newArmorEffect": "Armor Effect", - "FIELDS": { - "armorInteraction": { - "label": "Armor Interaction", - "hint": "Does the character wearing armor suppress this effect?" - } - } + "newArmorEffect": "Armor Effect" } }, "GENERAL": { diff --git a/module/applications/sheets-configs/armorActiveEffectConfig.mjs b/module/applications/sheets-configs/armorActiveEffectConfig.mjs index 3dca8ef1..131558a0 100644 --- a/module/applications/sheets-configs/armorActiveEffectConfig.mjs +++ b/module/applications/sheets-configs/armorActiveEffectConfig.mjs @@ -9,7 +9,6 @@ export default class ArmorActiveEffectConfig extends HandlebarsApplicationMixin( submitOnChange: true, closeOnSubmit: false }, - position: { width: 560 }, actions: { finish: ArmorActiveEffectConfig.#finish } @@ -46,13 +45,6 @@ export default class ArmorActiveEffectConfig extends HandlebarsApplicationMixin( const partContext = await super._preparePartContext(partId, context); if (partId in partContext.tabs) partContext.tab = partContext.tabs[partId]; - switch (partId) { - case 'details': - partContext.isActorEffect = this.document.parent?.documentName === 'Actor'; - partContext.isItemEffect = this.document.parent?.documentName === 'Item'; - break; - } - return partContext; } diff --git a/module/applications/ui/progress.mjs b/module/applications/ui/progress.mjs index 2fb1b445..eca4ad6b 100644 --- a/module/applications/ui/progress.mjs +++ b/module/applications/ui/progress.mjs @@ -13,7 +13,7 @@ export default class DhProgress { advance({ by = 1, label = this.label } = {}) { if (this.value === this.max) return; - this.value = (this.value ?? 0) + Math.abs(by); + this.value += Math.abs(by); this.#notification.update({ message: label, pct: this.value / this.max }); } diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs index b2833580..80ac546e 100644 --- a/module/config/generalConfig.mjs +++ b/module/config/generalConfig.mjs @@ -890,9 +890,3 @@ export const activeEffectModes = { label: 'EFFECT.CHANGES.TYPES.override' } }; - -export const activeEffectArmorInteraction = { - none: { id: 'none', label: 'DAGGERHEART.CONFIG.ArmorInteraction.none.label' }, - active: { id: 'active', label: 'DAGGERHEART.CONFIG.ArmorInteraction.active.label' }, - inactive: { id: 'inactive', label: 'DAGGERHEART.CONFIG.ArmorInteraction.inactive.label' } -}; diff --git a/module/data/activeEffect/armorEffect.mjs b/module/data/activeEffect/armorEffect.mjs index 894bf3ff..d32d24b2 100644 --- a/module/data/activeEffect/armorEffect.mjs +++ b/module/data/activeEffect/armorEffect.mjs @@ -51,30 +51,10 @@ export default class ArmorEffect extends foundry.data.ActiveEffectTypeDataModel } ] } - ), - armorInteraction: new fields.StringField({ - required: true, - choices: CONFIG.DH.GENERAL.activeEffectArmorInteraction, - initial: CONFIG.DH.GENERAL.activeEffectArmorInteraction.none.id, - label: 'DAGGERHEART.EFFECTS.Armor.FIELDS.armorInteraction.label', - hint: 'DAGGERHEART.EFFECTS.Armor.FIELDS.armorInteraction.hint' - }) + ) }; } - get isSuppressed() { - if (this.parent.actor?.type !== 'character') return false; - - switch (this.armorInteraction) { - case CONFIG.DH.GENERAL.activeEffectArmorInteraction.active.id: - return !this.parent.actor.system.armor; - case CONFIG.DH.GENERAL.activeEffectArmorInteraction.inactive.id: - return Boolean(this.parent.actor.system.armor); - default: - return false; - } - } - /* Type Functions */ /** diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs index 56981c52..055267b2 100644 --- a/module/documents/activeEffect.mjs +++ b/module/documents/activeEffect.mjs @@ -8,8 +8,6 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect { /**@override */ get isSuppressed() { - if (this.system.isSuppressed === true) return true; - // If this is a copied effect from an attachment, never suppress it // (These effects have attachmentSource metadata) if (this.flags?.daggerheart?.attachmentSource) { diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs index dff85fef..6bfb32ee 100644 --- a/module/systemRegistration/migrations.mjs +++ b/module/systemRegistration/migrations.mjs @@ -248,10 +248,9 @@ export async function runMigrations() { } if (foundry.utils.isNewerVersion('2.0.0', lastMigrationVersion)) { + /* Migrate existing armors to the new Armor Effects */ const progress = game.system.api.applications.ui.DhProgress.createMigrationProgress(0); - const progressBuffer = 50; - //#region Data Setup const lockedPacks = []; const itemPacks = game.packs.filter(x => x.metadata.type === 'Item'); const actorPacks = game.packs.filter(x => x.metadata.type === 'Actor'); @@ -260,7 +259,7 @@ export async function runMigrations() { const indexes = []; for (const pack of packs) { const indexValues = pack.index.values().reduce((acc, index) => { - if (!type || index.type === type) acc.push(index.uuid); + if (index.type === type) acc.push(index.uuid); return acc; }, []); @@ -275,132 +274,54 @@ export async function runMigrations() { return indexes; }; - const itemEntries = await getIndexes(itemPacks); - const characterEntries = await getIndexes(actorPacks, 'character'); + const armorEntries = await getIndexes(itemPacks, 'armor'); + const actorEntries = await getIndexes(actorPacks, 'actor'); - const worldItems = game.items; - const worldCharacters = game.actors.filter(x => x.type === 'character'); + const worldArmors = game.items.filter(x => x instanceof game.system.api.documents.DHItem && x.type === 'armor'); + + for (const character of game.actors.filter(x => x.type === 'character')) { + worldArmors.push(...character.items.filter(x => x.type === 'armor')); + } /* The async fetches are the mainstay of time. Leaving 1 progress for the sync logic */ - const newMax = itemEntries.length + characterEntries.length + progressBuffer; + const newMax = armorEntries.length + actorEntries.length + 1; progress.updateMax(newMax); - const compendiumItems = []; - for (const entry of itemEntries) { - const item = await foundry.utils.fromUuid(entry); - compendiumItems.push(item); + const compendiumArmors = []; + for (const entry of armorEntries) { + const armor = await foundry.utils.fromUuid(entry); + compendiumArmors.push(armor); progress.advance(); } - const compendiumCharacters = []; - for (const entry of characterEntries) { - const character = await foundry.utils.fromUuid(entry); - compendiumCharacters.push(character); + for (const entry of actorEntries) { + const actor = await foundry.utils.fromUuid(entry); + compendiumArmors.push(...actor.items.filter(x => x.type === 'armor')); progress.advance(); } - //#endregion - /* Migrate existing effects modifying armor, creating new Armor Effects instead */ - const migrateEffects = async entity => { - const effectChangeData = []; - for (const effect of entity.effects) { - const oldArmorChanges = effect.system.changes.filter(x => x.key === 'system.armorScore'); - if (!oldArmorChanges.length) continue; - - const changeData = {}; - const newChanges = effect.system.changes.filter(x => x.key !== 'system.armorScore'); - if (newChanges.length) { - await effect.update({ 'system.changes': newChanges }); - } else { - changeData.deleteId = effect.id; - } - - const oldEffectData = effect.toObject(); - changeData.createData = { - ...oldEffectData, - type: 'armor', - system: { - ...oldEffectData.sytem, - changes: oldArmorChanges.map(change => ({ - key: 'system.armorScore', - type: CONFIG.DH.GENERAL.activeEffectModes.armor.id, - phase: 'initial', - priority: 20, - value: 0, - max: change.value - })) - } - }; - effectChangeData.push(changeData); - } - - for (const changeData of effectChangeData) { - const relatedActions = Array.from(entity.system.actions ?? []).filter(x => - x.effects.some(effect => effect._id === changeData.deleteId) - ); - const [newEffect] = await entity.createEmbeddedDocuments('ActiveEffect', [ + for (const armor of [...compendiumArmors, ...worldArmors]) { + const hasArmorEffect = armor.effects.some(x => x.type === 'armor'); + const migrationArmorScore = armor.flags.daggerheart?.baseScoreMigrationValue; + if (migrationArmorScore !== undefined && !hasArmorEffect) { + await armor.createEmbeddedDocuments('ActiveEffect', [ { - ...changeData.createData, - transfer: relatedActions.length ? false : true + ...game.system.api.data.activeEffects.ArmorEffect.getDefaultObject(), + changes: [ + { + type: CONFIG.DH.GENERAL.activeEffectModes.armor.id, + phase: 'initial', + priority: 20, + value: 0, + max: migrationArmorScore.toString() + } + ] } ]); - for (const action of relatedActions) { - await action.update({ - effects: action.effects.map(effect => ({ - ...effect, - _id: effect._id === changeData.deleteId ? newEffect.id : effect._id - })) - }); - } } - - await entity.deleteEmbeddedDocuments( - 'ActiveEffect', - effectChangeData.reduce((acc, data) => { - if (data.deleteId) acc.push(data.deleteId); - return acc; - }, []) - ); - }; - - /* Migrate existing armors to the new Armor Effects */ - const migrateItems = async items => { - for (const item of items) { - await migrateEffects(item); - - if (item instanceof game.system.api.documents.DHItem && item.type === 'armor') { - const hasArmorEffect = item.effects.some(x => x.type === 'armor'); - const migrationArmorScore = item.flags.daggerheart?.baseScoreMigrationValue; - if (migrationArmorScore !== undefined && !hasArmorEffect) { - await item.createEmbeddedDocuments('ActiveEffect', [ - { - ...game.system.api.data.activeEffects.ArmorEffect.getDefaultObject(), - changes: [ - { - key: 'system.armorScore', - type: CONFIG.DH.GENERAL.activeEffectModes.armor.id, - phase: 'initial', - priority: 20, - value: 0, - max: migrationArmorScore.toString() - } - ] - } - ]); - } - } - } - }; - - await migrateItems([...compendiumItems, ...worldItems]); - progress.advance({ by: progressBuffer / 2 }); - - for (const actor of [...compendiumCharacters, ...worldCharacters]) { - await migrateEffects(actor); - await migrateItems(actor.items); } - progress.advance({ by: progressBuffer / 2 }); + progress.advance(); for (let packId of lockedPacks) { const pack = game.packs.get(packId); @@ -409,7 +330,7 @@ export async function runMigrations() { progress.close(); - lastMigrationVersion = '2.0.0'; + // lastMigrationVersion = '2.0.0'; } //#endregion diff --git a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json index 096be253..cb7bec9f 100644 --- a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json +++ b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json @@ -101,32 +101,31 @@ "value": 0, "max": "1" } - ], - "armorInteraction": "active" + ] }, - "_id": "tJw2JIPcT9hEMRXg", + "_id": "PczrmraHWZ54NJsW", "img": "icons/tools/hand/hammer-and-nail.webp", "disabled": false, + "start": null, "duration": { "value": null, "units": "seconds", "expiry": null, "expired": false }, - "description": "

While you’re wearing armor, gain a +1 bonus to your Armor Score.

", + "description": "

While you’re wearing armor, gain a +1 bonus to your Armor Score.

", "origin": null, "tint": "#ffffff", "transfer": true, "statuses": [], + "showIcon": 1, + "folder": null, "sort": 0, "flags": {}, "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!cy8GjBPGc9w9RaGO.tJw2JIPcT9hEMRXg" + "_key": "!items.effects!cy8GjBPGc9w9RaGO.PczrmraHWZ54NJsW" } ], "ownership": { diff --git a/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json b/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json index 40af13a7..f6474623 100644 --- a/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json +++ b/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json @@ -4,7 +4,7 @@ "type": "domainCard", "folder": "QpOL7jPbMBzH96qR", "system": { - "description": "

When you choose not to equip armor, you have a base Armor Score of 3 + your Strength and use the following as your base damage thresholds:

Equip the below armor to use Bare Bones.

@UUID[Compendium.daggerheart.armors.Item.ITAjcigTcUw5pMCN]{Bare Bones}

", + "description": "

When you choose not to equip armor, you have a base Armor Score of 3 + your Strength and use the following as your base damage thresholds:

Equip the below armor to use Bare Bones.

", "domain": "valor", "recallCost": 0, "level": 1, @@ -33,10 +33,9 @@ "phase": "initial", "priority": 20 } - ], - "armorInteraction": "inactive" + ] }, - "_id": "FCsgz7Tdsw6QUzBs", + "_id": "Zn1nNUwjlkbRfbMc", "img": "icons/magic/control/buff-strength-muscle-damage-orange.webp", "disabled": false, "start": null, @@ -46,7 +45,7 @@ "expiry": null, "expired": false }, - "description": "

You have a base Armor Score of 3 + your Strength.

", + "description": "

You have a base Armor Score of 3 + your Strength

", "origin": null, "tint": "#ffffff", "transfer": true, @@ -58,7 +57,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!l5D9kq901JDESaXw.FCsgz7Tdsw6QUzBs" + "_key": "!items.effects!l5D9kq901JDESaXw.Zn1nNUwjlkbRfbMc" }, { "name": "Bare Bones", @@ -87,7 +86,7 @@ "range": "melee" } }, - "_id": "8flPpWNoBeuFPFTK", + "_id": "FazU8RFjMmTpXs7Z", "img": "icons/magic/control/buff-strength-muscle-damage-orange.webp", "disabled": false, "start": null, @@ -109,7 +108,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!l5D9kq901JDESaXw.8flPpWNoBeuFPFTK" + "_key": "!items.effects!l5D9kq901JDESaXw.FazU8RFjMmTpXs7Z" } ], "ownership": { diff --git a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json index da2d75f1..6dfc851a 100644 --- a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json +++ b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json @@ -105,7 +105,7 @@ }, "effects": [ { - "_id": "ptYT10JZ2WJHvFMd", + "_id": "OKf8Kjr6Px8A3ubJ", "onSave": false } ], @@ -252,8 +252,8 @@ "img": "icons/magic/defensive/shield-barrier-glowing-triangle-blue.webp", "origin": "Compendium.daggerheart.domains.Item.YtZzYBtR0yLPPA93", "transfer": false, - "_id": "ptYT10JZ2WJHvFMd", "type": "armor", + "_id": "OKf8Kjr6Px8A3ubJ", "system": { "changes": [ { @@ -267,24 +267,24 @@ ] }, "disabled": false, + "start": null, "duration": { "value": null, "units": "seconds", "expiry": null, "expired": false }, - "description": "

+1 bonus to your Armor Score until your next rest, or the caster cast's Tava’s Armor again.

", + "description": "

Spend a Hope to give a target you can touch a +1 bonus to their Armor Score until their next rest or you cast Tava’s Armor again.

", "tint": "#ffffff", "statuses": [], + "showIcon": 1, + "folder": null, "sort": 0, "flags": {}, "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!YtZzYBtR0yLPPA93.ptYT10JZ2WJHvFMd" + "_key": "!items.effects!YtZzYBtR0yLPPA93.OKf8Kjr6Px8A3ubJ" } ], "ownership": { diff --git a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json index 7df5e095..ee6e377e 100644 --- a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json +++ b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json @@ -104,29 +104,29 @@ } ] }, - "_id": "Ma8Zp005QYKPWIEN", + "_id": "JLw50ONfq1KJh1iM", "img": "icons/magic/control/control-influence-rally-purple.webp", "disabled": false, + "start": null, "duration": { "value": null, "units": "seconds", "expiry": null, "expired": false }, - "description": "", + "description": "

+1 bonus to your Armor Score

", "origin": null, "tint": "#ffffff", "transfer": true, "statuses": [], + "showIcon": 1, + "folder": null, "sort": 0, "flags": {}, "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!k1AtYd3lSchIymBr.Ma8Zp005QYKPWIEN" + "_key": "!items.effects!k1AtYd3lSchIymBr.JLw50ONfq1KJh1iM" } ], "ownership": { diff --git a/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json b/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json index d7032288..9c220def 100644 --- a/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json +++ b/src/packs/domains/folders_Splendor_TL1TutmbeCVJ06nR.json @@ -6,7 +6,7 @@ "sorting": "m", "_id": "TL1TutmbeCVJ06nR", "description": "", - "sort": 900000, + "sort": 750000, "flags": {}, "_key": "!folders!TL1TutmbeCVJ06nR" } 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..7287d027 100644 --- a/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json +++ b/src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "YehcKtTeJ18q0THd", + "_id": "xU3zAv0sBiOGAE4i", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!LzLOJ9EVaHWAjoq9.YehcKtTeJ18q0THd" + "_key": "!items.effects!LzLOJ9EVaHWAjoq9.xU3zAv0sBiOGAE4i" } ], "sort": 0, 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..6522c67a 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 @@ -76,16 +76,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "Xp0MlTLdCe2oP36X", + "_id": "TMxnzDzCmVibJWQ0", "disabled": false, "start": null, "duration": { @@ -106,7 +106,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!crIbCb9NZ4K0VpoU.Xp0MlTLdCe2oP36X" + "_key": "!items.effects!crIbCb9NZ4K0VpoU.TMxnzDzCmVibJWQ0" } ], "sort": 0, 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..d9ee9649 100644 --- a/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json +++ b/src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "GyPhsm7zLznZDfN2", + "_id": "HxZEKljAth8b5Wcv", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!epkAmlZVk7HOfUUT.GyPhsm7zLznZDfN2" + "_key": "!items.effects!epkAmlZVk7HOfUUT.HxZEKljAth8b5Wcv" } ], "sort": 0, 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..09a45a8a 100644 --- a/src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json +++ b/src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json @@ -33,16 +33,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "XJueICAnl5vu2q2U", + "_id": "jSGmBv0I5FhxmTen", "disabled": false, "start": null, "duration": { @@ -63,7 +63,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!itSOp2GCyem0f7oM.XJueICAnl5vu2q2U" + "_key": "!items.effects!itSOp2GCyem0f7oM.jSGmBv0I5FhxmTen" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json b/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json deleted file mode 100644 index a0b2aae3..00000000 --- a/src/packs/items/armors/armor_Bare_Bones_ITAjcigTcUw5pMCN.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "folder": "tI3bfr6Sgi16Z7zm", - "name": "Bare Bones", - "type": "armor", - "_id": "ITAjcigTcUw5pMCN", - "img": "icons/magic/control/buff-strength-muscle-damage.webp", - "system": { - "description": "

When you choose not to equip armor, you have a base Armor Score of 3 + your Strength and use the following as your base damage thresholds:

", - "actions": {}, - "attached": [], - "tier": 1, - "equipped": false, - "baseScore": 3, - "armorFeatures": [], - "marks": { - "value": 0 - }, - "baseThresholds": { - "major": 9, - "severe": 19 - } - }, - "effects": [ - { - "name": "Bare Bones", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "@system.traits.strength.value" - } - ] - }, - "_id": "C7as6q5bx3S0Xxfn", - "img": "icons/magic/control/buff-strength-muscle-damage.webp", - "disabled": false, - "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false - }, - "description": "

When you choose not to equip armor, you have a base Armor Score of 3 + your Strength and use the following as your base damage thresholds:

", - "origin": null, - "tint": "#ffffff", - "transfer": true, - "statuses": [], - "sort": 0, - "flags": {}, - "_stats": { - "compendiumSource": null - }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!ITAjcigTcUw5pMCN.C7as6q5bx3S0Xxfn" - } - ], - "sort": 0, - "ownership": { - "default": 0, - "MQSznptE5yLT7kj8": 3 - }, - "flags": {}, - "_key": "!items!ITAjcigTcUw5pMCN" -} 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..fc7c62eb 100644 --- a/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json +++ b/src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "2OMciFns3bSETeH9", + "_id": "34OQBJZZV3d5AN7U", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!WuoVwZA53XRAIt6d.2OMciFns3bSETeH9" + "_key": "!items.effects!WuoVwZA53XRAIt6d.34OQBJZZV3d5AN7U" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json b/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json index cc245d50..a82f0ba4 100644 --- a/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json +++ b/src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "dIb9PWvzyS3jYDUj", + "_id": "6AGrG6Y1wUSY3mg5", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!mNN6pvcsS10ChrWF.dIb9PWvzyS3jYDUj" + "_key": "!items.effects!mNN6pvcsS10ChrWF.6AGrG6Y1wUSY3mg5" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json b/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json index a45cfa04..9fc6b7db 100644 --- a/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json +++ b/src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "hA0EcaykFiIpg4ZH", + "_id": "RXsc2d47cauTWTf0", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!haULhuEg37zUUvhb.hA0EcaykFiIpg4ZH" + "_key": "!items.effects!haULhuEg37zUUvhb.RXsc2d47cauTWTf0" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json b/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json index 6f8ec29d..d37d45ff 100644 --- a/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json +++ b/src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "Wejd1c4e8VtnFoc4", + "_id": "dKK4sbP3DZQYdmTn", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!vMJxEWz1srfwMsoj.Wejd1c4e8VtnFoc4" + "_key": "!items.effects!vMJxEWz1srfwMsoj.dKK4sbP3DZQYdmTn" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json b/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json index 335ab56f..136b89d6 100644 --- a/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json +++ b/src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json @@ -70,16 +70,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "FgjNYkbghYSz8gwW", + "_id": "kNq8nLq1ljLZZGDg", "disabled": false, "start": null, "duration": { @@ -100,7 +100,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!mdQ69eFHyAQUDmE7.FgjNYkbghYSz8gwW" + "_key": "!items.effects!mdQ69eFHyAQUDmE7.kNq8nLq1ljLZZGDg" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json b/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json index 2a1e8c83..9b858104 100644 --- a/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json +++ b/src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json @@ -96,16 +96,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "7" + "max": "7", + "key": "system.armorScore" } ] }, - "_id": "n4wyEBHbHIuYNBzt", + "_id": "sBTZAS0aYcE15RwZ", "disabled": false, "start": null, "duration": { @@ -126,7 +126,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!hAY6UgdGT7dj22Pr.n4wyEBHbHIuYNBzt" + "_key": "!items.effects!hAY6UgdGT7dj22Pr.sBTZAS0aYcE15RwZ" } ], "sort": 0, 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..d84108d8 100644 --- a/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json +++ b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json @@ -72,16 +72,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "gZfuMqjYTYLspQop", + "_id": "uFvhPlk3FVGfQST4", "disabled": false, "start": null, "duration": { @@ -102,7 +102,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!Q6LxmtFetDDkoZVZ.gZfuMqjYTYLspQop" + "_key": "!items.effects!Q6LxmtFetDDkoZVZ.uFvhPlk3FVGfQST4" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json b/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json index 5be30445..92652f66 100644 --- a/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json +++ b/src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json @@ -94,16 +94,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "5t3jCX3AGiWBB4DN", + "_id": "Dg8Gx6G3nwAH9wt2", "disabled": false, "start": null, "duration": { @@ -124,7 +124,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!bcQUh4QG3qFX0Vx6.5t3jCX3AGiWBB4DN" + "_key": "!items.effects!bcQUh4QG3qFX0Vx6.Dg8Gx6G3nwAH9wt2" } ], "sort": 0, 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..a4e21b75 100644 --- a/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json +++ b/src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "9jCrg3Acd75jVclW", + "_id": "XPbNhspFyOj8RIQJ", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!7emTSt6nhZuTlvt5.9jCrg3Acd75jVclW" + "_key": "!items.effects!7emTSt6nhZuTlvt5.XPbNhspFyOj8RIQJ" } ], "sort": 0, 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..0400f59e 100644 --- a/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json +++ b/src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json @@ -85,7 +85,7 @@ } ] }, - "_id": "OmGtjOMcTHNN6OsH", + "_id": "zji5nzTC1y8BUWHn", "disabled": false, "start": null, "duration": { @@ -106,7 +106,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!UdUJNa31WxFW2noa.OmGtjOMcTHNN6OsH" + "_key": "!items.effects!UdUJNa31WxFW2noa.zji5nzTC1y8BUWHn" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json b/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json index 36484785..eb8285cb 100644 --- a/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json +++ b/src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "3" + "max": "3", + "key": "system.armorScore" } ] }, - "_id": "ySw8mkws8rxzxsg4", + "_id": "72LkcLIihluGgx48", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!yJFp1bfpecDcStVK.ySw8mkws8rxzxsg4" + "_key": "!items.effects!yJFp1bfpecDcStVK.72LkcLIihluGgx48" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json b/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json index 7f69317b..43057efa 100644 --- a/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json +++ b/src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json @@ -87,16 +87,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "nyoNusMuukJt1MJw", + "_id": "GYRwYD3CHW9q4N29", "disabled": false, "start": null, "duration": { @@ -117,7 +117,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!dvyQeUVRLc9y6rnt.nyoNusMuukJt1MJw" + "_key": "!items.effects!dvyQeUVRLc9y6rnt.GYRwYD3CHW9q4N29" } ], "sort": 0, 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..69b1bbae 100644 --- a/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json +++ b/src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "7FdWcilv74zKcXWk", + "_id": "2KD6EdRL2L2gQkMR", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!K5WkjS0NGqHYmhU3.7FdWcilv74zKcXWk" + "_key": "!items.effects!K5WkjS0NGqHYmhU3.2KD6EdRL2L2gQkMR" } ], "sort": 0, 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..eb62a85b 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 @@ -76,16 +76,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "qgA4nbITVOp2WTpl", + "_id": "ehijWY3PGw1OaQr0", "disabled": false, "start": null, "duration": { @@ -106,7 +106,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!9f7RozpPTqrzJS1m.qgA4nbITVOp2WTpl" + "_key": "!items.effects!9f7RozpPTqrzJS1m.ehijWY3PGw1OaQr0" } ], "sort": 0, 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..2e1b4f93 100644 --- a/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json +++ b/src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "dtkOq7rUKj5nLGJP", + "_id": "d6QRNZ1X4wdoy82q", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!jphnMZjnS2FkOH3s.dtkOq7rUKj5nLGJP" + "_key": "!items.effects!jphnMZjnS2FkOH3s.d6QRNZ1X4wdoy82q" } ], "sort": 0, 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..3dce3151 100644 --- a/src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json +++ b/src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json @@ -33,16 +33,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "JqnUKeUDbH4YJbVb", + "_id": "lQNHCtW6HnIj0b7F", "disabled": false, "start": null, "duration": { @@ -63,7 +63,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!t91M61pSCMKStTNt.JqnUKeUDbH4YJbVb" + "_key": "!items.effects!t91M61pSCMKStTNt.lQNHCtW6HnIj0b7F" } ], "sort": 0, 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..9be75429 100644 --- a/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json +++ b/src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json @@ -83,16 +83,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "6Mh24zh1c3aK60wZ", + "_id": "jnjdtSTQF1zTSkEr", "disabled": false, "start": null, "duration": { @@ -113,7 +113,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!tzZntboNtHL5C6VM.6Mh24zh1c3aK60wZ" + "_key": "!items.effects!tzZntboNtHL5C6VM.jnjdtSTQF1zTSkEr" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json b/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json index 1b3cae95..5f79c177 100644 --- a/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json +++ b/src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json @@ -33,16 +33,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "3" + "max": "3", + "key": "system.armorScore" } ] }, - "_id": "2enPnnikOoG0oIZP", + "_id": "bkEJ55HhIYFnX1Tz", "disabled": false, "start": null, "duration": { @@ -63,7 +63,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!nibfdNtp2PtxvbVz.2enPnnikOoG0oIZP" + "_key": "!items.effects!nibfdNtp2PtxvbVz.bkEJ55HhIYFnX1Tz" } ], "sort": 0, 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..993b35cf 100644 --- a/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json +++ b/src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "7" + "max": "7", + "key": "system.armorScore" } ] }, - "_id": "kqNdkD1d4FOQloMV", + "_id": "PZsaURELHOaRJK28", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!EsIN5OLKe9ZYFNXZ.kqNdkD1d4FOQloMV" + "_key": "!items.effects!EsIN5OLKe9ZYFNXZ.PZsaURELHOaRJK28" } ], "sort": 0, 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..ba4eb949 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 @@ -76,16 +76,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "7" + "max": "7", + "key": "system.armorScore" } ] }, - "_id": "kFxM3Et2bPzghJWm", + "_id": "IMPH2qFG7zXaxefg", "disabled": false, "start": null, "duration": { @@ -106,7 +106,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!SXWjUR2aUR6bYvdl.kFxM3Et2bPzghJWm" + "_key": "!items.effects!SXWjUR2aUR6bYvdl.IMPH2qFG7zXaxefg" } ], "sort": 0, 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..b0af0790 100644 --- a/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json +++ b/src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "jdD0dJoh8gdGdh6W", + "_id": "TtMaMntKKpcTU054", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!c6tMXz4rPf9ioQrf.jdD0dJoh8gdGdh6W" + "_key": "!items.effects!c6tMXz4rPf9ioQrf.TtMaMntKKpcTU054" } ], "sort": 0, 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..6460fc02 100644 --- a/src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json +++ b/src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json @@ -33,16 +33,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "gP4PsefQLSTcBAQm", + "_id": "UtbfSKO8hmJanog5", "disabled": false, "start": null, "duration": { @@ -63,7 +63,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!Tptgl5WOj76TyFn7.gP4PsefQLSTcBAQm" + "_key": "!items.effects!Tptgl5WOj76TyFn7.UtbfSKO8hmJanog5" } ], "sort": 0, 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..91ab3f80 100644 --- a/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json +++ b/src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json @@ -71,16 +71,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "xMJr6Zj9zZd7v5uD", + "_id": "kskfQTQTgCgmQR6b", "disabled": false, "start": null, "duration": { @@ -101,7 +101,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!AQzU2RsqS5V5bd1v.xMJr6Zj9zZd7v5uD" + "_key": "!items.effects!AQzU2RsqS5V5bd1v.kskfQTQTgCgmQR6b" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json b/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json index 172e100b..a7c2ab93 100644 --- a/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json +++ b/src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json @@ -63,16 +63,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "ebhSsuWrFYUVkGXC", + "_id": "eT5j1FNPPQOdLO2Q", "disabled": false, "start": null, "duration": { @@ -93,7 +93,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!tN8kAeBvNKM3EBFo.ebhSsuWrFYUVkGXC" + "_key": "!items.effects!tN8kAeBvNKM3EBFo.eT5j1FNPPQOdLO2Q" } ], "sort": 0, 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..c1beaad7 100644 --- a/src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json +++ b/src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json @@ -70,16 +70,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "pw8CD3IFNqb7530v", + "_id": "UmpUTOMR2UBmrAu6", "disabled": false, "start": null, "duration": { @@ -100,7 +100,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!P4qAEDJUoNLgVRsA.pw8CD3IFNqb7530v" + "_key": "!items.effects!P4qAEDJUoNLgVRsA.UmpUTOMR2UBmrAu6" } ], "sort": 0, 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..a26eb694 100644 --- a/src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json +++ b/src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json @@ -70,16 +70,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "4" + "max": "4", + "key": "system.armorScore" } ] }, - "_id": "Y4ZSoO0iGxLiNr80", + "_id": "s39jgXMmi4fDHuaE", "disabled": false, "start": null, "duration": { @@ -100,7 +100,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!tHlBUDQC24YMZqd6.Y4ZSoO0iGxLiNr80" + "_key": "!items.effects!tHlBUDQC24YMZqd6.s39jgXMmi4fDHuaE" } ], "sort": 0, diff --git a/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json b/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json index 739f15d9..371cf794 100644 --- a/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json +++ b/src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json @@ -101,16 +101,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "8" + "max": "8", + "key": "system.armorScore" } ] }, - "_id": "vNGSiFtcEBCz6jFQ", + "_id": "SWXFcH4qbmPYI7WH", "disabled": false, "start": null, "duration": { @@ -131,7 +131,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!8X16lJQ3xltTwynm.vNGSiFtcEBCz6jFQ" + "_key": "!items.effects!8X16lJQ3xltTwynm.SWXFcH4qbmPYI7WH" } ], "sort": 0, 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..114b92f5 100644 --- a/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json +++ b/src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json @@ -76,16 +76,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "jfcv9NL2RtlfpECz", + "_id": "OtOaxh7BCM2OMOmS", "disabled": false, "start": null, "duration": { @@ -106,7 +106,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!QjwsIhXKqnlvRBMv.jfcv9NL2RtlfpECz" + "_key": "!items.effects!QjwsIhXKqnlvRBMv.OtOaxh7BCM2OMOmS" } ], "sort": 0, 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..45fea752 100644 --- a/src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json +++ b/src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json @@ -63,16 +63,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "5" + "max": "5", + "key": "system.armorScore" } ] }, - "_id": "E8iCCJSpPbCMostx", + "_id": "DgAQc09o3x6zn6DQ", "disabled": false, "start": null, "duration": { @@ -93,7 +93,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!PSW3BxCGmtLeWOxM.E8iCCJSpPbCMostx" + "_key": "!items.effects!PSW3BxCGmtLeWOxM.DgAQc09o3x6zn6DQ" } ], "sort": 0, 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..e9f98300 100644 --- a/src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json +++ b/src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json @@ -63,16 +63,16 @@ "system": { "changes": [ { - "key": "system.armorScore", "type": "armor", "phase": "initial", "priority": 20, "value": 0, - "max": "6" + "max": "6", + "key": "system.armorScore" } ] }, - "_id": "avGWSRMFFLbdJaYC", + "_id": "2gMOVh1Hty0nVWy4", "disabled": false, "start": null, "duration": { @@ -93,7 +93,7 @@ "_stats": { "compendiumSource": null }, - "_key": "!items.effects!OvzgUTYy2RCN85vV.avGWSRMFFLbdJaYC" + "_key": "!items.effects!OvzgUTYy2RCN85vV.2gMOVh1Hty0nVWy4" } ], "sort": 0, diff --git a/src/packs/items/armors/folders_Special_tI3bfr6Sgi16Z7zm.json b/src/packs/items/armors/folders_Special_tI3bfr6Sgi16Z7zm.json deleted file mode 100644 index 65c4eca8..00000000 --- a/src/packs/items/armors/folders_Special_tI3bfr6Sgi16Z7zm.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "Item", - "folder": null, - "name": "Special", - "color": null, - "sorting": "a", - "_id": "tI3bfr6Sgi16Z7zm", - "description": "", - "sort": 0, - "flags": {}, - "_key": "!folders!tI3bfr6Sgi16Z7zm" -} 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 549df4d8..c1c4fba5 100644 --- a/src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json +++ b/src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json @@ -113,26 +113,26 @@ "name": "Protective", "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", - "_id": "7285CRGdZfHCEtT2", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier" - } - ] - }, + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier", + "priority": null + } + ], + "_id": "i5HfkF5aKQuUCTEG", + "type": "base", + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null, + "seconds": null, + "rounds": null, + "turns": null, + "startRound": null, + "startTurn": null }, "origin": null, "tint": "#ffffff", @@ -143,10 +143,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!hiEOGF2reabGLUoi.7285CRGdZfHCEtT2" + "_key": "!items.effects!hiEOGF2reabGLUoi.i5HfkF5aKQuUCTEG" } ], "sort": 0, 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 96ac78cb..b2fb16d8 100644 --- a/src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json +++ b/src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json @@ -113,25 +113,25 @@ "name": "Barrier", "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier + 1" + }, + { + "key": "system.evasion", + "mode": 2, + "value": "-1" + } + ], "_id": "87gedjJZGdFY81Mt", "type": "base", - "system": { - "changes": [ - { - "key": "system.evasion", - "type": "add", - "value": -1, - "phase": "initial", - "priority": 0 - } - ] - }, + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null }, "origin": null, "tint": "#ffffff", @@ -142,49 +142,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, "_key": "!items.effects!OfOzQbs4hg6QbfTG.87gedjJZGdFY81Mt" - }, - { - "name": "Barrier", - "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", - "img": "icons/skills/melee/shield-block-bash-blue.webp", - "_id": "J0f7zqqOr61ADpdy", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier + 1" - } - ] - }, - "disabled": false, - "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false - }, - "origin": null, - "tint": "#ffffff", - "transfer": true, - "statuses": [], - "sort": 0, - "flags": {}, - "_stats": { - "compendiumSource": null - }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!OfOzQbs4hg6QbfTG.J0f7zqqOr61ADpdy" } ], "sort": 0, 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 fcd3caed..53a8e9b6 100644 --- a/src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json +++ b/src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json @@ -113,26 +113,26 @@ "name": "Protective", "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", - "_id": "pZCrWd7zLTarvEQK", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier" - } - ] - }, + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier", + "priority": null + } + ], + "_id": "cXWSV50apzaNQkdA", + "type": "base", + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null, + "seconds": null, + "rounds": null, + "turns": null, + "startRound": null, + "startTurn": null }, "origin": null, "tint": "#ffffff", @@ -143,10 +143,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!DlinEBGZfIlvreO3.pZCrWd7zLTarvEQK" + "_key": "!items.effects!DlinEBGZfIlvreO3.cXWSV50apzaNQkdA" } ], "sort": 0, 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 b1b4279f..839d4352 100644 --- a/src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json +++ b/src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json @@ -113,25 +113,25 @@ "name": "Barrier", "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier + 1" + }, + { + "key": "system.evasion", + "mode": 2, + "value": "-1" + } + ], "_id": "tkNEA1PO3jEFhKCa", "type": "base", - "system": { - "changes": [ - { - "key": "system.evasion", - "type": "add", - "value": -1, - "phase": "initial", - "priority": 0 - } - ] - }, + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null }, "origin": null, "tint": "#ffffff", @@ -142,49 +142,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, "_key": "!items.effects!bxt3NsbMqTSdI5ab.tkNEA1PO3jEFhKCa" - }, - { - "name": "Barrier", - "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", - "img": "icons/skills/melee/shield-block-bash-blue.webp", - "_id": "XugJeHJdnC6IymSa", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier + 1" - } - ] - }, - "disabled": false, - "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false - }, - "origin": null, - "tint": "#ffffff", - "transfer": true, - "statuses": [], - "sort": 0, - "flags": {}, - "_stats": { - "compendiumSource": null - }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!bxt3NsbMqTSdI5ab.XugJeHJdnC6IymSa" } ], "sort": 0, diff --git a/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json b/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json index 2272926c..4958bbe5 100644 --- a/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json +++ b/src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json @@ -113,26 +113,20 @@ "name": "Protective", "description": "Add your character's Tier to your Armor Score", "img": "icons/skills/melee/shield-block-gray-orange.webp", - "_id": "vnR4Zhnb0rOqwrFw", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier" - } - ] - }, + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier" + } + ], + "_id": "qTxADRsQnKiYfOiQ", + "type": "base", + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null }, "origin": null, "tint": "#ffffff", @@ -143,10 +137,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!ijWppQzSOqVCb3rE.vnR4Zhnb0rOqwrFw" + "_key": "!items.effects!ijWppQzSOqVCb3rE.qTxADRsQnKiYfOiQ" } ], "sort": 0, 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 81045ea3..c7b18355 100644 --- a/src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json +++ b/src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json @@ -113,26 +113,26 @@ "name": "Protective", "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", - "_id": "EixxJrRHyc6kj3Wg", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier" - } - ] - }, + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier", + "priority": null + } + ], + "_id": "Z2p00q5h6x6seXys", + "type": "base", + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null, + "seconds": null, + "rounds": null, + "turns": null, + "startRound": null, + "startTurn": null }, "origin": null, "tint": "#ffffff", @@ -143,10 +143,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!A28WL9E2lJ3iLZHW.EixxJrRHyc6kj3Wg" + "_key": "!items.effects!A28WL9E2lJ3iLZHW.Z2p00q5h6x6seXys" } ], "sort": 0, 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 6ae5d720..47e707d3 100644 --- a/src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json +++ b/src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json @@ -113,25 +113,25 @@ "name": "Barrier", "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier + 1" + }, + { + "key": "system.evasion", + "mode": 2, + "value": "-1" + } + ], "_id": "lBJMzxdGO2nJdTQS", "type": "base", - "system": { - "changes": [ - { - "key": "system.evasion", - "type": "add", - "value": -1, - "phase": "initial", - "priority": 0 - } - ] - }, + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null }, "origin": null, "tint": "#ffffff", @@ -142,49 +142,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, "_key": "!items.effects!MaJIROht7A9LxIZx.lBJMzxdGO2nJdTQS" - }, - { - "name": "Barrier", - "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", - "img": "icons/skills/melee/shield-block-bash-blue.webp", - "_id": "1fgUIaXl6VQrhP7j", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier + 1" - } - ] - }, - "disabled": false, - "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false - }, - "origin": null, - "tint": "#ffffff", - "transfer": true, - "statuses": [], - "sort": 0, - "flags": {}, - "_stats": { - "compendiumSource": null - }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!MaJIROht7A9LxIZx.1fgUIaXl6VQrhP7j" } ], "sort": 0, diff --git a/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json b/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json index d16c550c..47b096af 100644 --- a/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json +++ b/src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json @@ -113,26 +113,26 @@ "name": "Protective", "description": "

Add the item's Tier to your Armor Score

", "img": "icons/skills/melee/shield-block-gray-orange.webp", - "_id": "eV4lFIpQMiKERj4U", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier" - } - ] - }, + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier", + "priority": null + } + ], + "_id": "M70a81e0Mg66jHRL", + "type": "base", + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null, + "seconds": null, + "rounds": null, + "turns": null, + "startRound": null, + "startTurn": null }, "origin": null, "tint": "#ffffff", @@ -143,10 +143,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!mxwWKDujgsRcZWPT.eV4lFIpQMiKERj4U" + "_key": "!items.effects!mxwWKDujgsRcZWPT.M70a81e0Mg66jHRL" } ], "sort": 0, diff --git a/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json b/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json index 40e451bd..edadecf9 100644 --- a/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json +++ b/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json @@ -113,31 +113,32 @@ "name": "Double Duty", "description": "+1 to Armor Score; +1 to primary weapon damage within Melee range", "img": "icons/skills/melee/sword-shield-stylized-white.webp", + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "1" + }, + { + "key": "system.bonuses.damage.primaryWeapon.bonus", + "mode": 2, + "value": "1" + } + ], "system": { "rangeDependence": { "enabled": true, "range": "melee", "target": "hostile", "type": "withinRange" - }, - "changes": [ - { - "key": "system.bonuses.damage.primaryWeapon.bonus", - "type": "add", - "value": 1, - "phase": "initial", - "priority": 0 - } - ] + } }, "_id": "d3TJtlpoHBCztbom", "type": "base", "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null }, "origin": null, "tint": "#ffffff", @@ -148,49 +149,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, "_key": "!items.effects!vzyzFwLUniWZV1rt.d3TJtlpoHBCztbom" - }, - { - "name": "Double Duty", - "description": "+1 to Armor Score; +1 to primary weapon damage within Melee range", - "img": "icons/skills/melee/sword-shield-stylized-white.webp", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "1" - } - ] - }, - "_id": "mvUY9LGfwICak7cE", - "type": "armor", - "disabled": false, - "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false - }, - "origin": null, - "tint": "#ffffff", - "transfer": true, - "statuses": [], - "sort": 0, - "flags": {}, - "_stats": { - "compendiumSource": null - }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!vzyzFwLUniWZV1rt.mvUY9LGfwICak7cE" } ], "sort": 0, diff --git a/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json b/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json index 9e3e9968..d49b7de7 100644 --- a/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json +++ b/src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json @@ -113,25 +113,25 @@ "name": "Barrier", "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", "img": "icons/skills/melee/shield-block-bash-blue.webp", + "changes": [ + { + "key": "system.armorScore", + "mode": 2, + "value": "ITEM.@system.tier + 1" + }, + { + "key": "system.evasion", + "mode": 2, + "value": "-1" + } + ], "_id": "8r0TcKWXboFV0eqS", "type": "base", - "system": { - "changes": [ - { - "key": "system.evasion", - "type": "add", - "value": -1, - "phase": "initial", - "priority": 0 - } - ] - }, + "system": {}, "disabled": false, "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false + "startTime": null, + "combat": null }, "origin": null, "tint": "#ffffff", @@ -142,49 +142,7 @@ "_stats": { "compendiumSource": null }, - "start": null, - "showIcon": 1, - "folder": null, "_key": "!items.effects!C9aWpK1shVMWP4m5.8r0TcKWXboFV0eqS" - }, - { - "name": "Barrier", - "description": "Gain Weapon Tier + 1 to Armor Score; -1 to Evasion", - "img": "icons/skills/melee/shield-block-bash-blue.webp", - "_id": "tLRc4UAnGuIq7er3", - "type": "armor", - "system": { - "changes": [ - { - "key": "system.armorScore", - "type": "armor", - "phase": "initial", - "priority": 20, - "value": 0, - "max": "ITEM.@system.tier + 1" - } - ] - }, - "disabled": false, - "duration": { - "value": null, - "units": "seconds", - "expiry": null, - "expired": false - }, - "origin": null, - "tint": "#ffffff", - "transfer": true, - "statuses": [], - "sort": 0, - "flags": {}, - "_stats": { - "compendiumSource": null - }, - "start": null, - "showIcon": 1, - "folder": null, - "_key": "!items.effects!C9aWpK1shVMWP4m5.tLRc4UAnGuIq7er3" } ], "sort": 0, diff --git a/styles/less/sheets/activeEffects/armorEffects.less b/styles/less/sheets/activeEffects/armorEffects.less index fd5c89b1..9756edce 100644 --- a/styles/less/sheets/activeEffects/armorEffects.less +++ b/styles/less/sheets/activeEffects/armorEffects.less @@ -1,5 +1,16 @@ .application.sheet.daggerheart.dh-style.armor-effect-config { - .tab-form-footer { - margin-top: 8px; + .armor-effects-container { + display: flex; + flex-direction: column; + gap: 8px; + + .armor-effect-container { + display: flex; + gap: 4px; + + * { + flex: 1; + } + } } } diff --git a/templates/sheets/activeEffect/armor/settings.hbs b/templates/sheets/activeEffect/armor/settings.hbs index 12ca2154..c0f77b35 100644 --- a/templates/sheets/activeEffect/armor/settings.hbs +++ b/templates/sheets/activeEffect/armor/settings.hbs @@ -1,17 +1,10 @@
-
- {{localize "Armor"}} -
- {{#each source.system.changes as |change index|}} +
+ {{#each source.system.changes as |change index|}} +
{{formGroup @root.systemFields.changes.element.fields.value name=(concat 'system.changes.' index '.value') value=change.value localize=true}} {{formGroup @root.systemFields.changes.element.fields.max name=(concat 'system.changes.' index '.max') value=change.max localize=true}} - {{/each}} -
-
- -
- {{localize "DAGGERHEART.GENERAL.general"}} - - {{formGroup @root.systemFields.armorInteraction name="system.armorInteraction" value=source.system.armorInteraction localize=true}} -
+ + {{/each}} +
\ No newline at end of file