diff --git a/.betterer.results b/.betterer.results index 8c0e1c6377c..12cb849a19c 100644 --- a/.betterer.results +++ b/.betterer.results @@ -10,21 +10,21 @@ exports[`too-much-lint`] = { [9, 14, 3, "Unexpected any. Specify a different type.", "193409811"], [10, 15, 3, "Unexpected any. Specify a different type.", "193409811"] ], - "types/foundry/client/collections/compendium-collection.d.ts:3957627828": [ - [210, 23, 3, "Unexpected any. Specify a different type.", "193409811"] + "types/foundry/client/collections/compendium-collection.d.ts:766536613": [ + [212, 23, 3, "Unexpected any. Specify a different type.", "193409811"] ], "types/foundry/client/documents/mixins/canvas-document-mixin.d.ts:3303075782": [ [16, 22, 3, "Unexpected any. Specify a different type.", "193409811"], [21, 57, 3, "Unexpected any. Specify a different type.", "193409811"], [54, 57, 3, "Unexpected any. Specify a different type.", "193409811"] ], - "types/foundry/client/documents/mixins/client-document-mixin.d.ts:2424756609": [ + "types/foundry/client/documents/mixins/client-document-mixin.d.ts:1741650789": [ [8, 18, 3, "Unexpected any. Specify a different type.", "193409811"], [65, 43, 3, "Unexpected any. Specify a different type.", "193409811"], - [163, 17, 3, "Unexpected any. Specify a different type.", "193409811"], - [164, 19, 3, "Unexpected any. Specify a different type.", "193409811"], - [167, 21, 3, "Unexpected any. Specify a different type.", "193409811"], - [305, 44, 3, "Unexpected any. Specify a different type.", "193409811"] + [165, 17, 3, "Unexpected any. Specify a different type.", "193409811"], + [166, 19, 3, "Unexpected any. Specify a different type.", "193409811"], + [169, 21, 3, "Unexpected any. Specify a different type.", "193409811"], + [307, 44, 3, "Unexpected any. Specify a different type.", "193409811"] ], "types/foundry/client/game.d.ts:2501689875": [ [182, 32, 3, "Unexpected any. Specify a different type.", "193409811"] @@ -54,10 +54,10 @@ exports[`too-much-lint`] = { "types/foundry/common/abstract/data.d.ts:1438318714": [ [22, 34, 3, "Unexpected any. Specify a different type.", "193409811"] ], - "types/foundry/common/abstract/document.d.ts:2061890606": [ - [571, 29, 3, "Unexpected any. Specify a different type.", "193409811"] + "types/foundry/common/abstract/document.d.ts:459111865": [ + [572, 29, 3, "Unexpected any. Specify a different type.", "193409811"] ], - "types/foundry/common/utils/collection.d.ts:3114157620": [ + "types/foundry/common/utils/collection.d.ts:1050385599": [ [111, 31, 3, "Unexpected any. Specify a different type.", "193409811"], [113, 43, 3, "Unexpected any. Specify a different type.", "193409811"] ] diff --git a/packs/data/equipment.db/anarchic.json b/packs/data/equipment.db/anarchic.json index be9ec7969e9..0a44e0916cc 100644 --- a/packs/data/equipment.db/anarchic.json +++ b/packs/data/equipment.db/anarchic.json @@ -51,7 +51,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-weapon-wo-axiomatic-rune" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/axiomatic.json b/packs/data/equipment.db/axiomatic.json index 5c41d32f156..bf7bc502658 100644 --- a/packs/data/equipment.db/axiomatic.json +++ b/packs/data/equipment.db/axiomatic.json @@ -51,7 +51,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-weapon-wo-anarchic-rune" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/corrosive-greater.json b/packs/data/equipment.db/corrosive-greater.json index 459c47fffca..1ef413217e9 100644 --- a/packs/data/equipment.db/corrosive-greater.json +++ b/packs/data/equipment.db/corrosive-greater.json @@ -51,7 +51,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-a-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/dancing.json b/packs/data/equipment.db/dancing.json index 116837c51b5..1a7416947fe 100644 --- a/packs/data/equipment.db/dancing.json +++ b/packs/data/equipment.db/dancing.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/disrupting-greater.json b/packs/data/equipment.db/disrupting-greater.json index 90fa73f2b1d..bf83e455448 100644 --- a/packs/data/equipment.db/disrupting-greater.json +++ b/packs/data/equipment.db/disrupting-greater.json @@ -51,7 +51,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/disrupting.json b/packs/data/equipment.db/disrupting.json index 681dc622d9b..d563ce54b3d 100644 --- a/packs/data/equipment.db/disrupting.json +++ b/packs/data/equipment.db/disrupting.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/ghost-touch.json b/packs/data/equipment.db/ghost-touch.json index 16058e33e5c..9931e78edb4 100644 --- a/packs/data/equipment.db/ghost-touch.json +++ b/packs/data/equipment.db/ghost-touch.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/holy.json b/packs/data/equipment.db/holy.json index bdc92fe2369..89ae2fa79b1 100644 --- a/packs/data/equipment.db/holy.json +++ b/packs/data/equipment.db/holy.json @@ -51,7 +51,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-weapon-wo-unholy-rune" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/invisibility-greater.json b/packs/data/equipment.db/invisibility-greater.json index 632f7b5c518..6cf84b6a90e 100644 --- a/packs/data/equipment.db/invisibility-greater.json +++ b/packs/data/equipment.db/invisibility-greater.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-light-armor" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/keen.json b/packs/data/equipment.db/keen.json index 6eedbe66b48..978c89dc510 100644 --- a/packs/data/equipment.db/keen.json +++ b/packs/data/equipment.db/keen.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-piercing-or-slashing-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/returning.json b/packs/data/equipment.db/returning.json index a3e8f22afa5..c647a064c13 100644 --- a/packs/data/equipment.db/returning.json +++ b/packs/data/equipment.db/returning.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-thrown-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/shadow-greater.json b/packs/data/equipment.db/shadow-greater.json index c8c04866d5b..8ddc2210e6c 100644 --- a/packs/data/equipment.db/shadow-greater.json +++ b/packs/data/equipment.db/shadow-greater.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-lm-nonmetal-armor" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/shadow-major.json b/packs/data/equipment.db/shadow-major.json index 68d44a3a6c9..e6e9ec45744 100644 --- a/packs/data/equipment.db/shadow-major.json +++ b/packs/data/equipment.db/shadow-major.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-lm-nonmetal-armor" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/shadow.json b/packs/data/equipment.db/shadow.json index bcb425cfe0a..49c3c9fa0a0 100644 --- a/packs/data/equipment.db/shadow.json +++ b/packs/data/equipment.db/shadow.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-lm-nonmetal-armor" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/shifting.json b/packs/data/equipment.db/shifting.json index 35009118aae..bba668a5313 100644 --- a/packs/data/equipment.db/shifting.json +++ b/packs/data/equipment.db/shifting.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/spell-storing.json b/packs/data/equipment.db/spell-storing.json index f0b34f80d92..aeef0394536 100644 --- a/packs/data/equipment.db/spell-storing.json +++ b/packs/data/equipment.db/spell-storing.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/unholy.json b/packs/data/equipment.db/unholy.json index e843308b5f0..65ea4641423 100644 --- a/packs/data/equipment.db/unholy.json +++ b/packs/data/equipment.db/unholy.json @@ -51,7 +51,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-weapon-wo-holy-rune" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/vorpal.json b/packs/data/equipment.db/vorpal.json index 15c8229011a..1ab6fb8afdc 100644 --- a/packs/data/equipment.db/vorpal.json +++ b/packs/data/equipment.db/vorpal.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-slashing-melee-weapon" }, "weight": { "value": "-" diff --git a/packs/data/equipment.db/wounding.json b/packs/data/equipment.db/wounding.json index d41d65b69fd..7fb9312a8d6 100644 --- a/packs/data/equipment.db/wounding.json +++ b/packs/data/equipment.db/wounding.json @@ -50,7 +50,7 @@ ] }, "usage": { - "value": "held-in-one-hand" + "value": "etched-onto-piercing-or-slashing-melee-weapon" }, "weight": { "value": "-" diff --git a/src/module/item/physical/usage.ts b/src/module/item/physical/usage.ts index 4ed2882d527..5086d2cebe1 100644 --- a/src/module/item/physical/usage.ts +++ b/src/module/item/physical/usage.ts @@ -104,12 +104,19 @@ export function getUsageDetails(usage: string): UsageDetails { case "each-rune-applied-to-a-separate-item-that-has-pockets": case "tattooed-on-the-body": case "etched-onto-armor": + case "etched-onto-light-armor": case "etched-onto-med-heavy-armor": + case "etched-onto-lm-nonmetal-armor": case "etched-onto-a-weapon": case "etched-onto-thrown-weapon": case "etched-onto-melee-weapon": + case "etched-onto-slashing-melee-weapon": + case "etched-onto-piercing-or-slashing-melee-weapon": case "etched-onto-clan-dagger": - case "etched-onto-lm-nonmetal-armor": + case "etched-onto-weapon-wo-anarchic-rune": + case "etched-onto-weapon-wo-axiomatic-rune": + case "etched-onto-weapon-wo-unholy-rune": + case "etched-onto-weapon-wo-holy-rune": case "sewn-into-clothing": case "": return { value: usage, type: "worn" }; diff --git a/src/scripts/config/index.ts b/src/scripts/config/index.ts index 2c559a76908..d2a5b4e904a 100644 --- a/src/scripts/config/index.ts +++ b/src/scripts/config/index.ts @@ -994,10 +994,17 @@ export const PF2ECONFIG = { "PF2E.TraitEachRuneAppliedToASeparateItemThatHasPockets", "etched-onto-a-weapon": "PF2E.TraitEtchedOntoAWeapon", "etched-onto-armor": "PF2E.TraitEtchedOntoArmor", - "etched-onto-clan-dagger": "PF2E.TraitEtchedOntoAClanDagger", - "etched-onto-lm-nonmetal-armor": "PF2E.TraitEtchedOntoLightMedNMArmor", + "etched-onto-light-armor": "PF2E.TraitEtchedOntoLightArmor", "etched-onto-med-heavy-armor": "PF2E.TraitEtchedOntoMedHeavyArmor", + "etched-onto-lm-nonmetal-armor": "PF2E.TraitEtchedOntoLightMedNMArmor", + "etched-onto-clan-dagger": "PF2E.TraitEtchedOntoAClanDagger", "etched-onto-melee-weapon": "PF2E.TraitEtchedOntoAMeleeWeapon", + "etched-onto-slashing-melee-weapon": "PF2E.TraitEtchedOntoASlashingMeleeWeapon", + "etched-onto-piercing-or-slashing-melee-weapon": "PF2E.TraitEtchedOntoAPiercingOrSlashingMeleeWeapon", + "etched-onto-weapon-wo-anarchic-rune": "PF2E.TraitEtchedOntoAWeaponWOAxiomaticRune", + "etched-onto-weapon-wo-axiomatic-rune": "PF2E.TraitEtchedOntoAWeaponWOAnarchicRune", + "etched-onto-weapon-wo-unholy-rune": "PF2E.TraitEtchedOntoAWeaponWOHolyRune", + "etched-onto-weapon-wo-holy-rune": "PF2E.TraitEtchedOntoAWeaponWOUnholyRune", "etched-onto-thrown-weapon": "PF2E.TraitEtchedOntoAThrownWeapon", "held-in-one-hand": "PF2E.TraitHeldOneHand", "held-in-two-hands": "PF2E.TraitHeldTwoHands", diff --git a/static/lang/en.json b/static/lang/en.json index 1062043f582..c1229e7d97b 100644 --- a/static/lang/en.json +++ b/static/lang/en.json @@ -4454,12 +4454,19 @@ "TraitWornSaddle": "Worn Saddle", "TraitWornOrOneHand": "Worn or Held in One Hand", "TraitEtchedOntoArmor": "Etched onto Armor", + "TraitEtchedOntoLightArmor": "Etched onto Light Armor", "TraitEtchedOntoMedHeavyArmor": "Etched onto Medium or Heavy Armor", + "TraitEtchedOntoLightMedNMArmor": "Etched on L/M Nonmetal Armor", "TraitEtchedOntoAWeapon": "Etched onto a Weapon", "TraitEtchedOntoAThrownWeapon": "Etched on Thrown Weapon", "TraitEtchedOntoAMeleeWeapon": "Etched on Melee Weapon", + "TraitEtchedOntoASlashingMeleeWeapon": "Etched on Slashing Melee Weapon", + "TraitEtchedOntoAPiercingOrSlashingMeleeWeapon": "Etched on Piercing/Slashing Melee Weapon", + "TraitEtchedOntoAWeaponWOAxiomaticRune": "Etched on Weapon w/o Axiomatic Rune", + "TraitEtchedOntoAWeaponWOAnarchicRune": "Etched on Weapon w/o Anarchic Rune", + "TraitEtchedOntoAWeaponWOHolyRune": "Etched on Weapon w/o Holy Rune", + "TraitEtchedOntoAWeaponWOUnholyRune": "Etched on Weapon w/o Unholy Rune", "TraitEtchedOntoAClanDagger": "Etched on Clan Dagger", - "TraitEtchedOntoLightMedNMArmor": "Etched on L/M Nonmetal Armor", "TraitBonded": "Bonded", "TraitsLabel": "Traits", "Trap": "Trap",