diff --git a/assets/common/items/armor/cloth/druid/back.ron b/assets/common/items/armor/cloth/druid/back.ron index 04fd2439ef..3226a8bc91 100644 --- a/assets/common/items/armor/cloth/druid/back.ron +++ b/assets/common/items/armor/cloth/druid/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/belt.ron b/assets/common/items/armor/cloth/druid/belt.ron index 7595714596..6707b8d707 100644 --- a/assets/common/items/armor/cloth/druid/belt.ron +++ b/assets/common/items/armor/cloth/druid/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/chest.ron b/assets/common/items/armor/cloth/druid/chest.ron index b13ea946f5..c7fad130a8 100644 --- a/assets/common/items/armor/cloth/druid/chest.ron +++ b/assets/common/items/armor/cloth/druid/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/foot.ron b/assets/common/items/armor/cloth/druid/foot.ron index acc72ddf5c..2855baf16f 100644 --- a/assets/common/items/armor/cloth/druid/foot.ron +++ b/assets/common/items/armor/cloth/druid/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/hand.ron b/assets/common/items/armor/cloth/druid/hand.ron index 3d7711d0cf..5df370508d 100644 --- a/assets/common/items/armor/cloth/druid/hand.ron +++ b/assets/common/items/armor/cloth/druid/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/pants.ron b/assets/common/items/armor/cloth/druid/pants.ron index 51c630e622..60d74e2d49 100644 --- a/assets/common/items/armor/cloth/druid/pants.ron +++ b/assets/common/items/armor/cloth/druid/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/shoulder.ron b/assets/common/items/armor/cloth/druid/shoulder.ron index f33e1f2597..b299764399 100644 --- a/assets/common/items/armor/cloth/druid/shoulder.ron +++ b/assets/common/items/armor/cloth/druid/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/back.ron b/assets/common/items/armor/cloth/linen/back.ron index ba795f841f..62aeeea835 100644 --- a/assets/common/items/armor/cloth/linen/back.ron +++ b/assets/common/items/armor/cloth/linen/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/belt.ron b/assets/common/items/armor/cloth/linen/belt.ron index eef91808ee..7ea684993d 100644 --- a/assets/common/items/armor/cloth/linen/belt.ron +++ b/assets/common/items/armor/cloth/linen/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/chest.ron b/assets/common/items/armor/cloth/linen/chest.ron index 4a37b06885..0ba91fb419 100644 --- a/assets/common/items/armor/cloth/linen/chest.ron +++ b/assets/common/items/armor/cloth/linen/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/foot.ron b/assets/common/items/armor/cloth/linen/foot.ron index 74e9022899..ad7d01de69 100644 --- a/assets/common/items/armor/cloth/linen/foot.ron +++ b/assets/common/items/armor/cloth/linen/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/hand.ron b/assets/common/items/armor/cloth/linen/hand.ron index db201abd3a..40417af0a3 100644 --- a/assets/common/items/armor/cloth/linen/hand.ron +++ b/assets/common/items/armor/cloth/linen/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/pants.ron b/assets/common/items/armor/cloth/linen/pants.ron index 9b282a8c72..c7db20fa60 100644 --- a/assets/common/items/armor/cloth/linen/pants.ron +++ b/assets/common/items/armor/cloth/linen/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/linen/shoulder.ron b/assets/common/items/armor/cloth/linen/shoulder.ron index a7d4589e80..ff1b338a79 100644 --- a/assets/common/items/armor/cloth/linen/shoulder.ron +++ b/assets/common/items/armor/cloth/linen/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/back.ron b/assets/common/items/armor/cloth/moonweave/back.ron index 701fdaec24..1ec799c6e8 100644 --- a/assets/common/items/armor/cloth/moonweave/back.ron +++ b/assets/common/items/armor/cloth/moonweave/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/belt.ron b/assets/common/items/armor/cloth/moonweave/belt.ron index 887acd4b9c..d7a52d5c4b 100644 --- a/assets/common/items/armor/cloth/moonweave/belt.ron +++ b/assets/common/items/armor/cloth/moonweave/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/chest.ron b/assets/common/items/armor/cloth/moonweave/chest.ron index 85a9283c28..3b38246f46 100644 --- a/assets/common/items/armor/cloth/moonweave/chest.ron +++ b/assets/common/items/armor/cloth/moonweave/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/foot.ron b/assets/common/items/armor/cloth/moonweave/foot.ron index ed9388da70..ee48ce0946 100644 --- a/assets/common/items/armor/cloth/moonweave/foot.ron +++ b/assets/common/items/armor/cloth/moonweave/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/hand.ron b/assets/common/items/armor/cloth/moonweave/hand.ron index 2cf03734ab..209a2a3f8b 100644 --- a/assets/common/items/armor/cloth/moonweave/hand.ron +++ b/assets/common/items/armor/cloth/moonweave/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/pants.ron b/assets/common/items/armor/cloth/moonweave/pants.ron index 8a0a214867..4132f557fe 100644 --- a/assets/common/items/armor/cloth/moonweave/pants.ron +++ b/assets/common/items/armor/cloth/moonweave/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/moonweave/shoulder.ron b/assets/common/items/armor/cloth/moonweave/shoulder.ron index dc3f7bc8d5..43a3c72b19 100644 --- a/assets/common/items/armor/cloth/moonweave/shoulder.ron +++ b/assets/common/items/armor/cloth/moonweave/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/back.ron b/assets/common/items/armor/cloth/silken/back.ron index 257f3d842e..6221b34f40 100644 --- a/assets/common/items/armor/cloth/silken/back.ron +++ b/assets/common/items/armor/cloth/silken/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/belt.ron b/assets/common/items/armor/cloth/silken/belt.ron index fdffe1ff5c..e26d4c8eac 100644 --- a/assets/common/items/armor/cloth/silken/belt.ron +++ b/assets/common/items/armor/cloth/silken/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/chest.ron b/assets/common/items/armor/cloth/silken/chest.ron index 6ed90fa6ac..30c6b99e5a 100644 --- a/assets/common/items/armor/cloth/silken/chest.ron +++ b/assets/common/items/armor/cloth/silken/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/foot.ron b/assets/common/items/armor/cloth/silken/foot.ron index 4afdf748e4..be5a38c63b 100644 --- a/assets/common/items/armor/cloth/silken/foot.ron +++ b/assets/common/items/armor/cloth/silken/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/hand.ron b/assets/common/items/armor/cloth/silken/hand.ron index dfb97c0dd9..b8913ed374 100644 --- a/assets/common/items/armor/cloth/silken/hand.ron +++ b/assets/common/items/armor/cloth/silken/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/pants.ron b/assets/common/items/armor/cloth/silken/pants.ron index f6882d7a9d..31463360ef 100644 --- a/assets/common/items/armor/cloth/silken/pants.ron +++ b/assets/common/items/armor/cloth/silken/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/silken/shoulder.ron b/assets/common/items/armor/cloth/silken/shoulder.ron index 1bcad343ed..67108f1a48 100644 --- a/assets/common/items/armor/cloth/silken/shoulder.ron +++ b/assets/common/items/armor/cloth/silken/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Silk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/back.ron b/assets/common/items/armor/cloth/sunsilk/back.ron index ba4a90bd0a..2470665ecf 100644 --- a/assets/common/items/armor/cloth/sunsilk/back.ron +++ b/assets/common/items/armor/cloth/sunsilk/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/belt.ron b/assets/common/items/armor/cloth/sunsilk/belt.ron index 0bd261414e..bdfe9e0086 100644 --- a/assets/common/items/armor/cloth/sunsilk/belt.ron +++ b/assets/common/items/armor/cloth/sunsilk/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/chest.ron b/assets/common/items/armor/cloth/sunsilk/chest.ron index f49713294f..7e78ced23b 100644 --- a/assets/common/items/armor/cloth/sunsilk/chest.ron +++ b/assets/common/items/armor/cloth/sunsilk/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/foot.ron b/assets/common/items/armor/cloth/sunsilk/foot.ron index 3306659839..87139a1b2c 100644 --- a/assets/common/items/armor/cloth/sunsilk/foot.ron +++ b/assets/common/items/armor/cloth/sunsilk/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/hand.ron b/assets/common/items/armor/cloth/sunsilk/hand.ron index 6cc48fe2b5..f73c8a393c 100644 --- a/assets/common/items/armor/cloth/sunsilk/hand.ron +++ b/assets/common/items/armor/cloth/sunsilk/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/pants.ron b/assets/common/items/armor/cloth/sunsilk/pants.ron index 9db8043dd5..54471c36c3 100644 --- a/assets/common/items/armor/cloth/sunsilk/pants.ron +++ b/assets/common/items/armor/cloth/sunsilk/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/sunsilk/shoulder.ron b/assets/common/items/armor/cloth/sunsilk/shoulder.ron index 25b755897c..451fbe2df7 100644 --- a/assets/common/items/armor/cloth/sunsilk/shoulder.ron +++ b/assets/common/items/armor/cloth/sunsilk/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/back.ron b/assets/common/items/armor/cloth/woolen/back.ron index 8985d836ce..faba1b434d 100644 --- a/assets/common/items/armor/cloth/woolen/back.ron +++ b/assets/common/items/armor/cloth/woolen/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/belt.ron b/assets/common/items/armor/cloth/woolen/belt.ron index 04b3d31720..8b75f8266c 100644 --- a/assets/common/items/armor/cloth/woolen/belt.ron +++ b/assets/common/items/armor/cloth/woolen/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/chest.ron b/assets/common/items/armor/cloth/woolen/chest.ron index 30361e76c0..fb06b7c7d6 100644 --- a/assets/common/items/armor/cloth/woolen/chest.ron +++ b/assets/common/items/armor/cloth/woolen/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/foot.ron b/assets/common/items/armor/cloth/woolen/foot.ron index d780d89cbc..cae1752460 100644 --- a/assets/common/items/armor/cloth/woolen/foot.ron +++ b/assets/common/items/armor/cloth/woolen/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/hand.ron b/assets/common/items/armor/cloth/woolen/hand.ron index 907967074a..24db6c74fb 100644 --- a/assets/common/items/armor/cloth/woolen/hand.ron +++ b/assets/common/items/armor/cloth/woolen/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/pants.ron b/assets/common/items/armor/cloth/woolen/pants.ron index 2ef42f2354..b4df72e78b 100644 --- a/assets/common/items/armor/cloth/woolen/pants.ron +++ b/assets/common/items/armor/cloth/woolen/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/woolen/shoulder.ron b/assets/common/items/armor/cloth/woolen/shoulder.ron index 6840aed14b..6925858baf 100644 --- a/assets/common/items/armor/cloth/woolen/shoulder.ron +++ b/assets/common/items/armor/cloth/woolen/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Light)), MaterialKind((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron index 99216e032d..a3e7cfbe38 100644 --- a/assets/common/items/armor/hide/carapace/back.ron +++ b/assets/common/items/armor/hide/carapace/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron index 5f21f3ad80..b81a439981 100644 --- a/assets/common/items/armor/hide/carapace/belt.ron +++ b/assets/common/items/armor/hide/carapace/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron index 0694bd571f..51cb442a82 100644 --- a/assets/common/items/armor/hide/carapace/chest.ron +++ b/assets/common/items/armor/hide/carapace/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron index 2cf62f99d0..0d08c4dcbb 100644 --- a/assets/common/items/armor/hide/carapace/foot.ron +++ b/assets/common/items/armor/hide/carapace/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron index 79cee9f3ae..652a64978e 100644 --- a/assets/common/items/armor/hide/carapace/hand.ron +++ b/assets/common/items/armor/hide/carapace/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron index 2f6f1a8202..d0f3086b57 100644 --- a/assets/common/items/armor/hide/carapace/pants.ron +++ b/assets/common/items/armor/hide/carapace/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron index 91927ad965..4bb4e896eb 100644 --- a/assets/common/items/armor/hide/carapace/shoulder.ron +++ b/assets/common/items/armor/hide/carapace/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron index ea2f3de11b..5ebf591a8b 100644 --- a/assets/common/items/armor/hide/dragonscale/back.ron +++ b/assets/common/items/armor/hide/dragonscale/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron index 473583bb9d..6855ac48ed 100644 --- a/assets/common/items/armor/hide/dragonscale/belt.ron +++ b/assets/common/items/armor/hide/dragonscale/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron index 54eb29edc4..4939d44526 100644 --- a/assets/common/items/armor/hide/dragonscale/chest.ron +++ b/assets/common/items/armor/hide/dragonscale/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron index 20745fabce..200d7a0781 100644 --- a/assets/common/items/armor/hide/dragonscale/foot.ron +++ b/assets/common/items/armor/hide/dragonscale/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron index d38d56f355..d08da96c0e 100644 --- a/assets/common/items/armor/hide/dragonscale/hand.ron +++ b/assets/common/items/armor/hide/dragonscale/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron index 63a160a3a2..d9211c0f47 100644 --- a/assets/common/items/armor/hide/dragonscale/pants.ron +++ b/assets/common/items/armor/hide/dragonscale/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron index 1934d56c32..47b94d2c2d 100644 --- a/assets/common/items/armor/hide/dragonscale/shoulder.ron +++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/back.ron b/assets/common/items/armor/hide/leather/back.ron index cddd5273ac..3361d0663d 100644 --- a/assets/common/items/armor/hide/leather/back.ron +++ b/assets/common/items/armor/hide/leather/back.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/belt.ron b/assets/common/items/armor/hide/leather/belt.ron index b9d378328d..3926a85707 100644 --- a/assets/common/items/armor/hide/leather/belt.ron +++ b/assets/common/items/armor/hide/leather/belt.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/chest.ron b/assets/common/items/armor/hide/leather/chest.ron index d280630755..42c020bbf4 100644 --- a/assets/common/items/armor/hide/leather/chest.ron +++ b/assets/common/items/armor/hide/leather/chest.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/foot.ron b/assets/common/items/armor/hide/leather/foot.ron index 5bb28e9929..fe02271730 100644 --- a/assets/common/items/armor/hide/leather/foot.ron +++ b/assets/common/items/armor/hide/leather/foot.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/hand.ron b/assets/common/items/armor/hide/leather/hand.ron index e53d6b7a17..c279ddbeb0 100644 --- a/assets/common/items/armor/hide/leather/hand.ron +++ b/assets/common/items/armor/hide/leather/hand.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/head.ron b/assets/common/items/armor/hide/leather/head.ron index 581d6ac9c8..66c4fcc922 100644 --- a/assets/common/items/armor/hide/leather/head.ron +++ b/assets/common/items/armor/hide/leather/head.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/pants.ron b/assets/common/items/armor/hide/leather/pants.ron index c1a04a85b4..7d4705eaf1 100644 --- a/assets/common/items/armor/hide/leather/pants.ron +++ b/assets/common/items/armor/hide/leather/pants.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/leather/shoulder.ron b/assets/common/items/armor/hide/leather/shoulder.ron index f7a88958f9..8e730784d5 100644 --- a/assets/common/items/armor/hide/leather/shoulder.ron +++ b/assets/common/items/armor/hide/leather/shoulder.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Leather)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/back.ron b/assets/common/items/armor/hide/primal/back.ron index 5b05a5b193..76f0a4caed 100644 --- a/assets/common/items/armor/hide/primal/back.ron +++ b/assets/common/items/armor/hide/primal/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/belt.ron b/assets/common/items/armor/hide/primal/belt.ron index 5a82618751..a77e8ca380 100644 --- a/assets/common/items/armor/hide/primal/belt.ron +++ b/assets/common/items/armor/hide/primal/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/chest.ron b/assets/common/items/armor/hide/primal/chest.ron index 9c94dab1b1..330af25ca2 100644 --- a/assets/common/items/armor/hide/primal/chest.ron +++ b/assets/common/items/armor/hide/primal/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/foot.ron b/assets/common/items/armor/hide/primal/foot.ron index b5936453ef..c864b2ceb2 100644 --- a/assets/common/items/armor/hide/primal/foot.ron +++ b/assets/common/items/armor/hide/primal/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/hand.ron b/assets/common/items/armor/hide/primal/hand.ron index d2736de1f4..ad54d7b296 100644 --- a/assets/common/items/armor/hide/primal/hand.ron +++ b/assets/common/items/armor/hide/primal/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/pants.ron b/assets/common/items/armor/hide/primal/pants.ron index b1ae3517cb..00b766f0c8 100644 --- a/assets/common/items/armor/hide/primal/pants.ron +++ b/assets/common/items/armor/hide/primal/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/primal/shoulder.ron b/assets/common/items/armor/hide/primal/shoulder.ron index 531de36e6e..ed0e58c760 100644 --- a/assets/common/items/armor/hide/primal/shoulder.ron +++ b/assets/common/items/armor/hide/primal/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/back.ron b/assets/common/items/armor/hide/rawhide/back.ron index e2db00c6ae..5daf2911b5 100644 --- a/assets/common/items/armor/hide/rawhide/back.ron +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Common, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron index 9a983d6139..729893f9b0 100644 --- a/assets/common/items/armor/hide/rawhide/belt.ron +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron index cd6203f08b..7ea99c38b8 100644 --- a/assets/common/items/armor/hide/rawhide/chest.ron +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron index 295b793e2b..a2e3b8e0dc 100644 --- a/assets/common/items/armor/hide/rawhide/foot.ron +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron index 96cf8c56bf..adaaeb4724 100644 --- a/assets/common/items/armor/hide/rawhide/hand.ron +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron index 61af509046..78def9bb74 100644 --- a/assets/common/items/armor/hide/rawhide/pants.ron +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/rawhide/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron index 708f2d72f5..0c063cdf63 100644 --- a/assets/common/items/armor/hide/rawhide/shoulder.ron +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -14,6 +14,6 @@ ItemDef( )), quality: Moderate, tags: [ - LeatherItem, + ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) ], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron index 029ef2f406..26591850f1 100644 --- a/assets/common/items/armor/hide/scale/back.ron +++ b/assets/common/items/armor/hide/scale/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron index c586046ad8..5faee2dafa 100644 --- a/assets/common/items/armor/hide/scale/belt.ron +++ b/assets/common/items/armor/hide/scale/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron index f5b9dc6e6d..0fb0c15c90 100644 --- a/assets/common/items/armor/hide/scale/chest.ron +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron index 3f37fa42a0..0c91b942d3 100644 --- a/assets/common/items/armor/hide/scale/foot.ron +++ b/assets/common/items/armor/hide/scale/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron index ae4822b6aa..a3bab05491 100644 --- a/assets/common/items/armor/hide/scale/hand.ron +++ b/assets/common/items/armor/hide/scale/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron index 034d306010..ce2363252a 100644 --- a/assets/common/items/armor/hide/scale/pants.ron +++ b/assets/common/items/armor/hide/scale/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/hide/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron index ac7b6848c0..0d9d9a57dc 100644 --- a/assets/common/items/armor/hide/scale/shoulder.ron +++ b/assets/common/items/armor/hide/scale/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/back.ron b/assets/common/items/armor/mail/bloodsteel/back.ron index a564390937..6290c58103 100644 --- a/assets/common/items/armor/mail/bloodsteel/back.ron +++ b/assets/common/items/armor/mail/bloodsteel/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/belt.ron b/assets/common/items/armor/mail/bloodsteel/belt.ron index 603400a65a..98cf20ea15 100644 --- a/assets/common/items/armor/mail/bloodsteel/belt.ron +++ b/assets/common/items/armor/mail/bloodsteel/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/chest.ron b/assets/common/items/armor/mail/bloodsteel/chest.ron index 974455ce8e..a251ad3293 100644 --- a/assets/common/items/armor/mail/bloodsteel/chest.ron +++ b/assets/common/items/armor/mail/bloodsteel/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/foot.ron b/assets/common/items/armor/mail/bloodsteel/foot.ron index d792fa8294..ee2dd21715 100644 --- a/assets/common/items/armor/mail/bloodsteel/foot.ron +++ b/assets/common/items/armor/mail/bloodsteel/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/hand.ron b/assets/common/items/armor/mail/bloodsteel/hand.ron index 132ff31c3e..1379a01d15 100644 --- a/assets/common/items/armor/mail/bloodsteel/hand.ron +++ b/assets/common/items/armor/mail/bloodsteel/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/pants.ron b/assets/common/items/armor/mail/bloodsteel/pants.ron index 6dcee68bbd..1dcacb10f2 100644 --- a/assets/common/items/armor/mail/bloodsteel/pants.ron +++ b/assets/common/items/armor/mail/bloodsteel/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bloodsteel/shoulder.ron b/assets/common/items/armor/mail/bloodsteel/shoulder.ron index ee2d620a8f..a12edd98ad 100644 --- a/assets/common/items/armor/mail/bloodsteel/shoulder.ron +++ b/assets/common/items/armor/mail/bloodsteel/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/back.ron b/assets/common/items/armor/mail/bronze/back.ron index 7ec1c70435..6e5e599170 100644 --- a/assets/common/items/armor/mail/bronze/back.ron +++ b/assets/common/items/armor/mail/bronze/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/belt.ron b/assets/common/items/armor/mail/bronze/belt.ron index f974e53cbe..194e2c831b 100644 --- a/assets/common/items/armor/mail/bronze/belt.ron +++ b/assets/common/items/armor/mail/bronze/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/chest.ron b/assets/common/items/armor/mail/bronze/chest.ron index d5ecc984e4..27f3da1e46 100644 --- a/assets/common/items/armor/mail/bronze/chest.ron +++ b/assets/common/items/armor/mail/bronze/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/foot.ron b/assets/common/items/armor/mail/bronze/foot.ron index e37f6b1a9d..1221d0bb52 100644 --- a/assets/common/items/armor/mail/bronze/foot.ron +++ b/assets/common/items/armor/mail/bronze/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/hand.ron b/assets/common/items/armor/mail/bronze/hand.ron index e7a41f541c..ebe111ffc6 100644 --- a/assets/common/items/armor/mail/bronze/hand.ron +++ b/assets/common/items/armor/mail/bronze/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/pants.ron b/assets/common/items/armor/mail/bronze/pants.ron index a1b16ad50b..0524f79090 100644 --- a/assets/common/items/armor/mail/bronze/pants.ron +++ b/assets/common/items/armor/mail/bronze/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/bronze/shoulder.ron b/assets/common/items/armor/mail/bronze/shoulder.ron index a45f4d7d8a..af3757d13d 100644 --- a/assets/common/items/armor/mail/bronze/shoulder.ron +++ b/assets/common/items/armor/mail/bronze/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/back.ron b/assets/common/items/armor/mail/cobalt/back.ron index da957a195f..c015fd9090 100644 --- a/assets/common/items/armor/mail/cobalt/back.ron +++ b/assets/common/items/armor/mail/cobalt/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/belt.ron b/assets/common/items/armor/mail/cobalt/belt.ron index d424968f54..626bdecd87 100644 --- a/assets/common/items/armor/mail/cobalt/belt.ron +++ b/assets/common/items/armor/mail/cobalt/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/chest.ron b/assets/common/items/armor/mail/cobalt/chest.ron index 8760fcbccc..b9150273b4 100644 --- a/assets/common/items/armor/mail/cobalt/chest.ron +++ b/assets/common/items/armor/mail/cobalt/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/foot.ron b/assets/common/items/armor/mail/cobalt/foot.ron index b3ec64027e..3dc9e4167a 100644 --- a/assets/common/items/armor/mail/cobalt/foot.ron +++ b/assets/common/items/armor/mail/cobalt/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/hand.ron b/assets/common/items/armor/mail/cobalt/hand.ron index 8995ea7ed8..9a43d4c4fb 100644 --- a/assets/common/items/armor/mail/cobalt/hand.ron +++ b/assets/common/items/armor/mail/cobalt/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/pants.ron b/assets/common/items/armor/mail/cobalt/pants.ron index 0a9b3464b3..3cf4bfe627 100644 --- a/assets/common/items/armor/mail/cobalt/pants.ron +++ b/assets/common/items/armor/mail/cobalt/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/cobalt/shoulder.ron b/assets/common/items/armor/mail/cobalt/shoulder.ron index e667149787..74c737fa00 100644 --- a/assets/common/items/armor/mail/cobalt/shoulder.ron +++ b/assets/common/items/armor/mail/cobalt/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/back.ron b/assets/common/items/armor/mail/iron/back.ron index ca9e57b756..8745d43e6f 100644 --- a/assets/common/items/armor/mail/iron/back.ron +++ b/assets/common/items/armor/mail/iron/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/belt.ron b/assets/common/items/armor/mail/iron/belt.ron index b3a9c528d1..9a90555826 100644 --- a/assets/common/items/armor/mail/iron/belt.ron +++ b/assets/common/items/armor/mail/iron/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/chest.ron b/assets/common/items/armor/mail/iron/chest.ron index f6e428ef91..16f1be614a 100644 --- a/assets/common/items/armor/mail/iron/chest.ron +++ b/assets/common/items/armor/mail/iron/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/foot.ron b/assets/common/items/armor/mail/iron/foot.ron index 2752ac82c8..dbc22267b2 100644 --- a/assets/common/items/armor/mail/iron/foot.ron +++ b/assets/common/items/armor/mail/iron/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/hand.ron b/assets/common/items/armor/mail/iron/hand.ron index ea92698de7..ab80b8771b 100644 --- a/assets/common/items/armor/mail/iron/hand.ron +++ b/assets/common/items/armor/mail/iron/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/pants.ron b/assets/common/items/armor/mail/iron/pants.ron index 33a2babc5f..5837e9ded8 100644 --- a/assets/common/items/armor/mail/iron/pants.ron +++ b/assets/common/items/armor/mail/iron/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/iron/shoulder.ron b/assets/common/items/armor/mail/iron/shoulder.ron index a491ad7865..fcbbca6fba 100644 --- a/assets/common/items/armor/mail/iron/shoulder.ron +++ b/assets/common/items/armor/mail/iron/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron index 79816846b0..606bbbc9e4 100644 --- a/assets/common/items/armor/mail/orichalcum/back.ron +++ b/assets/common/items/armor/mail/orichalcum/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron index 59412f31ca..fd40f5dbb8 100644 --- a/assets/common/items/armor/mail/orichalcum/belt.ron +++ b/assets/common/items/armor/mail/orichalcum/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron index 0bd845676d..e1fca22845 100644 --- a/assets/common/items/armor/mail/orichalcum/chest.ron +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron index 127c9ba3e8..ac0c582abf 100644 --- a/assets/common/items/armor/mail/orichalcum/foot.ron +++ b/assets/common/items/armor/mail/orichalcum/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron index d7d6f575c4..c1bcd55ecb 100644 --- a/assets/common/items/armor/mail/orichalcum/hand.ron +++ b/assets/common/items/armor/mail/orichalcum/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron index 4a19438cce..62e4c25a31 100644 --- a/assets/common/items/armor/mail/orichalcum/pants.ron +++ b/assets/common/items/armor/mail/orichalcum/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron index 2ec3e7eacf..c6114466e3 100644 --- a/assets/common/items/armor/mail/orichalcum/shoulder.ron +++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/back.ron b/assets/common/items/armor/mail/steel/back.ron index 195b4c770b..0b1ac22535 100644 --- a/assets/common/items/armor/mail/steel/back.ron +++ b/assets/common/items/armor/mail/steel/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/belt.ron b/assets/common/items/armor/mail/steel/belt.ron index 42eccca608..378a530508 100644 --- a/assets/common/items/armor/mail/steel/belt.ron +++ b/assets/common/items/armor/mail/steel/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/chest.ron b/assets/common/items/armor/mail/steel/chest.ron index 59e46425e1..64966232bf 100644 --- a/assets/common/items/armor/mail/steel/chest.ron +++ b/assets/common/items/armor/mail/steel/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/foot.ron b/assets/common/items/armor/mail/steel/foot.ron index aff11bd96c..c745820956 100644 --- a/assets/common/items/armor/mail/steel/foot.ron +++ b/assets/common/items/armor/mail/steel/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/hand.ron b/assets/common/items/armor/mail/steel/hand.ron index c094d65116..e2d2cd2a92 100644 --- a/assets/common/items/armor/mail/steel/hand.ron +++ b/assets/common/items/armor/mail/steel/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/pants.ron b/assets/common/items/armor/mail/steel/pants.ron index 026cec08b1..d8f40b0af2 100644 --- a/assets/common/items/armor/mail/steel/pants.ron +++ b/assets/common/items/armor/mail/steel/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/mail/steel/shoulder.ron b/assets/common/items/armor/mail/steel/shoulder.ron index 9178ca88ff..295034960d 100644 --- a/assets/common/items/armor/mail/steel/shoulder.ron +++ b/assets/common/items/armor/mail/steel/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index dfc7352bf1..75f61b8f0e 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -202,14 +202,14 @@ output: ("common.items.mineral.ingot.gold", 1), inputs: [ (Item("common.items.mineral.ore.gold"), 1), - ], + ], craft_sprite: Some(Forge), ), "silver ingot": ( output: ("common.items.mineral.ingot.silver", 1), inputs: [ (Item("common.items.mineral.ore.silver"), 1), - ], + ], craft_sprite: Some(Forge), ), @@ -217,21 +217,21 @@ output: ("common.items.mineral.ingot.iron", 1), inputs: [ (Item("common.items.mineral.ore.iron"), 1), - ], + ], craft_sprite: Some(Forge), ), "cobalt ingot": ( output: ("common.items.mineral.ingot.cobalt", 1), inputs: [ (Item("common.items.mineral.ore.cobalt"), 1), - ], + ], craft_sprite: Some(Forge), ), "tin ingot": ( output: ("common.items.mineral.ingot.tin", 2), inputs: [ (Item("common.items.mineral.ore.tin"), 1), - ], + ], craft_sprite: Some(Forge), ), "orichalcum ingot": ( @@ -239,31 +239,31 @@ inputs: [ (Item("common.items.mineral.ore.gold"), 1), (Item("common.items.mineral.ore.silver"), 1), - ], + ], craft_sprite: Some(Forge), ), "copper ingot": ( output: ("common.items.mineral.ingot.copper", 2), inputs: [ (Item("common.items.mineral.ore.copper"), 1), - ], + ], craft_sprite: Some(Forge), ), "bloodsteel ingot": ( output: ("common.items.mineral.ingot.bloodsteel", 2), inputs: [ (Item("common.items.mineral.ore.bloodstone"), 1), - (Item("common.items.mineral.ore.iron"), 1), - (Item("common.items.mineral.ore.coal"), 1), - ], + (Item("common.items.mineral.ore.iron"), 1), + (Item("common.items.mineral.ore.coal"), 1), + ], craft_sprite: Some(Forge), ), "steel ingot": ( output: ("common.items.mineral.ingot.steel", 1), inputs: [ - (Item("common.items.mineral.ore.iron"), 1), - (Item("common.items.mineral.ore.coal"), 1), - ], + (Item("common.items.mineral.ore.iron"), 1), + (Item("common.items.mineral.ore.coal"), 1), + ], craft_sprite: Some(Forge), ), "bronze ingot": ( @@ -271,50 +271,55 @@ inputs: [ (Item("common.items.mineral.ore.copper"), 1), (Item("common.items.mineral.ore.tin"), 1), - ], + ], craft_sprite: Some(Forge), ), "cotton": ( output: ("common.items.crafting_ing.cloth.cotton", 1), inputs: [ (Item("common.items.crafting_ing.cotton_boll"), 1), - ], + ], craft_sprite: Some(SpinningWheel), ), "linen": ( output: ("common.items.crafting_ing.cloth.linen", 1), inputs: [ (Item("common.items.flowers.wild_flax"), 1), - ], + ], craft_sprite: Some(SpinningWheel), ), "silk": ( output: ("common.items.crafting_ing.cloth.silk", 1), inputs: [ (Item("common.items.crafting_ing.sticky_thread"), 1), - ], + ], craft_sprite: Some(SpinningWheel), ), "lifecloth": ( output: ("common.items.crafting_ing.cloth.lifecloth", 1), inputs: [ +<<<<<<< HEAD (Item("common.items.crafting_ing.animal_misc.lively_vine"), 1), (Item("common.items.crafting_ing.cloth.cotton"), 1), ], +======= + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + ], +>>>>>>> Add material and armor class tags craft_sprite: Some(SpinningWheel), ), "moonweave": ( output: ("common.items.crafting_ing.cloth.moonweave", 1), inputs: [ (Item("common.items.flowers.moonbell"), 1), - ], + ], craft_sprite: Some(SpinningWheel), ), "sunsilk": ( output: ("common.items.crafting_ing.cloth.sunsilk", 1), inputs: [ (Item("common.items.flowers.pyrebloom"), 1), - ], + ], craft_sprite: Some(SpinningWheel), ), "salad_plain": ( @@ -322,7 +327,7 @@ inputs: [ (Item("common.items.food.lettuce"), 1), (Item("common.items.crafting_ing.bowl"), 1), - ], + ], ), "salad_tomato": ( output: ("common.items.food.tomatosalad", 1), @@ -1522,7 +1527,7 @@ (Item("common.items.mineral.ingot.orichalcum"), 3), (Item("common.items.crafting_ing.hide.plate"), 3), (Item("common.items.mineral.gem.diamond"), 2), - (Item("common.items.mineral.gem.sapphire"), 1), + (Item("common.items.mineral.gem.sapphire"), 1), ], craft_sprite: Some(CraftingBench), ), @@ -1532,7 +1537,7 @@ (Item("common.items.mineral.ingot.orichalcum"), 2), (Item("common.items.crafting_ing.hide.plate"), 2), (Item("common.items.mineral.gem.diamond"), 2), - (Item("common.items.mineral.gem.sapphire"), 1), + (Item("common.items.mineral.gem.sapphire"), 1), ], craft_sprite: Some(CraftingBench), ), @@ -1553,7 +1558,7 @@ (Item("common.items.mineral.ingot.orichalcum"), 3), (Item("common.items.crafting_ing.hide.plate"), 2), (Item("common.items.mineral.gem.diamond"), 1), - (Item("common.items.mineral.gem.sapphire"), 1), + (Item("common.items.mineral.gem.sapphire"), 1), ], craft_sprite: Some(CraftingBench), ), @@ -1563,7 +1568,7 @@ (Item("common.items.mineral.ingot.orichalcum"), 3), (Item("common.items.crafting_ing.hide.plate"), 2), (Item("common.items.mineral.gem.diamond"), 1), - (Item("common.items.mineral.gem.sapphire"), 1), + (Item("common.items.mineral.gem.sapphire"), 1), ], craft_sprite: Some(CraftingBench), ), @@ -1582,7 +1587,7 @@ inputs: [ (Item("common.items.mineral.ingot.orichalcum"), 8), (Item("common.items.crafting_ing.hide.plate"), 4), - (Item("common.items.mineral.gem.sapphire"), 2), + (Item("common.items.mineral.gem.sapphire"), 2), ], craft_sprite: Some(CraftingBench), ), diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron index ef01237b8c..54a4a99361 100644 --- a/assets/voxygen/i18n/en/common.ron +++ b/assets/voxygen/i18n/en/common.ron @@ -37,7 +37,7 @@ "common.automatic": "Auto", "common.random": "Random", "common.empty": "Empty", - + // Settings Window title "common.interface_settings": "Interface Settings", "common.gameplay_settings": "Gameplay Settings", @@ -100,6 +100,10 @@ Is the client up to date?"#, "common.stats.armor": "Armor", "common.stats.poise_res":"Stun Res", "common.stats.slots": "Slots", + + "common.armor.light": "Light", + "common.armor.medium": "Medium", + "common.armor.heavy": "Heavy", }, diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index d115a59adf..031c6be6d4 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -1,3 +1,4 @@ +use super::TagExampleInfo; use serde::{Deserialize, Serialize}; use std::{cmp::Ordering, ops::Sub}; @@ -17,6 +18,40 @@ pub enum ArmorKind { Bag(String), } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum ArmorClass { + Light, + Medium, + Heavy, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub struct ArmorClassTag { + class: ArmorClass, +} + +impl TagExampleInfo for ArmorClassTag { + fn name(&self) -> &'static str { + match self.class { + ArmorClass::Light => "light armor", + ArmorClass::Medium => "medium armor", + ArmorClass::Heavy => "heavy armor", + } + } + + fn exemplar_identifier(&self) -> &'static str { + match self.class { + ArmorClass::Light => "common.items.tag_examples.armor.light", + ArmorClass::Medium => "common.items.tag_examples.armor.medium", + ArmorClass::Heavy => "common.items.tag_examples.armor.heavy", + } + } +} + +impl ArmorClassTag { + pub fn class(&self) -> &ArmorClass { &self.class } +} + impl Armor { /// Determines whether two pieces of armour are superficially equivalent to /// one another (i.e: one may be substituted for the other in crafting diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 978092369a..cbb61b12ee 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -91,13 +91,126 @@ pub trait TagExampleInfo { fn exemplar_identifier(&self) -> &'static str; } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum MaterialKind { + Bronze, + Iron, + Steel, + Cobalt, + Bloodsteel, + Orichalcum, + Wood, + Bamboo, + Hardwood, + Ironwood, + Frostwood, + Eldwood, + Rock, + Granite, + Bone, + Basalt, + Obsidian, + Velorite, + Linen, + Wool, + Silk, + Lifecloth, + Moonweave, + Sunsilk, + Rawhide, + Leather, + Scale, + Carapace, + Plate, + Dragonscale, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub struct MaterialKindTag { + material: MaterialKind, +} + +impl TagExampleInfo for MaterialKindTag { + fn name(&self) -> &'static str { + match self.material { + MaterialKind::Bronze => "bronze", + MaterialKind::Iron => "iron", + MaterialKind::Steel => "steel", + MaterialKind::Cobalt => "cobalt", + MaterialKind::Bloodsteel => "bloodsteel", + MaterialKind::Orichalcum => "orichalcum", + MaterialKind::Wood => "wood", + MaterialKind::Bamboo => "bamboo", + MaterialKind::Hardwood => "hardwood", + MaterialKind::Ironwood => "ironwood", + MaterialKind::Frostwood => "frostwood", + MaterialKind::Eldwood => "eldwood", + MaterialKind::Rock => "rock", + MaterialKind::Granite => "granite", + MaterialKind::Bone => "bone", + MaterialKind::Basalt => "basalt", + MaterialKind::Obsidian => "obsidian", + MaterialKind::Velorite => "velorite", + MaterialKind::Linen => "linen", + MaterialKind::Wool => "wood", + MaterialKind::Silk => "silk", + MaterialKind::Lifecloth => "lifecloth", + MaterialKind::Moonweave => "moonweave", + MaterialKind::Sunsilk => "sunsilk", + MaterialKind::Rawhide => "rawhide", + MaterialKind::Leather => "leather", + MaterialKind::Scale => "scale", + MaterialKind::Carapace => "carapace", + MaterialKind::Plate => "plate", + MaterialKind::Dragonscale => "dragonscale", + } + } + + fn exemplar_identifier(&self) -> &'static str { + match self.material { + MaterialKind::Bronze => "common.items.tag_examples.material.bronze", + MaterialKind::Iron => "common.items.tag_examples.material.iron", + MaterialKind::Steel => "common.items.tag_examples.material.steel", + MaterialKind::Cobalt => "common.items.tag_examples.material.cobalt", + MaterialKind::Bloodsteel => "common.items.tag_examples.material.bloodsteel", + MaterialKind::Orichalcum => "common.items.tag_examples.material.orichalcum", + MaterialKind::Wood => "common.items.tag_examples.material.wood", + MaterialKind::Bamboo => "common.items.tag_examples.material.bamboo", + MaterialKind::Hardwood => "common.items.tag_examples.material.hardwood", + MaterialKind::Ironwood => "common.items.tag_examples.material.ironwood", + MaterialKind::Frostwood => "common.items.tag_examples.material.frostwood", + MaterialKind::Eldwood => "common.items.tag_examples.material.eldwood", + MaterialKind::Rock => "common.items.tag_examples.material.rock", + MaterialKind::Granite => "common.items.tag_examples.material.granite", + MaterialKind::Bone => "common.items.tag_examples.material.bone", + MaterialKind::Basalt => "common.items.tag_examples.material.basalt", + MaterialKind::Obsidian => "common.items.tag_examples.material.obsidian", + MaterialKind::Velorite => "common.items.tag_examples.material.velorite", + MaterialKind::Linen => "common.items.tag_examples.material.linen", + MaterialKind::Wool => "common.items.tag_examples.material.wool", + MaterialKind::Silk => "common.items.tag_examples.material.silk", + MaterialKind::Lifecloth => "common.items.tag_examples.material.lifecloth", + MaterialKind::Moonweave => "common.items.tag_examples.material.moonweave", + MaterialKind::Sunsilk => "common.items.tag_examples.material.sunsilk", + MaterialKind::Rawhide => "common.items.tag_examples.material.rawhide", + MaterialKind::Leather => "common.items.tag_examples.material.leather", + MaterialKind::Scale => "common.items.tag_examples.material.scale", + MaterialKind::Carapace => "common.items.tag_examples.material.carapace", + MaterialKind::Plate => "common.items.tag_examples.material.plate", + MaterialKind::Dragonscale => "common.items.tag_examples.material.dragonscale", + } + } +} + #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub enum ItemTag { ClothItem, LeatherItem, - ModularComponent(ModularComponentTag), MetalIngot, Textile, + MaterialKind(MaterialKindTag), + ArmorClass(armor::ArmorClassTag), + ModularComponent(ModularComponentTag), Cultist, Potion, Food, @@ -110,8 +223,8 @@ pub enum ItemTag { impl TagExampleInfo for ItemTag { fn name(&self) -> &'static str { match self { - ItemTag::ClothItem => "cloth item", - ItemTag::LeatherItem => "leather item", + ItemTag::MaterialKind(material) => material.name(), + ItemTag::ArmorClass(class) => class.name(), ItemTag::ModularComponent(kind) => kind.name(), ItemTag::MetalIngot => "metal ingot", ItemTag::Textile => "textile", @@ -128,8 +241,8 @@ impl TagExampleInfo for ItemTag { // TODO: Autogenerate these? fn exemplar_identifier(&self) -> &'static str { match self { - ItemTag::ClothItem => "common.items.tag_examples.cloth_item", - ItemTag::LeatherItem => "common.items.tag_examples.leather_item", + ItemTag::MaterialKind(material) => material.exemplar_identifier(), + ItemTag::ArmorClass(class) => class.exemplar_identifier(), ItemTag::ModularComponent(tag) => tag.exemplar_identifier(), ItemTag::MetalIngot => "common.items.tag_examples.metal_ingot", ItemTag::Textile => "common.items.tag_examples.textile", diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 9199993816..69a2749511 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -2,7 +2,7 @@ use common::{ comp::{ inventory::trade_pricing::TradePricing, item::{ - armor::{Armor, ArmorKind, Protection}, + armor::{Armor, ArmorClass, ArmorKind, Protection}, tool::{Hands, StatKind, Stats, Tool, ToolKind}, Item, ItemKind, MaterialStatManifest, ModularComponent, }, @@ -73,6 +73,14 @@ pub fn kind_text<'a>(kind: &ItemKind, i18n: &'a Localization) -> Cow<'a, str> { } } +pub fn armorclass_text<'a>(kind: &ArmorClass, i18n: &'a Localization) -> Cow<'a, str> { + match kind { + ArmorClass::Light { .. } => Cow::Borrowed(i18n.get("common.armor.light")), + ArmorClass::Medium { .. } => Cow::Borrowed(i18n.get("common.armor.medium")), + ArmorClass::Heavy { .. } => Cow::Borrowed(i18n.get("common.armor.heavy")), + } +} + // TODO: localization, refactor when mc are player facing pub fn modular_component_desc( mc: &ModularComponent, diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index 7d66c154d9..ba34282e31 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -13,7 +13,7 @@ use common::{ combat, comp::item::{ armor::{ArmorKind, Protection}, - Item, ItemDesc, ItemKind, MaterialStatManifest, Quality, + Item, ItemDesc, ItemKind, ItemTag, MaterialStatManifest, Quality, }, trade::SitePrices, }; @@ -463,7 +463,26 @@ impl<'a> Widget for ItemTooltip<'a> { let (title, desc) = (item.name().to_string(), item.description().to_string()); - let subtitle = util::kind_text(item.kind(), i18n); + let item_kind = util::kind_text(item.kind(), i18n).to_string(); + + let armor_class_tag = item + .tags() + .into_iter() + .filter_map(|t| match t { + ItemTag::ArmorClass(armor_class) => Some(armor_class), + _ => None, + }) + .next(); + + let subtitle = if let Some(class) = armor_class_tag { + format!( + "{} ({})", + item_kind, + util::armorclass_text(class.class(), i18n) + ) + } else { + item_kind + }; let text_color = conrod_core::color::WHITE;