diff --git a/assets/common/items/armor/assassin/belt.ron b/assets/common/items/armor/assassin/belt.ron index 994484f2ab..2b3713fe82 100644 --- a/assets/common/items/armor/assassin/belt.ron +++ b/assets/common/items/armor/assassin/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/chest.ron b/assets/common/items/armor/assassin/chest.ron index 13a3ec4d79..481eba17f3 100644 --- a/assets/common/items/armor/assassin/chest.ron +++ b/assets/common/items/armor/assassin/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/foot.ron b/assets/common/items/armor/assassin/foot.ron index 7fd0715910..80d84a983b 100644 --- a/assets/common/items/armor/assassin/foot.ron +++ b/assets/common/items/armor/assassin/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/hand.ron b/assets/common/items/armor/assassin/hand.ron index 7c4237aefe..85dc8059e6 100644 --- a/assets/common/items/armor/assassin/hand.ron +++ b/assets/common/items/armor/assassin/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/head.ron b/assets/common/items/armor/assassin/head.ron index 10079d7255..63dd6c1825 100644 --- a/assets/common/items/armor/assassin/head.ron +++ b/assets/common/items/armor/assassin/head.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/pants.ron b/assets/common/items/armor/assassin/pants.ron index 1396602801..7f917b67d2 100644 --- a/assets/common/items/armor/assassin/pants.ron +++ b/assets/common/items/armor/assassin/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/assassin/shoulder.ron b/assets/common/items/armor/assassin/shoulder.ron index 04a2f30f49..8c38a3af75 100644 --- a/assets/common/items/armor/assassin/shoulder.ron +++ b/assets/common/items/armor/assassin/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/belt.ron b/assets/common/items/armor/bonerattler/belt.ron index 497e3ec394..28cec303a0 100644 --- a/assets/common/items/armor/bonerattler/belt.ron +++ b/assets/common/items/armor/bonerattler/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/chest.ron b/assets/common/items/armor/bonerattler/chest.ron index a9dd2e1ab1..d90d9ef6e9 100644 --- a/assets/common/items/armor/bonerattler/chest.ron +++ b/assets/common/items/armor/bonerattler/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/foot.ron b/assets/common/items/armor/bonerattler/foot.ron index 48a715c596..8b19d74e60 100644 --- a/assets/common/items/armor/bonerattler/foot.ron +++ b/assets/common/items/armor/bonerattler/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/hand.ron b/assets/common/items/armor/bonerattler/hand.ron index ae59a06bf8..9da7d70342 100644 --- a/assets/common/items/armor/bonerattler/hand.ron +++ b/assets/common/items/armor/bonerattler/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/pants.ron b/assets/common/items/armor/bonerattler/pants.ron index a241e9810c..98e82be5ae 100644 --- a/assets/common/items/armor/bonerattler/pants.ron +++ b/assets/common/items/armor/bonerattler/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/bonerattler/shoulder.ron b/assets/common/items/armor/bonerattler/shoulder.ron index 339ec1a4c5..64ccdb21ee 100644 --- a/assets/common/items/armor/bonerattler/shoulder.ron +++ b/assets/common/items/armor/bonerattler/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth/druid/back.ron b/assets/common/items/armor/cloth/druid/back.ron index 3226a8bc91..10e6667992 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 6707b8d707..45779edffe 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 c7fad130a8..93545abcb7 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 2855baf16f..b30e2d8958 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 5df370508d..c14cf69cb7 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 60d74e2d49..42b1838d38 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 b299764399..371e12ac83 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: [ArmorClass((class: Light)), MaterialKind((material: Lifecloth))], + tags: [Material((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 62aeeea835..b02b8dcbe2 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 7ea684993d..dab71307fa 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 0ba91fb419..4f21625694 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 ad7d01de69..13a8fece56 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 40417af0a3..f2869c6e51 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 c7db20fa60..47f201fbe5 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 ff1b338a79..1c2bc1b778 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: [ArmorClass((class: Light)), MaterialKind((material: Linen))], + tags: [Material((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 1ec799c6e8..b8cf94d2f2 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 d7a52d5c4b..9038d67d42 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 3b38246f46..1f1306cc10 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 ee48ce0946..e0655e71dd 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 209a2a3f8b..939d9b4451 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 4132f557fe..0b1349aaf9 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 43a3c72b19..06202b6e7c 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: [ArmorClass((class: Light)), MaterialKind((material: Moonweave))], + tags: [Material((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 6221b34f40..f73a10a154 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 e26d4c8eac..0025ddd2dd 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 30c6b99e5a..7c30f4691f 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 be5a38c63b..0410b9da7d 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 b8913ed374..f16c4cc144 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 31463360ef..0f9f21e270 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 67108f1a48..d38ad6c519 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: [ArmorClass((class: Light)), MaterialKind((material: Silk))], + tags: [Material((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 2470665ecf..7b27bde61e 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 bdfe9e0086..6a13edddba 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 7e78ced23b..fa1738d77b 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 87139a1b2c..65252efd50 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 f73c8a393c..5864798a22 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 54471c36c3..b99bae0a56 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 451fbe2df7..430ab70600 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: [ArmorClass((class: Light)), MaterialKind((material: Sunsilk))], + tags: [Material((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 faba1b434d..d9fb76919f 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((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 8b75f8266c..1821d8adb2 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((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 fb06b7c7d6..0da92b3977 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((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 cae1752460..180fe984cb 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((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 24db6c74fb..15af65bbaf 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((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 b4df72e78b..fa44a4cfd6 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((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 6925858baf..2b93f0d478 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: [ArmorClass((class: Light)), MaterialKind((material: Wool))], + tags: [Material((material: Wool))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/belt.ron b/assets/common/items/armor/cloth_blue/belt.ron index 7b019bfa77..b3cedb988b 100644 --- a/assets/common/items/armor/cloth_blue/belt.ron +++ b/assets/common/items/armor/cloth_blue/belt.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/chest.ron b/assets/common/items/armor/cloth_blue/chest.ron index 0b27058238..2fa6aee3d2 100644 --- a/assets/common/items/armor/cloth_blue/chest.ron +++ b/assets/common/items/armor/cloth_blue/chest.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/foot.ron b/assets/common/items/armor/cloth_blue/foot.ron index b76197304d..3542ae8c07 100644 --- a/assets/common/items/armor/cloth_blue/foot.ron +++ b/assets/common/items/armor/cloth_blue/foot.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/hand.ron b/assets/common/items/armor/cloth_blue/hand.ron index ccdfb1259d..4c9ec9f1c7 100644 --- a/assets/common/items/armor/cloth_blue/hand.ron +++ b/assets/common/items/armor/cloth_blue/hand.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/pants.ron b/assets/common/items/armor/cloth_blue/pants.ron index b83425a93e..f370458903 100644 --- a/assets/common/items/armor/cloth_blue/pants.ron +++ b/assets/common/items/armor/cloth_blue/pants.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/shoulder_0.ron b/assets/common/items/armor/cloth_blue/shoulder_0.ron index dd09d2d276..b96e899d93 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_0.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_0.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_blue/shoulder_1.ron b/assets/common/items/armor/cloth_blue/shoulder_1.ron index 75c4223389..9d78267dc3 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_1.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/belt.ron b/assets/common/items/armor/cloth_green/belt.ron index aac6b02575..ae920f41bb 100644 --- a/assets/common/items/armor/cloth_green/belt.ron +++ b/assets/common/items/armor/cloth_green/belt.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/chest.ron b/assets/common/items/armor/cloth_green/chest.ron index f0ce68cee1..6a567cce33 100644 --- a/assets/common/items/armor/cloth_green/chest.ron +++ b/assets/common/items/armor/cloth_green/chest.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/foot.ron b/assets/common/items/armor/cloth_green/foot.ron index 0f6fe6f61a..f17f699cb1 100644 --- a/assets/common/items/armor/cloth_green/foot.ron +++ b/assets/common/items/armor/cloth_green/foot.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/hand.ron b/assets/common/items/armor/cloth_green/hand.ron index e4399ac2d6..6a4820d26b 100644 --- a/assets/common/items/armor/cloth_green/hand.ron +++ b/assets/common/items/armor/cloth_green/hand.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/pants.ron b/assets/common/items/armor/cloth_green/pants.ron index 9a1f774965..619de4bc29 100644 --- a/assets/common/items/armor/cloth_green/pants.ron +++ b/assets/common/items/armor/cloth_green/pants.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_green/shoulder.ron b/assets/common/items/armor/cloth_green/shoulder.ron index 0045611fb7..842fe9ea8d 100644 --- a/assets/common/items/armor/cloth_green/shoulder.ron +++ b/assets/common/items/armor/cloth_green/shoulder.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/belt.ron b/assets/common/items/armor/cloth_purple/belt.ron index adc6911131..514cc5bf3b 100644 --- a/assets/common/items/armor/cloth_purple/belt.ron +++ b/assets/common/items/armor/cloth_purple/belt.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/chest.ron b/assets/common/items/armor/cloth_purple/chest.ron index e48a934269..8697c3f791 100644 --- a/assets/common/items/armor/cloth_purple/chest.ron +++ b/assets/common/items/armor/cloth_purple/chest.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/foot.ron b/assets/common/items/armor/cloth_purple/foot.ron index 1e8ca8be0d..d41b482275 100644 --- a/assets/common/items/armor/cloth_purple/foot.ron +++ b/assets/common/items/armor/cloth_purple/foot.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/hand.ron b/assets/common/items/armor/cloth_purple/hand.ron index 60e3ee900f..6a69b8f4f2 100644 --- a/assets/common/items/armor/cloth_purple/hand.ron +++ b/assets/common/items/armor/cloth_purple/hand.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/pants.ron b/assets/common/items/armor/cloth_purple/pants.ron index b9a404b716..4b6833744e 100644 --- a/assets/common/items/armor/cloth_purple/pants.ron +++ b/assets/common/items/armor/cloth_purple/pants.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cloth_purple/shoulder.ron b/assets/common/items/armor/cloth_purple/shoulder.ron index 52c9422cf7..6b3ad08475 100644 --- a/assets/common/items/armor/cloth_purple/shoulder.ron +++ b/assets/common/items/armor/cloth_purple/shoulder.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/belt.ron b/assets/common/items/armor/cultist/belt.ron index 21aca413e3..d58a4022c4 100644 --- a/assets/common/items/armor/cultist/belt.ron +++ b/assets/common/items/armor/cultist/belt.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ - Cultist, - ], + tags: [Cultist], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index 2ba4dfa856..3934cefe0c 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ - Cultist, - ], + tags: [Cultist], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/foot.ron b/assets/common/items/armor/cultist/foot.ron index 811c179a13..fd3f13d0d7 100644 --- a/assets/common/items/armor/cultist/foot.ron +++ b/assets/common/items/armor/cultist/foot.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ - Cultist, - ], + tags: [Cultist], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/hand.ron b/assets/common/items/armor/cultist/hand.ron index fe0d6bee48..b6571cd395 100644 --- a/assets/common/items/armor/cultist/hand.ron +++ b/assets/common/items/armor/cultist/hand.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ - Cultist, - ], + tags: [Cultist], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index 72e5f9e76c..931927cc2f 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ - Cultist, - ], + tags: [Cultist], ) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index 869972c078..d4ae0de712 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ - Cultist, - ], + tags: [Cultist], ) \ No newline at end of file diff --git a/assets/common/items/armor/ferocious/back.ron b/assets/common/items/armor/ferocious/back.ron index e8261ed098..5d5a2a759d 100644 --- a/assets/common/items/armor/ferocious/back.ron +++ b/assets/common/items/armor/ferocious/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/ferocious/belt.ron b/assets/common/items/armor/ferocious/belt.ron index b77e1c7024..c2a83fcada 100644 --- a/assets/common/items/armor/ferocious/belt.ron +++ b/assets/common/items/armor/ferocious/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/ferocious/chest.ron b/assets/common/items/armor/ferocious/chest.ron index 3ef022ef12..66c37ae3c4 100644 --- a/assets/common/items/armor/ferocious/chest.ron +++ b/assets/common/items/armor/ferocious/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/ferocious/foot.ron b/assets/common/items/armor/ferocious/foot.ron index 7128a27fbb..b27377ae8e 100644 --- a/assets/common/items/armor/ferocious/foot.ron +++ b/assets/common/items/armor/ferocious/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/ferocious/hand.ron b/assets/common/items/armor/ferocious/hand.ron index e1ce45aa0b..b4cbb97f45 100644 --- a/assets/common/items/armor/ferocious/hand.ron +++ b/assets/common/items/armor/ferocious/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/ferocious/pants.ron b/assets/common/items/armor/ferocious/pants.ron index d8e5abfb6c..2a0c79fb96 100644 --- a/assets/common/items/armor/ferocious/pants.ron +++ b/assets/common/items/armor/ferocious/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/ferocious/shoulder.ron b/assets/common/items/armor/ferocious/shoulder.ron index 227565604e..05b7a3e17c 100644 --- a/assets/common/items/armor/ferocious/shoulder.ron +++ b/assets/common/items/armor/ferocious/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Epic, - tags: [ClothItem], + tags: [Material((material: Linen))], ) diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron index a3e7cfbe38..d7f4f912ff 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 b81a439981..7d30736d4f 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 51cb442a82..93cc29d483 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 0d08c4dcbb..62854a6a1c 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 652a64978e..e0709bc48f 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 d0f3086b57..350244f723 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 4bb4e896eb..b830dbb112 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: [ArmorClass((class: Medium)), MaterialKind((material: Carapace))], + tags: [Material((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 5ebf591a8b..649508d82a 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 6855ac48ed..d057665277 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 4939d44526..de512cdd6a 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 200d7a0781..c1f2a4cfb9 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 d08da96c0e..5b381a2dd0 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 d9211c0f47..abc9609167 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 47b94d2c2d..0db2d4659c 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: [ArmorClass((class: Medium)), MaterialKind((material: Dragonscale))], + tags: [Material((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 3361d0663d..5c916a7cf0 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 3926a85707..7555dfbcd6 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 42c020bbf4..2af3cf2487 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 fe02271730..10306add5e 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 c279ddbeb0..14bd199a2d 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 66c4fcc922..0b04aa78ff 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 7d4705eaf1..74e56d8ecf 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 8e730784d5..4dde26a910 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Leather)) + Material((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 76f0a4caed..56ccf19f99 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 a77e8ca380..01d796d229 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 330af25ca2..3972f805e0 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 c864b2ceb2..38252de91b 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 ad54d7b296..76c59654d0 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 00b766f0c8..2e7accc156 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 ed0e58c760..26e608f9b0 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: [ArmorClass((class: Medium)), MaterialKind((material: Plate))], + tags: [Material((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 5daf2911b5..86dc1ab55e 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 729893f9b0..bdd9445405 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 7ea99c38b8..25a1ae29f8 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 a2e3b8e0dc..b36d04d6bd 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 adaaeb4724..dbb4f31d74 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 78def9bb74..5a2c065833 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 0c063cdf63..f92ff1416d 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: [ - ArmorClass((class: Medium)), MaterialKind((material: Rawhide)) + Material((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 26591850f1..cd04237f66 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((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 5faee2dafa..8af3781526 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((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 0fb0c15c90..5413fe285f 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((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 0c91b942d3..b317f9ac66 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((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 a3bab05491..5061d6e764 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((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 ce2363252a..7e07c4a4d2 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((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 0d9d9a57dc..a28b41bc1a 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: [ArmorClass((class: Medium)), MaterialKind((material: Scale))], + tags: [Material((material: Scale))], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron index b0f9740870..d7e6fb5499 100644 --- a/assets/common/items/armor/leather_plate/belt.ron +++ b/assets/common/items/armor/leather_plate/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron index 7eb35dc8f7..cab5cdf834 100644 --- a/assets/common/items/armor/leather_plate/chest.ron +++ b/assets/common/items/armor/leather_plate/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron index c9bcb513e9..9d91c5a7b6 100644 --- a/assets/common/items/armor/leather_plate/foot.ron +++ b/assets/common/items/armor/leather_plate/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron index 8122098c6b..ded59cb161 100644 --- a/assets/common/items/armor/leather_plate/hand.ron +++ b/assets/common/items/armor/leather_plate/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron index 4bb37faccb..a46fbfeb86 100644 --- a/assets/common/items/armor/leather_plate/pants.ron +++ b/assets/common/items/armor/leather_plate/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron index 8e9b2e383a..ff07110137 100644 --- a/assets/common/items/armor/leather_plate/shoulder.ron +++ b/assets/common/items/armor/leather_plate/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ 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 6290c58103..54fbcad6e1 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 98cf20ea15..fb42bbc529 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 a251ad3293..7640b6d514 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 ee2dd21715..8db9e04dbf 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 1379a01d15..8690f77869 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 1dcacb10f2..8199793344 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 a12edd98ad..f4b809a2a4 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bloodsteel))], + tags: [Material((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 6e5e599170..09c00f8be4 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 194e2c831b..38a60e1760 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 27f3da1e46..e28f5cb88e 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 1221d0bb52..5fbe5490e5 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 ebe111ffc6..122e55484d 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 0524f79090..e1b1463b9c 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 af3757d13d..69031cb8e5 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: [ArmorClass((class: Heavy)), MaterialKind((material: Bronze))], + tags: [Material((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 c015fd9090..ee0da38074 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 626bdecd87..7de9f65adf 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 b9150273b4..9c52fd56e6 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 3dc9e4167a..911dbbd619 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 9a43d4c4fb..bd7dc41c3a 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 3cf4bfe627..bad1f26b11 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 74c737fa00..85ca77d6a0 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: [ArmorClass((class: Heavy)), MaterialKind((material: Cobalt))], + tags: [Material((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 8745d43e6f..d768a2d4fc 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 9a90555826..8d38884d81 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 16f1be614a..94dc1eac0c 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 dbc22267b2..9f0439e6c5 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 ab80b8771b..a36d7bb5e6 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 5837e9ded8..0a4b376f59 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 fcbbca6fba..aed17f19f5 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: [ArmorClass((class: Heavy)), MaterialKind((material: Iron))], + tags: [Material((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 606bbbc9e4..ab1a5bf567 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 fd40f5dbb8..316887a996 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 e1fca22845..48d121c37f 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 ac0c582abf..82126c58be 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 c1bcd55ecb..2379620d9c 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 62e4c25a31..95e7267e05 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 c6114466e3..d7b4134acd 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: [ArmorClass((class: Heavy)), MaterialKind((material: Orichalcum))], + tags: [Material((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 0b1ac22535..fea333a0bb 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((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 378a530508..f517fc1757 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((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 64966232bf..2cea8c47a3 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((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 c745820956..43add972ed 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((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 e2d2cd2a92..ef923775cc 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((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 d8f40b0af2..40572eefb0 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((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 295034960d..1534e9e852 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: [ArmorClass((class: Heavy)), MaterialKind((material: Steel))], + tags: [Material((material: Steel))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/back/backpack.ron b/assets/common/items/armor/misc/back/backpack.ron index 03317def3b..6471563f2d 100644 --- a/assets/common/items/armor/misc/back/backpack.ron +++ b/assets/common/items/armor/misc/back/backpack.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: High, - tags: [ - Bag, - ], + tags: [Bag], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/back/short_1.ron b/assets/common/items/armor/misc/back/short_1.ron index 5f71462655..2bda30b113 100644 --- a/assets/common/items/armor/misc/back/short_1.ron +++ b/assets/common/items/armor/misc/back/short_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_green_0.ron b/assets/common/items/armor/misc/chest/worker_green_0.ron index f8a75b557d..fc2f697ba2 100644 --- a/assets/common/items/armor/misc/chest/worker_green_0.ron +++ b/assets/common/items/armor/misc/chest/worker_green_0.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_green_1.ron b/assets/common/items/armor/misc/chest/worker_green_1.ron index 3749bdf306..da055e9c72 100644 --- a/assets/common/items/armor/misc/chest/worker_green_1.ron +++ b/assets/common/items/armor/misc/chest/worker_green_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_orange_0.ron b/assets/common/items/armor/misc/chest/worker_orange_0.ron index 4eaab10aa1..a4a61bfa55 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_0.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_0.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_orange_1.ron b/assets/common/items/armor/misc/chest/worker_orange_1.ron index a4dd15090e..88ca0c022d 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_1.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron index 7352666cf7..d2f8708303 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_0.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_0.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_1.ron b/assets/common/items/armor/misc/chest/worker_purple_1.ron index 2868ec5913..bec983b9fe 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_1.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_purple_brown.ron b/assets/common/items/armor/misc/chest/worker_purple_brown.ron index 91291f459a..4a97757c56 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_brown.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_brown.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_red_0.ron b/assets/common/items/armor/misc/chest/worker_red_0.ron index 44369292c1..ad252256c7 100644 --- a/assets/common/items/armor/misc/chest/worker_red_0.ron +++ b/assets/common/items/armor/misc/chest/worker_red_0.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_red_1.ron b/assets/common/items/armor/misc/chest/worker_red_1.ron index 61fae759db..ae84db2d0d 100644 --- a/assets/common/items/armor/misc/chest/worker_red_1.ron +++ b/assets/common/items/armor/misc/chest/worker_red_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_yellow_0.ron b/assets/common/items/armor/misc/chest/worker_yellow_0.ron index 3fb5c10252..b9b3feb52b 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_0.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_0.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/chest/worker_yellow_1.ron b/assets/common/items/armor/misc/chest/worker_yellow_1.ron index cb0dc49821..64e939888b 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_1.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_1.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/pants/worker_blue.ron b/assets/common/items/armor/misc/pants/worker_blue.ron index 3b39b90e6a..9ee3443649 100644 --- a/assets/common/items/armor/misc/pants/worker_blue.ron +++ b/assets/common/items/armor/misc/pants/worker_blue.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/pants/worker_brown.ron b/assets/common/items/armor/misc/pants/worker_brown.ron index cfa93981fe..14b73da220 100644 --- a/assets/common/items/armor/misc/pants/worker_brown.ron +++ b/assets/common/items/armor/misc/pants/worker_brown.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron index e09514b8db..589d2a6cd3 100644 --- a/assets/common/items/armor/misc/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/misc/shoulder/iron_spikes.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Iron))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron index 22dc54fbfb..e5cb5991af 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron index 5a6bf35530..f0faadb9dc 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron index b5fdd0fed3..de0f89e55d 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron index b34d19a82a..c0e2827ecc 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/rugged/chest.ron b/assets/common/items/armor/rugged/chest.ron index 456cfcf4de..0b53f46c55 100644 --- a/assets/common/items/armor/rugged/chest.ron +++ b/assets/common/items/armor/rugged/chest.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/rugged/pants.ron b/assets/common/items/armor/rugged/pants.ron index 594ca4c62e..6510dfef0b 100644 --- a/assets/common/items/armor/rugged/pants.ron +++ b/assets/common/items/armor/rugged/pants.ron @@ -13,7 +13,5 @@ ItemDef( ), )), quality: Low, - tags: [ - ClothItem, - ], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/back.ron b/assets/common/items/armor/savage/back.ron index e71840aae7..0a413e6f11 100644 --- a/assets/common/items/armor/savage/back.ron +++ b/assets/common/items/armor/savage/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/belt.ron b/assets/common/items/armor/savage/belt.ron index f5f66a795a..30b9dfe443 100644 --- a/assets/common/items/armor/savage/belt.ron +++ b/assets/common/items/armor/savage/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/chest.ron b/assets/common/items/armor/savage/chest.ron index 0c12f7b2b8..51b7252dd0 100644 --- a/assets/common/items/armor/savage/chest.ron +++ b/assets/common/items/armor/savage/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/foot.ron b/assets/common/items/armor/savage/foot.ron index 636f5c261e..cf687c8d04 100644 --- a/assets/common/items/armor/savage/foot.ron +++ b/assets/common/items/armor/savage/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/hand.ron b/assets/common/items/armor/savage/hand.ron index 15dc9fc0ee..2252b067a2 100644 --- a/assets/common/items/armor/savage/hand.ron +++ b/assets/common/items/armor/savage/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/pants.ron b/assets/common/items/armor/savage/pants.ron index 6339651ec9..a54b41f7c8 100644 --- a/assets/common/items/armor/savage/pants.ron +++ b/assets/common/items/armor/savage/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/savage/shoulder.ron b/assets/common/items/armor/savage/shoulder.ron index 53bc80d6a6..85380689d3 100644 --- a/assets/common/items/armor/savage/shoulder.ron +++ b/assets/common/items/armor/savage/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/belt.ron b/assets/common/items/armor/tarasque/belt.ron index 3a619abf75..c8feb1797e 100644 --- a/assets/common/items/armor/tarasque/belt.ron +++ b/assets/common/items/armor/tarasque/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/chest.ron b/assets/common/items/armor/tarasque/chest.ron index 9841fb54d3..53f76a8f37 100644 --- a/assets/common/items/armor/tarasque/chest.ron +++ b/assets/common/items/armor/tarasque/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/foot.ron b/assets/common/items/armor/tarasque/foot.ron index 70eea57f28..058925fb79 100644 --- a/assets/common/items/armor/tarasque/foot.ron +++ b/assets/common/items/armor/tarasque/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/hand.ron b/assets/common/items/armor/tarasque/hand.ron index 45e5faec5c..833a1bfc0e 100644 --- a/assets/common/items/armor/tarasque/hand.ron +++ b/assets/common/items/armor/tarasque/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/pants.ron b/assets/common/items/armor/tarasque/pants.ron index 27c5f81bd1..df387192f6 100644 --- a/assets/common/items/armor/tarasque/pants.ron +++ b/assets/common/items/armor/tarasque/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/tarasque/shoulder.ron b/assets/common/items/armor/tarasque/shoulder.ron index 33936e5c36..528a10e7fc 100644 --- a/assets/common/items/armor/tarasque/shoulder.ron +++ b/assets/common/items/armor/tarasque/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Carapace))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/belt.ron b/assets/common/items/armor/twigs/belt.ron index 61ecd0231b..24e949bf10 100644 --- a/assets/common/items/armor/twigs/belt.ron +++ b/assets/common/items/armor/twigs/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/chest.ron b/assets/common/items/armor/twigs/chest.ron index 46d816c76f..13a698670a 100644 --- a/assets/common/items/armor/twigs/chest.ron +++ b/assets/common/items/armor/twigs/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/foot.ron b/assets/common/items/armor/twigs/foot.ron index 814cb7bf55..376a1a66db 100644 --- a/assets/common/items/armor/twigs/foot.ron +++ b/assets/common/items/armor/twigs/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/hand.ron b/assets/common/items/armor/twigs/hand.ron index b744dfc3f4..8f5d8b3af7 100644 --- a/assets/common/items/armor/twigs/hand.ron +++ b/assets/common/items/armor/twigs/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/pants.ron b/assets/common/items/armor/twigs/pants.ron index 43ada6cff8..c0883400d2 100644 --- a/assets/common/items/armor/twigs/pants.ron +++ b/assets/common/items/armor/twigs/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigs/shoulder.ron b/assets/common/items/armor/twigs/shoulder.ron index d1fe2c74cb..6d6972ba53 100644 --- a/assets/common/items/armor/twigs/shoulder.ron +++ b/assets/common/items/armor/twigs/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/belt.ron b/assets/common/items/armor/twigsflowers/belt.ron index 1c4634ff18..0cc51db64a 100644 --- a/assets/common/items/armor/twigsflowers/belt.ron +++ b/assets/common/items/armor/twigsflowers/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/chest.ron b/assets/common/items/armor/twigsflowers/chest.ron index c6f6feed39..b032b86e5d 100644 --- a/assets/common/items/armor/twigsflowers/chest.ron +++ b/assets/common/items/armor/twigsflowers/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/foot.ron b/assets/common/items/armor/twigsflowers/foot.ron index cccf806a85..25de879a5e 100644 --- a/assets/common/items/armor/twigsflowers/foot.ron +++ b/assets/common/items/armor/twigsflowers/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/hand.ron b/assets/common/items/armor/twigsflowers/hand.ron index 011f57c612..b57e5ee76d 100644 --- a/assets/common/items/armor/twigsflowers/hand.ron +++ b/assets/common/items/armor/twigsflowers/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/pants.ron b/assets/common/items/armor/twigsflowers/pants.ron index 3300b8742d..aee1115b3d 100644 --- a/assets/common/items/armor/twigsflowers/pants.ron +++ b/assets/common/items/armor/twigsflowers/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron index 43cf81f7c2..1b41665acc 100644 --- a/assets/common/items/armor/twigsflowers/shoulder.ron +++ b/assets/common/items/armor/twigsflowers/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/belt.ron b/assets/common/items/armor/twigsleaves/belt.ron index c7d0a1d38c..1d7def6e35 100644 --- a/assets/common/items/armor/twigsleaves/belt.ron +++ b/assets/common/items/armor/twigsleaves/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/chest.ron b/assets/common/items/armor/twigsleaves/chest.ron index fa68a650fa..7542995d41 100644 --- a/assets/common/items/armor/twigsleaves/chest.ron +++ b/assets/common/items/armor/twigsleaves/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/foot.ron b/assets/common/items/armor/twigsleaves/foot.ron index 24912ec535..a24ea9f570 100644 --- a/assets/common/items/armor/twigsleaves/foot.ron +++ b/assets/common/items/armor/twigsleaves/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/hand.ron b/assets/common/items/armor/twigsleaves/hand.ron index 93908f18a2..5099f7137e 100644 --- a/assets/common/items/armor/twigsleaves/hand.ron +++ b/assets/common/items/armor/twigsleaves/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/pants.ron b/assets/common/items/armor/twigsleaves/pants.ron index 7f51b860b4..27844fd786 100644 --- a/assets/common/items/armor/twigsleaves/pants.ron +++ b/assets/common/items/armor/twigsleaves/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Moderate, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/twigsleaves/shoulder.ron b/assets/common/items/armor/twigsleaves/shoulder.ron index 27ff836153..e124b31007 100644 --- a/assets/common/items/armor/twigsleaves/shoulder.ron +++ b/assets/common/items/armor/twigsleaves/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: Common, - tags: [], + tags: [Material((material: Linen))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/back.ron b/assets/common/items/armor/velorite_mage/back.ron index 1da933da09..7bc271c737 100644 --- a/assets/common/items/armor/velorite_mage/back.ron +++ b/assets/common/items/armor/velorite_mage/back.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/belt.ron b/assets/common/items/armor/velorite_mage/belt.ron index e86d4187b9..41be02973c 100644 --- a/assets/common/items/armor/velorite_mage/belt.ron +++ b/assets/common/items/armor/velorite_mage/belt.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/chest.ron b/assets/common/items/armor/velorite_mage/chest.ron index 12b5d26db9..38636b743c 100644 --- a/assets/common/items/armor/velorite_mage/chest.ron +++ b/assets/common/items/armor/velorite_mage/chest.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/foot.ron b/assets/common/items/armor/velorite_mage/foot.ron index 334259c446..376b0bd644 100644 --- a/assets/common/items/armor/velorite_mage/foot.ron +++ b/assets/common/items/armor/velorite_mage/foot.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/hand.ron b/assets/common/items/armor/velorite_mage/hand.ron index 639e9a4a68..59869d8f48 100644 --- a/assets/common/items/armor/velorite_mage/hand.ron +++ b/assets/common/items/armor/velorite_mage/hand.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/pants.ron b/assets/common/items/armor/velorite_mage/pants.ron index 62ae0dc531..f377eacab8 100644 --- a/assets/common/items/armor/velorite_mage/pants.ron +++ b/assets/common/items/armor/velorite_mage/pants.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/armor/velorite_mage/shoulder.ron b/assets/common/items/armor/velorite_mage/shoulder.ron index 770bf88ddc..cc06c69c2a 100644 --- a/assets/common/items/armor/velorite_mage/shoulder.ron +++ b/assets/common/items/armor/velorite_mage/shoulder.ron @@ -13,5 +13,5 @@ ItemDef( ), )), quality: High, - tags: [], + tags: [Material((material: Velorite))], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/hide/animal_hide.ron b/assets/common/items/crafting_ing/hide/animal_hide.ron index 51d8ef596e..0f92f4b9eb 100644 --- a/assets/common/items/crafting_ing/hide/animal_hide.ron +++ b/assets/common/items/crafting_ing/hide/animal_hide.ron @@ -5,5 +5,5 @@ ItemDef( kind: "AnimalHide", ), quality: Common, - tags: [LeatherItem], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/hide/tough_hide.ron b/assets/common/items/crafting_ing/hide/tough_hide.ron index 1171f669dd..b13c839595 100644 --- a/assets/common/items/crafting_ing/hide/tough_hide.ron +++ b/assets/common/items/crafting_ing/hide/tough_hide.ron @@ -5,5 +5,5 @@ ItemDef( kind: "ToughHide", ), quality: Common, - tags: [LeatherItem], + tags: [Material((material: Leather))], ) \ No newline at end of file diff --git a/assets/common/items/mineral/ingot/gold.ron b/assets/common/items/mineral/ingot/gold.ron index 6f4b138fb8..00ddddc849 100644 --- a/assets/common/items/mineral/ingot/gold.ron +++ b/assets/common/items/mineral/ingot/gold.ron @@ -5,5 +5,5 @@ ItemDef( kind: "GoldIngot", ), quality: Epic, - tags: [], + tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/items/mineral/ingot/orichalcum.ron b/assets/common/items/mineral/ingot/orichalcum.ron index cbf39356ec..34dc75db78 100644 --- a/assets/common/items/mineral/ingot/orichalcum.ron +++ b/assets/common/items/mineral/ingot/orichalcum.ron @@ -5,5 +5,5 @@ ItemDef( kind: "OrichalcumIngot", ), quality: Epic, - tags: [], + tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/items/mineral/ingot/silver.ron b/assets/common/items/mineral/ingot/silver.ron index 4993010da9..54dae5a7ea 100644 --- a/assets/common/items/mineral/ingot/silver.ron +++ b/assets/common/items/mineral/ingot/silver.ron @@ -5,5 +5,5 @@ ItemDef( kind: "SilverIngot", ), quality: Epic, - tags: [], + tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 75f61b8f0e..ba7717d38c 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -1692,18 +1692,47 @@ craft_sprite: Some(Anvil), ), "cloth_scraps": ( - output: ("common.items.crafting_ing.cloth.cloth_scraps", 1), + output: ("common.items.crafting_ing.cloth.linen", 1), inputs: [ - (Tag(ClothItem), 1), + (Tag(Material((material: Linen))), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), - "leather_strips": ( - output: ("common.items.crafting_ing.leather.leather_strips", 3), + "wool": ( + output: ("common.items.crafting_ing.cloth.wool", 1), inputs: [ - (Tag(LeatherItem), 1), + (Tag(Material((material: Wool))), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), ], ), + "rawhide": ( + output: ("common.items.crafting_ing.leather.simple_leather", 1), + inputs: [ + (Tag(Material((material: Rawhide))), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + ), + "leather": ( + output: ("common.items.crafting_ing.leather.thick_leather", 1), + inputs: [ + (Tag(Material((material: Leather))), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + ), + "bronze": ( + output: ("common.items.mineral.ingot.bronze", 1), + inputs: [ + (Tag(Material((material: Bronze))), 1), + ], + craft_sprite: Some(Anvil), + ), + "iron": ( + output: ("common.items.mineral.ingot.iron", 1), + inputs: [ + (Tag(Material((material: Iron))), 1), + ], + craft_sprite: Some(Anvil), + ), //"metal_blade": ( // output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1), // inputs: [ diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron index 54a4a99361..3bc0f38e12 100644 --- a/assets/voxygen/i18n/en/common.ron +++ b/assets/voxygen/i18n/en/common.ron @@ -101,9 +101,11 @@ Is the client up to date?"#, "common.stats.poise_res":"Stun Res", "common.stats.slots": "Slots", - "common.armor.light": "Light", - "common.armor.medium": "Medium", - "common.armor.heavy": "Heavy", + "common.material.metal": "Metal", + "common.material.wood": "Wood", + "common.material.stone": "Stone", + "common.material.cloth": "Cloth", + "common.material.hide": "Hide", }, diff --git a/assets/voxygen/i18n/fr_FR/common.ron b/assets/voxygen/i18n/fr_FR/common.ron index 3f61599a16..ae3130d560 100644 --- a/assets/voxygen/i18n/fr_FR/common.ron +++ b/assets/voxygen/i18n/fr_FR/common.ron @@ -97,6 +97,12 @@ Le client est-il à jour?"#, "common.stats.armor": "Armure", "common.stats.poise_res": "Res Impact", "common.stats.slots": "Emplacements", + + "common.material.metal": "Metal", + "common.material.wood": "Bois", + "common.material.stone": "Pierre", + "common.material.cloth": "Tissu", + "common.material.hide": "Peau", }, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index b6f7dcec5d..03f24d79e4 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -18,23 +18,23 @@ Tool("CraftingBench"): VoxTrans( "voxel.sprite.crafting_bench.crafting_bench-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, - ), + ), Tool("Forge"): VoxTrans( "voxel.object.forge", (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0, - ), + ), Tool("Loom"): VoxTrans( "voxel.object.loom", (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0, - ), + ), Tool("SpinningWheel"): VoxTrans( "voxel.object.spinning_wheel", (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0, - ), + ), Tool("TanningRack"): VoxTrans( "voxel.object.tanning_rack", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0, - ), + ), // Weapons // Diary Example Images Tool("example_utility"): VoxTrans( @@ -2416,11 +2416,11 @@ "voxel.object.training_dummy", (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - // Ingredients - Tool("common.items.tool.craftsman_hammer"): VoxTrans( + // Ingredients + Tool("common.items.tool.craftsman_hammer"): VoxTrans( "voxel.weapon.hammer.craftsman", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, - ), + ), Ingredient("SewingSet"): Png( "element.items.sewing_set", ), diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index 031c6be6d4..d115a59adf 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -1,4 +1,3 @@ -use super::TagExampleInfo; use serde::{Deserialize, Serialize}; use std::{cmp::Ordering, ops::Sub}; @@ -18,40 +17,6 @@ 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 cbb61b12ee..48d949fe0e 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -93,6 +93,15 @@ pub trait TagExampleInfo { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum MaterialKind { + Metal, + Wood, + Stone, + Cloth, + Hide, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub enum Material { Bronze, Iron, Steel, @@ -125,91 +134,96 @@ pub enum MaterialKind { Dragonscale, } -#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] -pub struct MaterialKindTag { - material: MaterialKind, +impl Material { + pub fn material_kind(&self) -> MaterialKind { + match self { + Material::Bronze + | Material::Iron + | Material::Steel + | Material::Cobalt + | Material::Bloodsteel + | Material::Orichalcum => MaterialKind::Metal, + Material::Wood + | Material::Bamboo + | Material::Hardwood + | Material::Ironwood + | Material::Frostwood + | Material::Eldwood => MaterialKind::Wood, + Material::Rock + | Material::Granite + | Material::Bone + | Material::Basalt + | Material::Obsidian + | Material::Velorite => MaterialKind::Stone, + Material::Linen + | Material::Wool + | Material::Silk + | Material::Lifecloth + | Material::Moonweave + | Material::Sunsilk => MaterialKind::Cloth, + Material::Rawhide + | Material::Leather + | Material::Scale + | Material::Carapace + | Material::Plate + | Material::Dragonscale => MaterialKind::Hide, + } + } } -impl TagExampleInfo for MaterialKindTag { +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub struct MaterialTag { + material: Material, +} + +impl MaterialTag { + pub fn material(&self) -> &Material { &self.material } +} + +impl TagExampleInfo for MaterialTag { 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", + Material::Bronze => "bronze", + Material::Iron => "iron", + Material::Steel => "steel", + Material::Cobalt => "cobalt", + Material::Bloodsteel => "bloodsteel", + Material::Orichalcum => "orichalcum", + Material::Wood => "wood", + Material::Bamboo => "bamboo", + Material::Hardwood => "hardwood", + Material::Ironwood => "ironwood", + Material::Frostwood => "frostwood", + Material::Eldwood => "eldwood", + Material::Rock => "rock", + Material::Granite => "granite", + Material::Bone => "bone", + Material::Basalt => "basalt", + Material::Obsidian => "obsidian", + Material::Velorite => "velorite", + Material::Linen => "linen", + Material::Wool => "wood", + Material::Silk => "silk", + Material::Lifecloth => "lifecloth", + Material::Moonweave => "moonweave", + Material::Sunsilk => "sunsilk", + Material::Rawhide => "rawhide", + Material::Leather => "leather", + Material::Scale => "scale", + Material::Carapace => "carapace", + Material::Plate => "plate", + Material::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", - } - } + fn exemplar_identifier(&self) -> &'static str { "common.items.tag_examples.placeholder" } } #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub enum ItemTag { - ClothItem, - LeatherItem, MetalIngot, Textile, - MaterialKind(MaterialKindTag), - ArmorClass(armor::ArmorClassTag), + Material(MaterialTag), ModularComponent(ModularComponentTag), Cultist, Potion, @@ -223,8 +237,7 @@ pub enum ItemTag { impl TagExampleInfo for ItemTag { fn name(&self) -> &'static str { match self { - ItemTag::MaterialKind(material) => material.name(), - ItemTag::ArmorClass(class) => class.name(), + ItemTag::Material(material) => material.name(), ItemTag::ModularComponent(kind) => kind.name(), ItemTag::MetalIngot => "metal ingot", ItemTag::Textile => "textile", @@ -241,8 +254,7 @@ impl TagExampleInfo for ItemTag { // TODO: Autogenerate these? fn exemplar_identifier(&self) -> &'static str { match self { - ItemTag::MaterialKind(material) => material.exemplar_identifier(), - ItemTag::ArmorClass(class) => class.exemplar_identifier(), + ItemTag::Material(_) => "common.items.tag_examples.placeholder", 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/crafting.rs b/voxygen/src/hud/crafting.rs index 2ede2884c8..f8daf8b8db 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -193,7 +193,9 @@ impl CraftingTab { CraftingTab::Glider => matches!(item.kind(), ItemKind::Glider(_)), CraftingTab::Potion => item.tags().contains(&ItemTag::Potion), CraftingTab::Material => { - item.tags().contains(&ItemTag::MetalIngot) | item.tags().contains(&ItemTag::Textile) + item.tags().contains(&ItemTag::MetalIngot) + | item.tags().contains(&ItemTag::Textile) + | item.tags().contains(&ItemTag::BaseMaterial) }, CraftingTab::Bag => item.tags().contains(&ItemTag::Bag), CraftingTab::Tool => item.tags().contains(&ItemTag::CraftingTool), diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 69a2749511..31b7c8c8bb 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -2,9 +2,9 @@ use common::{ comp::{ inventory::trade_pricing::TradePricing, item::{ - armor::{Armor, ArmorClass, ArmorKind, Protection}, + armor::{Armor, ArmorKind, Protection}, tool::{Hands, StatKind, Stats, Tool, ToolKind}, - Item, ItemKind, MaterialStatManifest, ModularComponent, + Item, ItemKind, MaterialKind, MaterialStatManifest, ModularComponent, }, BuffKind, }, @@ -73,11 +73,13 @@ 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> { +pub fn materialkind_text<'a>(kind: &MaterialKind, 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")), + MaterialKind::Metal { .. } => Cow::Borrowed(i18n.get("common.material.metal")), + MaterialKind::Wood { .. } => Cow::Borrowed(i18n.get("common.material.wood")), + MaterialKind::Stone { .. } => Cow::Borrowed(i18n.get("common.material.stone")), + MaterialKind::Cloth { .. } => Cow::Borrowed(i18n.get("common.material.cloth")), + MaterialKind::Hide { .. } => Cow::Borrowed(i18n.get("common.material.hide")), } } @@ -209,6 +211,7 @@ fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { kind } +// Output the number of hands needed to hold a tool pub fn tool_hands<'a>(tool: &Tool, i18n: &'a Localization) -> &'a str { let hands = match tool.hands { Hands::One => i18n.get("common.hands.one"), @@ -241,6 +244,7 @@ pub fn comparison(first: T, other: T) -> (&'static str, conrod_co } } +// Output protection as a string pub fn protec2string(stat: Protection) -> String { match stat { Protection::Normal(a) => format!("{:.1}", a), diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index ba34282e31..18f16e81ed 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -465,20 +465,20 @@ impl<'a> Widget for ItemTooltip<'a> { let item_kind = util::kind_text(item.kind(), i18n).to_string(); - let armor_class_tag = item + let material_tag = item .tags() .into_iter() .filter_map(|t| match t { - ItemTag::ArmorClass(armor_class) => Some(armor_class), + ItemTag::Material(material) => Some(material), _ => None, }) .next(); - let subtitle = if let Some(class) = armor_class_tag { + let subtitle = if let Some(material_tag) = material_tag { format!( "{} ({})", item_kind, - util::armorclass_text(class.class(), i18n) + util::materialkind_text(&material_tag.material().material_kind(), i18n) ) } else { item_kind