diff --git a/lang/en.json b/lang/en.json index 7db980df..e42d725c 100755 --- a/lang/en.json +++ b/lang/en.json @@ -1273,6 +1273,12 @@ "name": "Paired", "description": "Add your character's Tier + 1 to primary weapon damage against targets within Melee range" } + }, + "effects": { + "paired": { + "name": "Paired", + "description": "Add your character's Tier + 1 to primary weapon damage against targets within Melee range" + } } }, "parry": { diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs index 46c98e6d..53ca3ec5 100644 --- a/module/config/itemConfig.mjs +++ b/module/config/itemConfig.mjs @@ -413,7 +413,7 @@ export const weaponFeatures = { { name: 'DAGGERHEART.CONFIG.WeaponFeature.barrier.effects.barrier.name', description: 'DAGGERHEART.CONFIG.WeaponFeature.barrier.effects.barrier.description', - img: 'icons/skills/melee/strike-sword-slashing-red.webp', + img: 'icons/skills/melee/shield-block-bash-blue.webp', changes: [ { key: 'system.armorScore', @@ -1017,7 +1017,21 @@ export const weaponFeatures = { chatDisplay: true, name: 'DAGGERHEART.CONFIG.WeaponFeature.paired.actions.paired.name', description: 'DAGGERHEART.CONFIG.WeaponFeature.paired.actions.paired.description', - img: 'icons/skills/melee/weapons-crossed-swords-yellow-teal.webp' + img: 'icons/skills/melee/weapons-crossed-swords-yellow-teal.webp', + effects: [ + { + name: 'DAGGERHEART.CONFIG.WeaponFeature.paired.effects.paired.name', + description: 'DAGGERHEART.CONFIG.WeaponFeature.paired.effects.paired.description', + img: 'icons/skills/melee/weapons-crossed-swords-yellow-teal.webp', + changes: [ + { + key: 'system.bonuses.damage.primaryWeapon.bonus', + mode: 2, + value: '1 + ITEM.@system.tier' + } + ] + } + ] } ] }, @@ -1121,7 +1135,7 @@ export const weaponFeatures = { { key: 'system.armorScore', mode: 2, - value: '1' + value: 'ITEM.@system.tier' } ] } @@ -1294,7 +1308,7 @@ export const weaponFeatures = { description: 'DAGGERHEART.CONFIG.WeaponFeature.startling.description', actions: [ { - type: 'resource', + type: 'effect', actionType: 'action', chatDisplay: true, name: 'DAGGERHEART.CONFIG.WeaponFeature.startling.actions.startle.name', diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs index 584e659c..b7b70312 100644 --- a/module/data/item/weapon.mjs +++ b/module/data/item/weapon.mjs @@ -141,6 +141,10 @@ export default class DHWeapon extends AttachableItem { description: game.i18n.localize(effect.description) })) ); + weaponFeature.effectIds = [ + ...(weaponFeature.effectIds ?? []), + ...embeddedEffects.map(x => x.id) + ]; const cls = game.system.api.models.actions.actionsTypes[action.type]; const actionId = foundry.utils.randomID();