From 76ca99ece470ed442e756f37d1bcd16fa06e0aaf Mon Sep 17 00:00:00 2001
From: Snowram <robin.gilh@gmail.com>
Date: Sun, 6 Jun 2021 20:33:56 +0200
Subject: [PATCH] Derive str from Material, better deserialization
---
assets/common/items/armor/assassin/belt.ron | 4 +-
assets/common/items/armor/assassin/chest.ron | 4 +-
assets/common/items/armor/assassin/foot.ron | 4 +-
assets/common/items/armor/assassin/hand.ron | 4 +-
assets/common/items/armor/assassin/head.ron | 4 +-
assets/common/items/armor/assassin/pants.ron | 4 +-
.../common/items/armor/assassin/shoulder.ron | 4 +-
.../common/items/armor/bonerattler/belt.ron | 4 +-
.../common/items/armor/bonerattler/chest.ron | 4 +-
.../common/items/armor/bonerattler/foot.ron | 4 +-
.../common/items/armor/bonerattler/hand.ron | 4 +-
.../common/items/armor/bonerattler/pants.ron | 4 +-
.../items/armor/bonerattler/shoulder.ron | 4 +-
.../common/items/armor/cloth/druid/back.ron | 4 +-
.../common/items/armor/cloth/druid/belt.ron | 6 +--
.../common/items/armor/cloth/druid/chest.ron | 6 +--
.../common/items/armor/cloth/druid/foot.ron | 6 +--
.../common/items/armor/cloth/druid/hand.ron | 6 +--
.../common/items/armor/cloth/druid/pants.ron | 6 +--
.../items/armor/cloth/druid/shoulder.ron | 6 +--
.../common/items/armor/cloth/linen/back.ron | 6 +--
.../common/items/armor/cloth/linen/belt.ron | 6 +--
.../common/items/armor/cloth/linen/chest.ron | 6 +--
.../common/items/armor/cloth/linen/foot.ron | 6 +--
.../common/items/armor/cloth/linen/hand.ron | 6 +--
.../common/items/armor/cloth/linen/pants.ron | 6 +--
.../items/armor/cloth/linen/shoulder.ron | 6 +--
.../items/armor/cloth/moonweave/back.ron | 4 +-
.../items/armor/cloth/moonweave/belt.ron | 4 +-
.../items/armor/cloth/moonweave/chest.ron | 6 +--
.../items/armor/cloth/moonweave/foot.ron | 4 +-
.../items/armor/cloth/moonweave/hand.ron | 6 +--
.../items/armor/cloth/moonweave/pants.ron | 6 +--
.../items/armor/cloth/moonweave/shoulder.ron | 6 +--
.../common/items/armor/cloth/silken/back.ron | 4 +-
.../common/items/armor/cloth/silken/belt.ron | 6 +--
.../common/items/armor/cloth/silken/chest.ron | 6 +--
.../common/items/armor/cloth/silken/foot.ron | 6 +--
.../common/items/armor/cloth/silken/hand.ron | 4 +-
.../common/items/armor/cloth/silken/pants.ron | 6 +--
.../items/armor/cloth/silken/shoulder.ron | 4 +-
.../common/items/armor/cloth/sunsilk/back.ron | 6 +--
.../common/items/armor/cloth/sunsilk/belt.ron | 6 +--
.../items/armor/cloth/sunsilk/chest.ron | 6 +--
.../common/items/armor/cloth/sunsilk/foot.ron | 6 +--
.../common/items/armor/cloth/sunsilk/hand.ron | 6 +--
.../items/armor/cloth/sunsilk/pants.ron | 6 +--
.../items/armor/cloth/sunsilk/shoulder.ron | 6 +--
.../common/items/armor/cloth/woolen/back.ron | 6 +--
.../common/items/armor/cloth/woolen/belt.ron | 4 +-
.../common/items/armor/cloth/woolen/chest.ron | 6 +--
.../common/items/armor/cloth/woolen/foot.ron | 4 +-
.../common/items/armor/cloth/woolen/hand.ron | 6 +--
.../common/items/armor/cloth/woolen/pants.ron | 4 +-
.../items/armor/cloth/woolen/shoulder.ron | 6 +--
assets/common/items/armor/cloth_blue/belt.ron | 4 +-
.../common/items/armor/cloth_blue/chest.ron | 4 +-
assets/common/items/armor/cloth_blue/foot.ron | 4 +-
assets/common/items/armor/cloth_blue/hand.ron | 4 +-
.../common/items/armor/cloth_blue/pants.ron | 4 +-
.../items/armor/cloth_blue/shoulder_0.ron | 4 +-
.../items/armor/cloth_blue/shoulder_1.ron | 4 +-
.../common/items/armor/cloth_green/belt.ron | 4 +-
.../common/items/armor/cloth_green/chest.ron | 4 +-
.../common/items/armor/cloth_green/foot.ron | 4 +-
.../common/items/armor/cloth_green/hand.ron | 4 +-
.../common/items/armor/cloth_green/pants.ron | 4 +-
.../items/armor/cloth_green/shoulder.ron | 4 +-
.../common/items/armor/cloth_purple/belt.ron | 4 +-
.../common/items/armor/cloth_purple/chest.ron | 4 +-
.../common/items/armor/cloth_purple/foot.ron | 4 +-
.../common/items/armor/cloth_purple/hand.ron | 4 +-
.../common/items/armor/cloth_purple/pants.ron | 4 +-
.../items/armor/cloth_purple/shoulder.ron | 4 +-
assets/common/items/armor/ferocious/back.ron | 4 +-
assets/common/items/armor/ferocious/belt.ron | 4 +-
assets/common/items/armor/ferocious/chest.ron | 4 +-
assets/common/items/armor/ferocious/foot.ron | 4 +-
assets/common/items/armor/ferocious/hand.ron | 4 +-
assets/common/items/armor/ferocious/pants.ron | 4 +-
.../common/items/armor/ferocious/shoulder.ron | 4 +-
.../common/items/armor/hide/carapace/back.ron | 4 +-
.../common/items/armor/hide/carapace/belt.ron | 4 +-
.../items/armor/hide/carapace/chest.ron | 4 +-
.../common/items/armor/hide/carapace/foot.ron | 6 +--
.../common/items/armor/hide/carapace/hand.ron | 6 +--
.../items/armor/hide/carapace/pants.ron | 6 +--
.../items/armor/hide/carapace/shoulder.ron | 6 +--
.../items/armor/hide/dragonscale/back.ron | 6 +--
.../items/armor/hide/dragonscale/belt.ron | 6 +--
.../items/armor/hide/dragonscale/chest.ron | 6 +--
.../items/armor/hide/dragonscale/foot.ron | 6 +--
.../items/armor/hide/dragonscale/hand.ron | 4 +-
.../items/armor/hide/dragonscale/pants.ron | 6 +--
.../items/armor/hide/dragonscale/shoulder.ron | 4 +-
.../common/items/armor/hide/leather/back.ron | 6 +--
.../common/items/armor/hide/leather/belt.ron | 4 +-
.../common/items/armor/hide/leather/chest.ron | 6 +--
.../common/items/armor/hide/leather/foot.ron | 4 +-
.../common/items/armor/hide/leather/hand.ron | 4 +-
.../common/items/armor/hide/leather/head.ron | 6 +--
.../common/items/armor/hide/leather/pants.ron | 4 +-
.../items/armor/hide/leather/shoulder.ron | 4 +-
.../common/items/armor/hide/primal/back.ron | 6 +--
.../common/items/armor/hide/primal/belt.ron | 6 +--
.../common/items/armor/hide/primal/chest.ron | 4 +-
.../common/items/armor/hide/primal/foot.ron | 4 +-
.../common/items/armor/hide/primal/hand.ron | 4 +-
.../common/items/armor/hide/primal/pants.ron | 6 +--
.../items/armor/hide/primal/shoulder.ron | 6 +--
.../common/items/armor/hide/rawhide/back.ron | 6 +--
.../common/items/armor/hide/rawhide/belt.ron | 4 +-
.../common/items/armor/hide/rawhide/chest.ron | 6 +--
.../common/items/armor/hide/rawhide/foot.ron | 6 +--
.../common/items/armor/hide/rawhide/hand.ron | 6 +--
.../common/items/armor/hide/rawhide/pants.ron | 6 +--
.../items/armor/hide/rawhide/shoulder.ron | 6 +--
assets/common/items/armor/hide/scale/back.ron | 6 +--
assets/common/items/armor/hide/scale/belt.ron | 6 +--
.../common/items/armor/hide/scale/chest.ron | 4 +-
assets/common/items/armor/hide/scale/foot.ron | 6 +--
assets/common/items/armor/hide/scale/hand.ron | 6 +--
.../common/items/armor/hide/scale/pants.ron | 6 +--
.../items/armor/hide/scale/shoulder.ron | 6 +--
.../common/items/armor/leather_plate/belt.ron | 4 +-
.../items/armor/leather_plate/chest.ron | 4 +-
.../common/items/armor/leather_plate/foot.ron | 4 +-
.../common/items/armor/leather_plate/hand.ron | 4 +-
.../items/armor/leather_plate/pants.ron | 4 +-
.../items/armor/leather_plate/shoulder.ron | 4 +-
.../items/armor/mail/bloodsteel/back.ron | 6 +--
.../items/armor/mail/bloodsteel/belt.ron | 6 +--
.../items/armor/mail/bloodsteel/chest.ron | 6 +--
.../items/armor/mail/bloodsteel/foot.ron | 6 +--
.../items/armor/mail/bloodsteel/hand.ron | 4 +-
.../items/armor/mail/bloodsteel/pants.ron | 6 +--
.../items/armor/mail/bloodsteel/shoulder.ron | 6 +--
.../common/items/armor/mail/bronze/back.ron | 6 +--
.../common/items/armor/mail/bronze/belt.ron | 6 +--
.../common/items/armor/mail/bronze/chest.ron | 6 +--
.../common/items/armor/mail/bronze/foot.ron | 6 +--
.../common/items/armor/mail/bronze/hand.ron | 4 +-
.../common/items/armor/mail/bronze/pants.ron | 4 +-
.../items/armor/mail/bronze/shoulder.ron | 4 +-
.../common/items/armor/mail/cobalt/back.ron | 4 +-
.../common/items/armor/mail/cobalt/belt.ron | 6 +--
.../common/items/armor/mail/cobalt/chest.ron | 6 +--
.../common/items/armor/mail/cobalt/foot.ron | 6 +--
.../common/items/armor/mail/cobalt/hand.ron | 4 +-
.../common/items/armor/mail/cobalt/pants.ron | 6 +--
.../items/armor/mail/cobalt/shoulder.ron | 6 +--
assets/common/items/armor/mail/iron/back.ron | 6 +--
assets/common/items/armor/mail/iron/belt.ron | 4 +-
assets/common/items/armor/mail/iron/chest.ron | 6 +--
assets/common/items/armor/mail/iron/foot.ron | 6 +--
assets/common/items/armor/mail/iron/hand.ron | 6 +--
assets/common/items/armor/mail/iron/pants.ron | 4 +-
.../common/items/armor/mail/iron/shoulder.ron | 4 +-
.../items/armor/mail/orichalcum/back.ron | 6 +--
.../items/armor/mail/orichalcum/belt.ron | 4 +-
.../items/armor/mail/orichalcum/chest.ron | 6 +--
.../items/armor/mail/orichalcum/foot.ron | 6 +--
.../items/armor/mail/orichalcum/hand.ron | 4 +-
.../items/armor/mail/orichalcum/pants.ron | 6 +--
.../items/armor/mail/orichalcum/shoulder.ron | 4 +-
assets/common/items/armor/mail/steel/back.ron | 4 +-
assets/common/items/armor/mail/steel/belt.ron | 4 +-
.../common/items/armor/mail/steel/chest.ron | 4 +-
assets/common/items/armor/mail/steel/foot.ron | 4 +-
assets/common/items/armor/mail/steel/hand.ron | 4 +-
.../common/items/armor/mail/steel/pants.ron | 4 +-
.../items/armor/mail/steel/shoulder.ron | 6 +--
.../common/items/armor/misc/back/short_1.ron | 4 +-
.../items/armor/misc/chest/worker_green_0.ron | 4 +-
.../items/armor/misc/chest/worker_green_1.ron | 4 +-
.../armor/misc/chest/worker_orange_0.ron | 4 +-
.../armor/misc/chest/worker_orange_1.ron | 4 +-
.../armor/misc/chest/worker_purple_0.ron | 4 +-
.../armor/misc/chest/worker_purple_1.ron | 4 +-
.../armor/misc/chest/worker_purple_brown.ron | 4 +-
.../items/armor/misc/chest/worker_red_0.ron | 4 +-
.../items/armor/misc/chest/worker_red_1.ron | 4 +-
.../armor/misc/chest/worker_yellow_0.ron | 4 +-
.../armor/misc/chest/worker_yellow_1.ron | 4 +-
.../armor/misc/foot/jackalope_slippers.ron | 4 +-
.../common/items/armor/misc/foot/sandals.ron | 4 +-
.../common/items/armor/misc/neck/plain_0.ron | 4 +-
.../common/items/armor/misc/neck/plain_1.ron | 4 +-
.../items/armor/misc/pants/worker_blue.ron | 4 +-
.../items/armor/misc/pants/worker_brown.ron | 4 +-
.../items/armor/misc/shoulder/iron_spikes.ron | 4 +-
.../armor/misc/shoulder/leather_iron_0.ron | 4 +-
.../armor/misc/shoulder/leather_iron_1.ron | 4 +-
.../armor/misc/shoulder/leather_iron_2.ron | 4 +-
.../armor/misc/shoulder/leather_iron_3.ron | 4 +-
assets/common/items/armor/rugged/chest.ron | 4 +-
assets/common/items/armor/rugged/pants.ron | 4 +-
assets/common/items/armor/savage/back.ron | 4 +-
assets/common/items/armor/savage/belt.ron | 4 +-
assets/common/items/armor/savage/chest.ron | 4 +-
assets/common/items/armor/savage/foot.ron | 4 +-
assets/common/items/armor/savage/hand.ron | 4 +-
assets/common/items/armor/savage/pants.ron | 4 +-
assets/common/items/armor/savage/shoulder.ron | 4 +-
assets/common/items/armor/tarasque/belt.ron | 4 +-
assets/common/items/armor/tarasque/chest.ron | 4 +-
assets/common/items/armor/tarasque/foot.ron | 4 +-
assets/common/items/armor/tarasque/hand.ron | 4 +-
assets/common/items/armor/tarasque/pants.ron | 4 +-
.../common/items/armor/tarasque/shoulder.ron | 4 +-
assets/common/items/armor/twigs/belt.ron | 4 +-
assets/common/items/armor/twigs/chest.ron | 4 +-
assets/common/items/armor/twigs/foot.ron | 4 +-
assets/common/items/armor/twigs/hand.ron | 4 +-
assets/common/items/armor/twigs/pants.ron | 4 +-
assets/common/items/armor/twigs/shoulder.ron | 4 +-
.../common/items/armor/twigsflowers/belt.ron | 4 +-
.../common/items/armor/twigsflowers/chest.ron | 4 +-
.../common/items/armor/twigsflowers/foot.ron | 4 +-
.../common/items/armor/twigsflowers/hand.ron | 4 +-
.../common/items/armor/twigsflowers/pants.ron | 4 +-
.../items/armor/twigsflowers/shoulder.ron | 4 +-
.../common/items/armor/twigsleaves/belt.ron | 4 +-
.../common/items/armor/twigsleaves/chest.ron | 4 +-
.../common/items/armor/twigsleaves/foot.ron | 4 +-
.../common/items/armor/twigsleaves/hand.ron | 4 +-
.../common/items/armor/twigsleaves/pants.ron | 4 +-
.../items/armor/twigsleaves/shoulder.ron | 4 +-
.../common/items/armor/velorite_mage/back.ron | 4 +-
.../common/items/armor/velorite_mage/belt.ron | 4 +-
.../items/armor/velorite_mage/chest.ron | 4 +-
.../common/items/armor/velorite_mage/foot.ron | 4 +-
.../common/items/armor/velorite_mage/hand.ron | 4 +-
.../items/armor/velorite_mage/pants.ron | 4 +-
.../items/armor/velorite_mage/shoulder.ron | 4 +-
.../items/crafting_ing/hide/animal_hide.ron | 4 +-
.../items/crafting_ing/hide/rugged_hide.ron | 4 +-
.../items/crafting_ing/hide/tough_hide.ron | 4 +-
assets/common/recipe_book.ron | 18 ++++-----
.../{materials.png => processed_material.png} | 0
assets/voxygen/i18n/en/hud/crafting.ron | 2 +-
common/src/comp/inventory/item/mod.rs | 40 +++----------------
voxygen/src/hud/crafting.rs | 8 ++--
voxygen/src/hud/img_ids.rs | 2 +-
voxygen/src/scene/terrain/watcher.rs | 5 +--
245 files changed, 358 insertions(+), 837 deletions(-)
rename assets/voxygen/element/ui/crafting/icons/{materials.png => processed_material.png} (100%)
diff --git a/assets/common/items/armor/assassin/belt.ron b/assets/common/items/armor/assassin/belt.ron
index bea61215b1..8327034d9e 100644
--- a/assets/common/items/armor/assassin/belt.ron
+++ b/assets/common/items/armor/assassin/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 90d10dd6d9..5a1caa64bf 100644
--- a/assets/common/items/armor/assassin/chest.ron
+++ b/assets/common/items/armor/assassin/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 f6507c5cff..be65ebe96e 100644
--- a/assets/common/items/armor/assassin/foot.ron
+++ b/assets/common/items/armor/assassin/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 73b24456e2..3823dcdc10 100644
--- a/assets/common/items/armor/assassin/hand.ron
+++ b/assets/common/items/armor/assassin/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 4c075857de..5706ab8811 100644
--- a/assets/common/items/armor/assassin/head.ron
+++ b/assets/common/items/armor/assassin/head.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 c862f06263..150075e7a5 100644
--- a/assets/common/items/armor/assassin/pants.ron
+++ b/assets/common/items/armor/assassin/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 7595f41619..84b2252dd4 100644
--- a/assets/common/items/armor/assassin/shoulder.ron
+++ b/assets/common/items/armor/assassin/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 8f81844e78..ca6a5a7010 100644
--- a/assets/common/items/armor/bonerattler/belt.ron
+++ b/assets/common/items/armor/bonerattler/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 88cd061f0e..853ed09dbe 100644
--- a/assets/common/items/armor/bonerattler/chest.ron
+++ b/assets/common/items/armor/bonerattler/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 cda3060633..49e301c72c 100644
--- a/assets/common/items/armor/bonerattler/foot.ron
+++ b/assets/common/items/armor/bonerattler/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 d6f2be9703..3be61d8c39 100644
--- a/assets/common/items/armor/bonerattler/hand.ron
+++ b/assets/common/items/armor/bonerattler/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 7e2ae08b87..50c5df234c 100644
--- a/assets/common/items/armor/bonerattler/pants.ron
+++ b/assets/common/items/armor/bonerattler/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 cf8f303a8e..a81320563d 100644
--- a/assets/common/items/armor/bonerattler/shoulder.ron
+++ b/assets/common/items/armor/bonerattler/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 f7cf1fe54d..4a633b0e46 100644
--- a/assets/common/items/armor/cloth/druid/back.ron
+++ b/assets/common/items/armor/cloth/druid/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 83c83e30c6..e66eddf06d 100644
--- a/assets/common/items/armor/cloth/druid/belt.ron
+++ b/assets/common/items/armor/cloth/druid/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Druid Belt",
+ name: "Druid Sash",
description: "Incredibly light, with the essence of nature.",
kind: Armor((
kind: Belt("Druid"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 b4c2a41d6a..14bb5c2565 100644
--- a/assets/common/items/armor/cloth/druid/chest.ron
+++ b/assets/common/items/armor/cloth/druid/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Druid Cuirass",
+ name: "Druid Chestguard",
description: "Incredibly light, with the essence of nature.",
kind: Armor((
kind: Chest("Druid"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 ab1ff8a9ed..640b3c00a9 100644
--- a/assets/common/items/armor/cloth/druid/foot.ron
+++ b/assets/common/items/armor/cloth/druid/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Druid Boots",
+ name: "Druid Kickers",
description: "Incredibly light, with the essence of nature.",
kind: Armor((
kind: Foot("Druid"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 bf70dd235b..a330a1cad1 100644
--- a/assets/common/items/armor/cloth/druid/hand.ron
+++ b/assets/common/items/armor/cloth/druid/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Druid Gauntlets",
+ name: "Druid Handwraps",
description: "Incredibly light, with the essence of nature.",
kind: Armor((
kind: Hand("Druid"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 61036d5def..af99a59449 100644
--- a/assets/common/items/armor/cloth/druid/pants.ron
+++ b/assets/common/items/armor/cloth/druid/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Druid Chausses",
+ name: "Druid Leggings",
description: "Incredibly light, with the essence of nature.",
kind: Armor((
kind: Pants("Druid"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 1935620239..5c55da412e 100644
--- a/assets/common/items/armor/cloth/druid/shoulder.ron
+++ b/assets/common/items/armor/cloth/druid/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Druid Shoulder Pad",
+ name: "Druid Shoulderpads",
description: "Incredibly light, with the essence of nature.",
kind: Armor((
kind: Shoulder("Druid"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Lifecloth,
- )),
+ 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 080db9f7db..046eff0ee1 100644
--- a/assets/common/items/armor/cloth/linen/back.ron
+++ b/assets/common/items/armor/cloth/linen/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Cape",
+ name: "Linen Shawl",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Back("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 882e3d3dad..9dce841b29 100644
--- a/assets/common/items/armor/cloth/linen/belt.ron
+++ b/assets/common/items/armor/cloth/linen/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Belt",
+ name: "Linen Sash",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Belt("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 1e210a6a31..df16914ade 100644
--- a/assets/common/items/armor/cloth/linen/chest.ron
+++ b/assets/common/items/armor/cloth/linen/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Chest",
+ name: "Linen Vest",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Chest("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 d5d81b6b83..4a089e6202 100644
--- a/assets/common/items/armor/cloth/linen/foot.ron
+++ b/assets/common/items/armor/cloth/linen/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Kickers",
+ name: "Linen Feet",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Foot("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 311cbcd8c5..74a5f65675 100644
--- a/assets/common/items/armor/cloth/linen/hand.ron
+++ b/assets/common/items/armor/cloth/linen/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Gauntlets",
+ name: "Linen Handwraps",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Hand("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 bbdb065f85..537a8e5684 100644
--- a/assets/common/items/armor/cloth/linen/pants.ron
+++ b/assets/common/items/armor/cloth/linen/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Pantalons",
+ name: "Linen Pants",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Pants("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 801375d542..3cb40a2f97 100644
--- a/assets/common/items/armor/cloth/linen/shoulder.ron
+++ b/assets/common/items/armor/cloth/linen/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Linen Guards",
+ name: "Linen Shoulders",
description: "Roughly stitched, but it seems to hold.",
kind: Armor((
kind: Shoulder("Linen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 b6f93e0af7..2a23611550 100644
--- a/assets/common/items/armor/cloth/moonweave/back.ron
+++ b/assets/common/items/armor/cloth/moonweave/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 3d667a7a73..31ffff0cee 100644
--- a/assets/common/items/armor/cloth/moonweave/belt.ron
+++ b/assets/common/items/armor/cloth/moonweave/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 b68dee5861..510ead28fc 100644
--- a/assets/common/items/armor/cloth/moonweave/chest.ron
+++ b/assets/common/items/armor/cloth/moonweave/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Moonweave Cuirass",
+ name: "Moonweave Vest",
description: "The fabric dances silently, like moonlight.",
kind: Armor((
kind: Chest("Moonweave"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 ba36b9ab0c..0c66bdebb8 100644
--- a/assets/common/items/armor/cloth/moonweave/foot.ron
+++ b/assets/common/items/armor/cloth/moonweave/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 8408882f09..4847535047 100644
--- a/assets/common/items/armor/cloth/moonweave/hand.ron
+++ b/assets/common/items/armor/cloth/moonweave/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Moonweave Gauntlets",
+ name: "Moonweave Gloves",
description: "The fabric dances silently, like moonlight.",
kind: Armor((
kind: Hand("Moonweave"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 d076845518..a3355a3e2b 100644
--- a/assets/common/items/armor/cloth/moonweave/pants.ron
+++ b/assets/common/items/armor/cloth/moonweave/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Moonweave Chausses",
+ name: "Moonweave Legs",
description: "The fabric dances silently, like moonlight.",
kind: Armor((
kind: Pants("Moonweave"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 8896aa0c8d..1b3d51e698 100644
--- a/assets/common/items/armor/cloth/moonweave/shoulder.ron
+++ b/assets/common/items/armor/cloth/moonweave/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Moonweave Shoulder Pad",
+ name: "Moonweave Shoulders",
description: "The fabric dances silently, like moonlight.",
kind: Armor((
kind: Shoulder("Moonweave"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Moonweave,
- )),
+ 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 ce1cbc2ce1..29b4f5b4c0 100644
--- a/assets/common/items/armor/cloth/silken/back.ron
+++ b/assets/common/items/armor/cloth/silken/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 03095f35b5..283ea926ad 100644
--- a/assets/common/items/armor/cloth/silken/belt.ron
+++ b/assets/common/items/armor/cloth/silken/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Silken Belt",
+ name: "Silken Sash",
description: "Weaved with care by a skilled tailor.",
kind: Armor((
kind: Belt("Silken"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 c191b52b3c..3526d00af9 100644
--- a/assets/common/items/armor/cloth/silken/chest.ron
+++ b/assets/common/items/armor/cloth/silken/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Silken Chestpiece",
+ name: "Silken Robe",
description: "Weaved with care by a skilled tailor.",
kind: Armor((
kind: Chest("Silken"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 a23a21238d..25995e94a8 100644
--- a/assets/common/items/armor/cloth/silken/foot.ron
+++ b/assets/common/items/armor/cloth/silken/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Silken Boots",
+ name: "Silken Feet",
description: "Weaved with care by a skilled tailor.",
kind: Armor((
kind: Foot("Silken"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 73cbd09296..e9e5686f55 100644
--- a/assets/common/items/armor/cloth/silken/hand.ron
+++ b/assets/common/items/armor/cloth/silken/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 21f1be7f03..acd99bf839 100644
--- a/assets/common/items/armor/cloth/silken/pants.ron
+++ b/assets/common/items/armor/cloth/silken/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Silken Pants",
+ name: "Silken Skirt",
description: "Weaved with care by a skilled tailor.",
kind: Armor((
kind: Pants("Silken"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 786247e2ca..90a0f37862 100644
--- a/assets/common/items/armor/cloth/silken/shoulder.ron
+++ b/assets/common/items/armor/cloth/silken/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Silk,
- )),
+ 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 c72de05c19..93c93f04e3 100644
--- a/assets/common/items/armor/cloth/sunsilk/back.ron
+++ b/assets/common/items/armor/cloth/sunsilk/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk cape",
+ name: "Sunsilk Cape",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Back("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 f32365b6cc..5118367697 100644
--- a/assets/common/items/armor/cloth/sunsilk/belt.ron
+++ b/assets/common/items/armor/cloth/sunsilk/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk Belt",
+ name: "Sunsilk Sash",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Belt("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 4fa5117740..05f608f9d1 100644
--- a/assets/common/items/armor/cloth/sunsilk/chest.ron
+++ b/assets/common/items/armor/cloth/sunsilk/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk Chest",
+ name: "Sunsilk Tunic",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Chest("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 a3b5e23338..206dc742a7 100644
--- a/assets/common/items/armor/cloth/sunsilk/foot.ron
+++ b/assets/common/items/armor/cloth/sunsilk/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk Boots",
+ name: "Sunsilk Footwraps",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Foot("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 bfdf60a128..8fb5f7a49e 100644
--- a/assets/common/items/armor/cloth/sunsilk/hand.ron
+++ b/assets/common/items/armor/cloth/sunsilk/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk Gloves",
+ name: "Sunsilk Handwraps",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Hand("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 c03f85a81b..113be1c67f 100644
--- a/assets/common/items/armor/cloth/sunsilk/pants.ron
+++ b/assets/common/items/armor/cloth/sunsilk/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk Skirt",
+ name: "Sunsilk Kilt",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Pants("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 ae7f0aa20d..845b85c9a2 100644
--- a/assets/common/items/armor/cloth/sunsilk/shoulder.ron
+++ b/assets/common/items/armor/cloth/sunsilk/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Sunsilk Mantle",
+ name: "Sunsilk Shoulderwraps",
description: "It radiates with the sun's power, and the grace to harness it.",
kind: Armor((
kind: Shoulder("Sunsilk"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Sunsilk,
- )),
+ 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 5637e98a7d..3ed3751e04 100644
--- a/assets/common/items/armor/cloth/woolen/back.ron
+++ b/assets/common/items/armor/cloth/woolen/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Woolen Cape",
+ name: "Woolen Cloak",
description: "Thick and ready for the snow.",
kind: Armor((
kind: Back("Woolen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 7725e98ef3..43d4aab47e 100644
--- a/assets/common/items/armor/cloth/woolen/belt.ron
+++ b/assets/common/items/armor/cloth/woolen/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 1c133bb131..f61d60ba61 100644
--- a/assets/common/items/armor/cloth/woolen/chest.ron
+++ b/assets/common/items/armor/cloth/woolen/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Woolen Chest",
+ name: "Woolen Parka",
description: "Thick and ready for the snow.",
kind: Armor((
kind: Chest("Woolen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 3332064853..6ded8fea7f 100644
--- a/assets/common/items/armor/cloth/woolen/foot.ron
+++ b/assets/common/items/armor/cloth/woolen/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 ba6e68e335..a4469d4421 100644
--- a/assets/common/items/armor/cloth/woolen/hand.ron
+++ b/assets/common/items/armor/cloth/woolen/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Woolen Gloves",
+ name: "Woolen Mittens",
description: "Thick and ready for the snow.",
kind: Armor((
kind: Hand("Woolen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 cd2f6f409c..d026746fd7 100644
--- a/assets/common/items/armor/cloth/woolen/pants.ron
+++ b/assets/common/items/armor/cloth/woolen/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 e3f623097c..e828b60da2 100644
--- a/assets/common/items/armor/cloth/woolen/shoulder.ron
+++ b/assets/common/items/armor/cloth/woolen/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Woolen Shoulderpads",
+ name: "Woolen Shoulders",
description: "Thick and ready for the snow.",
kind: Armor((
kind: Shoulder("Woolen"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Wool,
- )),
+ 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 ac6c1c2ee7..be9e326394 100644
--- a/assets/common/items/armor/cloth_blue/belt.ron
+++ b/assets/common/items/armor/cloth_blue/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 c9cab9d70e..f0c3aa6060 100644
--- a/assets/common/items/armor/cloth_blue/chest.ron
+++ b/assets/common/items/armor/cloth_blue/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 951d15bc18..6db6f8ef9c 100644
--- a/assets/common/items/armor/cloth_blue/foot.ron
+++ b/assets/common/items/armor/cloth_blue/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 02f5ea6473..48f8f75cfb 100644
--- a/assets/common/items/armor/cloth_blue/hand.ron
+++ b/assets/common/items/armor/cloth_blue/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 9922a37593..859a419277 100644
--- a/assets/common/items/armor/cloth_blue/pants.ron
+++ b/assets/common/items/armor/cloth_blue/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 106194b3eb..be4980efd7 100644
--- a/assets/common/items/armor/cloth_blue/shoulder_0.ron
+++ b/assets/common/items/armor/cloth_blue/shoulder_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 659fd32963..e74bedf405 100644
--- a/assets/common/items/armor/cloth_blue/shoulder_1.ron
+++ b/assets/common/items/armor/cloth_blue/shoulder_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 4f6f96a256..a3cc2a2b70 100644
--- a/assets/common/items/armor/cloth_green/belt.ron
+++ b/assets/common/items/armor/cloth_green/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 8f428b749d..1b0edabb45 100644
--- a/assets/common/items/armor/cloth_green/chest.ron
+++ b/assets/common/items/armor/cloth_green/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 ba89ad5b75..2701a00c1f 100644
--- a/assets/common/items/armor/cloth_green/foot.ron
+++ b/assets/common/items/armor/cloth_green/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 bc91e28431..e135a6a0b8 100644
--- a/assets/common/items/armor/cloth_green/hand.ron
+++ b/assets/common/items/armor/cloth_green/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 728b16a68b..1237650408 100644
--- a/assets/common/items/armor/cloth_green/pants.ron
+++ b/assets/common/items/armor/cloth_green/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 32a1d0ad51..4693dd03af 100644
--- a/assets/common/items/armor/cloth_green/shoulder.ron
+++ b/assets/common/items/armor/cloth_green/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 367857a6b4..d44a27b125 100644
--- a/assets/common/items/armor/cloth_purple/belt.ron
+++ b/assets/common/items/armor/cloth_purple/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 bc6e170a1d..25105be0b3 100644
--- a/assets/common/items/armor/cloth_purple/chest.ron
+++ b/assets/common/items/armor/cloth_purple/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 29087b9021..5bb53ab08c 100644
--- a/assets/common/items/armor/cloth_purple/foot.ron
+++ b/assets/common/items/armor/cloth_purple/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 5c554ba7a1..fc332fb2a3 100644
--- a/assets/common/items/armor/cloth_purple/hand.ron
+++ b/assets/common/items/armor/cloth_purple/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 32f2f6907d..dca6cbeb38 100644
--- a/assets/common/items/armor/cloth_purple/pants.ron
+++ b/assets/common/items/armor/cloth_purple/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 6699343957..10cd01eb90 100644
--- a/assets/common/items/armor/cloth_purple/shoulder.ron
+++ b/assets/common/items/armor/cloth_purple/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ 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 2b071be054..29f63a5698 100644
--- a/assets/common/items/armor/ferocious/back.ron
+++ b/assets/common/items/armor/ferocious/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/ferocious/belt.ron b/assets/common/items/armor/ferocious/belt.ron
index e9b3fbbcb8..be133ec43c 100644
--- a/assets/common/items/armor/ferocious/belt.ron
+++ b/assets/common/items/armor/ferocious/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/ferocious/chest.ron b/assets/common/items/armor/ferocious/chest.ron
index 18c0ac94f4..3893d0d38c 100644
--- a/assets/common/items/armor/ferocious/chest.ron
+++ b/assets/common/items/armor/ferocious/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/ferocious/foot.ron b/assets/common/items/armor/ferocious/foot.ron
index 8a42dce336..a1d99434c5 100644
--- a/assets/common/items/armor/ferocious/foot.ron
+++ b/assets/common/items/armor/ferocious/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/ferocious/hand.ron b/assets/common/items/armor/ferocious/hand.ron
index 62062a9af7..bc61877d00 100644
--- a/assets/common/items/armor/ferocious/hand.ron
+++ b/assets/common/items/armor/ferocious/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/ferocious/pants.ron b/assets/common/items/armor/ferocious/pants.ron
index 7997fe0276..e7efdb6a66 100644
--- a/assets/common/items/armor/ferocious/pants.ron
+++ b/assets/common/items/armor/ferocious/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/ferocious/shoulder.ron b/assets/common/items/armor/ferocious/shoulder.ron
index f6bc2e61d8..aa98f57bdb 100644
--- a/assets/common/items/armor/ferocious/shoulder.ron
+++ b/assets/common/items/armor/ferocious/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron
index 780e1ee878..9367861efa 100644
--- a/assets/common/items/armor/hide/carapace/back.ron
+++ b/assets/common/items/armor/hide/carapace/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 1a91492e12..2a8bee369f 100644
--- a/assets/common/items/armor/hide/carapace/belt.ron
+++ b/assets/common/items/armor/hide/carapace/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 0239a4fbfb..5bafdeca22 100644
--- a/assets/common/items/armor/hide/carapace/chest.ron
+++ b/assets/common/items/armor/hide/carapace/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 38c73bd1ba..ccbb417095 100644
--- a/assets/common/items/armor/hide/carapace/foot.ron
+++ b/assets/common/items/armor/hide/carapace/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Carapace Boots",
+ name: "Carapace Treads",
description: "Shell that once shielded a beast.",
kind: Armor((
kind: Foot("Carapace"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 17e90c3d6a..14cbd7fbeb 100644
--- a/assets/common/items/armor/hide/carapace/hand.ron
+++ b/assets/common/items/armor/hide/carapace/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Carapace Gauntlets",
+ name: "Carapace Grips",
description: "Shell that once shielded a beast.",
kind: Armor((
kind: Hand("Carapace"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 98db7669f6..e7160e480e 100644
--- a/assets/common/items/armor/hide/carapace/pants.ron
+++ b/assets/common/items/armor/hide/carapace/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Carapace Chausses",
+ name: "Carapace Leggings",
description: "Shell that once shielded a beast.",
kind: Armor((
kind: Pants("Carapace"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 5544943838..2fa02a649a 100644
--- a/assets/common/items/armor/hide/carapace/shoulder.ron
+++ b/assets/common/items/armor/hide/carapace/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Carapace Shoulder Pad",
+ name: "Carapace Shoulderpads",
description: "Shell that once shielded a beast.",
kind: Armor((
kind: Shoulder("Carapace"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 3171f38986..76d66b0c60 100644
--- a/assets/common/items/armor/hide/dragonscale/back.ron
+++ b/assets/common/items/armor/hide/dragonscale/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Dragonscale cape",
+ name: "Dragonscale Cape",
description: "Power pulses through it.",
kind: Armor((
kind: Back("Dragonscale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 4fdbd247eb..3344db5efc 100644
--- a/assets/common/items/armor/hide/dragonscale/belt.ron
+++ b/assets/common/items/armor/hide/dragonscale/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Dragonscale Belt",
+ name: "Dragonscale Sash",
description: "Power pulses through it.",
kind: Armor((
kind: Belt("Dragonscale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 29e48757f4..ba7f55b2ec 100644
--- a/assets/common/items/armor/hide/dragonscale/chest.ron
+++ b/assets/common/items/armor/hide/dragonscale/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Dragonscale Chest",
+ name: "Dragonscale Chestplate",
description: "Power pulses through it.",
kind: Armor((
kind: Chest("Dragonscale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 221d83d678..ddf85a1e47 100644
--- a/assets/common/items/armor/hide/dragonscale/foot.ron
+++ b/assets/common/items/armor/hide/dragonscale/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Dragonscale Boots",
+ name: "Dragonscale Spurs",
description: "Power pulses through it.",
kind: Armor((
kind: Foot("Dragonscale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 623ccbfa6d..4f980e52bc 100644
--- a/assets/common/items/armor/hide/dragonscale/hand.ron
+++ b/assets/common/items/armor/hide/dragonscale/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 75c8c602bd..548d24aa92 100644
--- a/assets/common/items/armor/hide/dragonscale/pants.ron
+++ b/assets/common/items/armor/hide/dragonscale/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Dragonscale Skirt",
+ name: "Dragonscale Leggings",
description: "Power pulses through it.",
kind: Armor((
kind: Pants("Dragonscale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 11ab2a5f0a..e8afe51b9e 100644
--- a/assets/common/items/armor/hide/dragonscale/shoulder.ron
+++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Dragonscale,
- )),
+ 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 33f181f6a1..002194837a 100644
--- a/assets/common/items/armor/hide/leather/back.ron
+++ b/assets/common/items/armor/hide/leather/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Leather Cape",
+ name: "Leather Cloak",
description: "Swift like the wind.",
kind: Armor((
kind: Back("Leather"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 363d922d7a..9400005b60 100644
--- a/assets/common/items/armor/hide/leather/belt.ron
+++ b/assets/common/items/armor/hide/leather/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 5c65ee107f..d42711cbde 100644
--- a/assets/common/items/armor/hide/leather/chest.ron
+++ b/assets/common/items/armor/hide/leather/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Leather Chest",
+ name: "Leather Chestpiece",
description: "Swift like the wind.",
kind: Armor((
kind: Chest("Leather"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 3e8b4be132..61f7af1904 100644
--- a/assets/common/items/armor/hide/leather/foot.ron
+++ b/assets/common/items/armor/hide/leather/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 2879ba1272..130e7ff73c 100644
--- a/assets/common/items/armor/hide/leather/hand.ron
+++ b/assets/common/items/armor/hide/leather/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 afce390a52..49c83e8a0b 100644
--- a/assets/common/items/armor/hide/leather/head.ron
+++ b/assets/common/items/armor/hide/leather/head.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Leather Leather Cap",
+ name: "Leather Cap",
description: "Swift like the wind.",
kind: Armor((
kind: Head("Leather"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 169eb8a5bf..a91f50960a 100644
--- a/assets/common/items/armor/hide/leather/pants.ron
+++ b/assets/common/items/armor/hide/leather/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 1567f12c60..3c50b67de2 100644
--- a/assets/common/items/armor/hide/leather/shoulder.ron
+++ b/assets/common/items/armor/hide/leather/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 4af4657c11..a74f97a099 100644
--- a/assets/common/items/armor/hide/primal/back.ron
+++ b/assets/common/items/armor/hide/primal/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Primal cape",
+ name: "Primal Cape",
description: "Smithed from hide tougher than steel.",
kind: Armor((
kind: Back("Primal"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 e36ce06325..82443e1f26 100644
--- a/assets/common/items/armor/hide/primal/belt.ron
+++ b/assets/common/items/armor/hide/primal/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Primal Belt",
+ name: "Primal Sash",
description: "Smithed from hide tougher than steel.",
kind: Armor((
kind: Belt("Primal"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 29fae8040c..9d5bd38fb0 100644
--- a/assets/common/items/armor/hide/primal/chest.ron
+++ b/assets/common/items/armor/hide/primal/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 eb3d0b8e9b..83e6a63ec5 100644
--- a/assets/common/items/armor/hide/primal/foot.ron
+++ b/assets/common/items/armor/hide/primal/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 485b33cb27..cce061f2ad 100644
--- a/assets/common/items/armor/hide/primal/hand.ron
+++ b/assets/common/items/armor/hide/primal/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 0fff2445f2..32b82954f9 100644
--- a/assets/common/items/armor/hide/primal/pants.ron
+++ b/assets/common/items/armor/hide/primal/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Primal Chausses",
+ name: "Primal Legs",
description: "Smithed from hide tougher than steel.",
kind: Armor((
kind: Pants("Primal"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 4f4f4b7681..c8be47d3ff 100644
--- a/assets/common/items/armor/hide/primal/shoulder.ron
+++ b/assets/common/items/armor/hide/primal/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Primal Shoulder Pad",
+ name: "Primal Shoulders",
description: "Smithed from hide tougher than steel.",
kind: Armor((
kind: Shoulder("Primal"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Plate,
- )),
+ 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 0b6891b9f8..732058be73 100644
--- a/assets/common/items/armor/hide/rawhide/back.ron
+++ b/assets/common/items/armor/hide/rawhide/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Rawhide Cape",
+ name: "Rawhide Cloak",
description: "'Tightly packed pieces of leather to endure all weather.'",
kind: Armor((
kind: Back("Rawhide"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 6dcaec9159..0d9f047761 100644
--- a/assets/common/items/armor/hide/rawhide/belt.ron
+++ b/assets/common/items/armor/hide/rawhide/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 4f26b207ed..5ec0063b40 100644
--- a/assets/common/items/armor/hide/rawhide/chest.ron
+++ b/assets/common/items/armor/hide/rawhide/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Rawhide Chest",
+ name: "Rawhide Chestpiece",
description: "Tightly packed pieces of leather to endure all weather.",
kind: Armor((
kind: Chest("Rawhide"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 05279de472..a72b5b4e93 100644
--- a/assets/common/items/armor/hide/rawhide/foot.ron
+++ b/assets/common/items/armor/hide/rawhide/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Rawhide Kickers",
+ name: "Rawhide Shoes",
description: "'Tightly packed pieces of leather to endure all weather.",
kind: Armor((
kind: Foot("Rawhide"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 6282ca5bdc..72b997c502 100644
--- a/assets/common/items/armor/hide/rawhide/hand.ron
+++ b/assets/common/items/armor/hide/rawhide/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Rawhide Gauntlets",
+ name: "Rawhide Bracers",
description: "'Tightly packed pieces of leather to endure all weather.'",
kind: Armor((
kind: Hand("Rawhide"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 55835a2cad..08f39a5c19 100644
--- a/assets/common/items/armor/hide/rawhide/pants.ron
+++ b/assets/common/items/armor/hide/rawhide/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Rawhide Pantalons",
+ name: "Rawhide Pants",
description: "'Tightly packed pieces of leather to endure all weather.'",
kind: Armor((
kind: Pants("Rawhide"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 51c779b45c..5e7e75d3dc 100644
--- a/assets/common/items/armor/hide/rawhide/shoulder.ron
+++ b/assets/common/items/armor/hide/rawhide/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Rawhide Guards",
+ name: "Rawhide Shoulderpads",
description: "Tightly packed pieces of leather to endure all weather.",
kind: Armor((
kind: Shoulder("Rawhide"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Rawhide,
- )),
+ 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 107ce92535..9451c91c6e 100644
--- a/assets/common/items/armor/hide/scale/back.ron
+++ b/assets/common/items/armor/hide/scale/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Scale cape",
+ name: "Scale Cape",
description: "Each embedded scale provides protection.",
kind: Armor((
kind: Back("Scale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 cf302f4392..b2a1e21b72 100644
--- a/assets/common/items/armor/hide/scale/belt.ron
+++ b/assets/common/items/armor/hide/scale/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Scale Belt",
+ name: "Scale Girdle",
description: "Each embedded scale provides protection.",
kind: Armor((
kind: Belt("Scale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 d9dc0e6b52..a834b2aa9c 100644
--- a/assets/common/items/armor/hide/scale/chest.ron
+++ b/assets/common/items/armor/hide/scale/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 8cc2f9a2e8..87df449cd3 100644
--- a/assets/common/items/armor/hide/scale/foot.ron
+++ b/assets/common/items/armor/hide/scale/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Scale Boots",
+ name: "Scale Sabatons",
description: "Each embedded scale provides protection.",
kind: Armor((
kind: Foot("Scale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 c2cc691746..213c3ef186 100644
--- a/assets/common/items/armor/hide/scale/hand.ron
+++ b/assets/common/items/armor/hide/scale/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Scale Wraps",
+ name: "Scale Fists",
description: "Each embedded scale provides protection.",
kind: Armor((
kind: Hand("Scale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 8da67cb76a..f6b662b968 100644
--- a/assets/common/items/armor/hide/scale/pants.ron
+++ b/assets/common/items/armor/hide/scale/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Scale Pants",
+ name: "Scale Leggings",
description: "Each embedded scale provides protection.",
kind: Armor((
kind: Pants("Scale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 951b12795a..f194be14b1 100644
--- a/assets/common/items/armor/hide/scale/shoulder.ron
+++ b/assets/common/items/armor/hide/scale/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Scale Shoulders",
+ name: "Scale Shoulderguards",
description: "Each embedded scale provides protection.",
kind: Armor((
kind: Shoulder("Scale"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Scale,
- )),
+ 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 5468764b91..575b1631dd 100644
--- a/assets/common/items/armor/leather_plate/belt.ron
+++ b/assets/common/items/armor/leather_plate/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 fd852cc958..b0a372f567 100644
--- a/assets/common/items/armor/leather_plate/chest.ron
+++ b/assets/common/items/armor/leather_plate/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 8d479223b6..b8b5a7696d 100644
--- a/assets/common/items/armor/leather_plate/foot.ron
+++ b/assets/common/items/armor/leather_plate/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 16d13ba996..833f0acf2c 100644
--- a/assets/common/items/armor/leather_plate/hand.ron
+++ b/assets/common/items/armor/leather_plate/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 fa6d2cee72..b772277709 100644
--- a/assets/common/items/armor/leather_plate/pants.ron
+++ b/assets/common/items/armor/leather_plate/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 82e5eabbf9..9793d6ffbc 100644
--- a/assets/common/items/armor/leather_plate/shoulder.ron
+++ b/assets/common/items/armor/leather_plate/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 7373f8c9fe..db07a7ab5c 100644
--- a/assets/common/items/armor/mail/bloodsteel/back.ron
+++ b/assets/common/items/armor/mail/bloodsteel/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bloodsteel cape",
+ name: "Bloodsteel Cape",
description: "Forged to preserve life, at the cost of another.",
kind: Armor((
kind: Back("Bloodsteel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 292fd2c02b..64a3b2b4bb 100644
--- a/assets/common/items/armor/mail/bloodsteel/belt.ron
+++ b/assets/common/items/armor/mail/bloodsteel/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bloodsteel Belt",
+ name: "Bloodsteel Girdle",
description: "Forged to preserve life, at the cost of another.",
kind: Armor((
kind: Belt("Bloodsteel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 3386aa8b36..bc4054a91f 100644
--- a/assets/common/items/armor/mail/bloodsteel/chest.ron
+++ b/assets/common/items/armor/mail/bloodsteel/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bloodsteel Cuirass",
+ name: "Bloodsteel Chest",
description: "Forged to preserve life, at the cost of another.",
kind: Armor((
kind: Chest("Bloodsteel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 0f199adba0..a71fb6479b 100644
--- a/assets/common/items/armor/mail/bloodsteel/foot.ron
+++ b/assets/common/items/armor/mail/bloodsteel/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bloodsteel Boots",
+ name: "Bloodsteel Sabatons",
description: "Forged to preserve life, at the cost of another.",
kind: Armor((
kind: Foot("Bloodsteel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 9f5ece65d7..6e15054341 100644
--- a/assets/common/items/armor/mail/bloodsteel/hand.ron
+++ b/assets/common/items/armor/mail/bloodsteel/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 6cad049329..0c1d1905ef 100644
--- a/assets/common/items/armor/mail/bloodsteel/pants.ron
+++ b/assets/common/items/armor/mail/bloodsteel/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bloodsteel Chausses",
+ name: "Bloodsteel Legs",
description: "Forged to preserve life, at the cost of another.",
kind: Armor((
kind: Pants("Bloodsteel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 1feefd258a..c869f9a2bb 100644
--- a/assets/common/items/armor/mail/bloodsteel/shoulder.ron
+++ b/assets/common/items/armor/mail/bloodsteel/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bloodsteel Shoulder Pad",
+ name: "Bloodsteel Pauldrons",
description: "Forged to preserve life, at the cost of another.",
kind: Armor((
kind: Shoulder("Bloodsteel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Epic,
tags: [
- Material((
- material: Bloodsteel,
- )),
+ 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 e40e00f37a..3be36b1da9 100644
--- a/assets/common/items/armor/mail/bronze/back.ron
+++ b/assets/common/items/armor/mail/bronze/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bronze Cape",
+ name: "Bronze Cloak",
description: "'Heavy and dull, but it can take a punch.'",
kind: Armor((
kind: Back("Bronze"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 0609f1e30a..35e8756325 100644
--- a/assets/common/items/armor/mail/bronze/belt.ron
+++ b/assets/common/items/armor/mail/bronze/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bronze Belt",
+ name: "Bronze Girdle",
description: "'Heavy and dull, but it can take a punch.'",
kind: Armor((
kind: Belt("Bronze"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 ea85e4f285..e6f24ce105 100644
--- a/assets/common/items/armor/mail/bronze/chest.ron
+++ b/assets/common/items/armor/mail/bronze/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bronze Chest",
+ name: "Bronze Chestguard",
description: "Heavy and dull, but it can take a punch.",
kind: Armor((
kind: Chest("Bronze"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 6a6c71563c..609e33f84d 100644
--- a/assets/common/items/armor/mail/bronze/foot.ron
+++ b/assets/common/items/armor/mail/bronze/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Bronze Kickers",
+ name: "Bronze Shoes",
description: "'Heavy and dull, but it can take a punch.",
kind: Armor((
kind: Foot("Bronze"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 9597a15da5..a8886831e0 100644
--- a/assets/common/items/armor/mail/bronze/hand.ron
+++ b/assets/common/items/armor/mail/bronze/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 df11ae9bc3..dd609c684b 100644
--- a/assets/common/items/armor/mail/bronze/pants.ron
+++ b/assets/common/items/armor/mail/bronze/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 321e8d629d..083ef4dbf7 100644
--- a/assets/common/items/armor/mail/bronze/shoulder.ron
+++ b/assets/common/items/armor/mail/bronze/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Bronze,
- )),
+ 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 2b5fcbd789..5407f63807 100644
--- a/assets/common/items/armor/mail/cobalt/back.ron
+++ b/assets/common/items/armor/mail/cobalt/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 e1b0244d55..7835d36e2c 100644
--- a/assets/common/items/armor/mail/cobalt/belt.ron
+++ b/assets/common/items/armor/mail/cobalt/belt.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Cobalt Belt",
+ name: "Cobalt Girdle",
description: "Ornamental and impenetrable, the metal will never dull.",
kind: Armor((
kind: Belt("Cobalt"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 11d71b5162..10fa067154 100644
--- a/assets/common/items/armor/mail/cobalt/chest.ron
+++ b/assets/common/items/armor/mail/cobalt/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Cobalt Cuirass",
+ name: "Cobalt Chestpiece",
description: "Ornamental and impenetrable, the metal will never dull.",
kind: Armor((
kind: Chest("Cobalt"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 54c219f2f4..2ff9df2621 100644
--- a/assets/common/items/armor/mail/cobalt/foot.ron
+++ b/assets/common/items/armor/mail/cobalt/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Cobalt Boots",
+ name: "Cobalt Footguards",
description: "Ornamental and impenetrable, the metal will never dull.",
kind: Armor((
kind: Foot("Cobalt"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 2c95b0e679..25b7386220 100644
--- a/assets/common/items/armor/mail/cobalt/hand.ron
+++ b/assets/common/items/armor/mail/cobalt/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 45ce1a1e3f..286ba27805 100644
--- a/assets/common/items/armor/mail/cobalt/pants.ron
+++ b/assets/common/items/armor/mail/cobalt/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Cobalt Chausses",
+ name: "Cobalt Leggings",
description: "Ornamental and impenetrable, the metal will never dull.",
kind: Armor((
kind: Pants("Cobalt"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 f39b77083d..df341d9d82 100644
--- a/assets/common/items/armor/mail/cobalt/shoulder.ron
+++ b/assets/common/items/armor/mail/cobalt/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Cobalt Shoulder Pad",
+ name: "Cobalt Shoulderguards",
description: "Ornamental and impenetrable, the metal will never dull.",
kind: Armor((
kind: Shoulder("Cobalt"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Cobalt,
- )),
+ 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 12656b9eb2..7e75ddda58 100644
--- a/assets/common/items/armor/mail/iron/back.ron
+++ b/assets/common/items/armor/mail/iron/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Iron Cape",
+ name: "Iron Cloak",
description: "Sturdy and unyielding, across ages of war.",
kind: Armor((
kind: Back("Iron"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 e5104d60ff..a1bf818a80 100644
--- a/assets/common/items/armor/mail/iron/belt.ron
+++ b/assets/common/items/armor/mail/iron/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 3202665752..e2af1ac18a 100644
--- a/assets/common/items/armor/mail/iron/chest.ron
+++ b/assets/common/items/armor/mail/iron/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Iron Chest",
+ name: "Iron Chestguard",
description: "Sturdy and unyielding, across ages of war.",
kind: Armor((
kind: Chest("Iron"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 5ac34082c5..2bdc21ef4f 100644
--- a/assets/common/items/armor/mail/iron/foot.ron
+++ b/assets/common/items/armor/mail/iron/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Iron Boots",
+ name: "Iron Footguards",
description: "Sturdy and unyielding, across ages of war.",
kind: Armor((
kind: Foot("Iron"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 c38fcccf67..0dd23f895c 100644
--- a/assets/common/items/armor/mail/iron/hand.ron
+++ b/assets/common/items/armor/mail/iron/hand.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Iron Gloves",
+ name: "Iron Fists",
description: "Sturdy and unyielding, across ages of war.",
kind: Armor((
kind: Hand("Iron"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 37eb57a835..b51e6b9ef5 100644
--- a/assets/common/items/armor/mail/iron/pants.ron
+++ b/assets/common/items/armor/mail/iron/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 b4ef73a9ee..c624e221cf 100644
--- a/assets/common/items/armor/mail/iron/shoulder.ron
+++ b/assets/common/items/armor/mail/iron/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Iron,
- )),
+ 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 66a79f7800..de67c4ffcc 100644
--- a/assets/common/items/armor/mail/orichalcum/back.ron
+++ b/assets/common/items/armor/mail/orichalcum/back.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Orichalcum cape",
+ name: "Orichalcum Cape",
description: "An ancient alloy. Myths remain of heroes who wore this metal.",
kind: Armor((
kind: Back("Orichalcum"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 949fe90341..08c3a3a397 100644
--- a/assets/common/items/armor/mail/orichalcum/belt.ron
+++ b/assets/common/items/armor/mail/orichalcum/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 e176cd8f08..5889e3608e 100644
--- a/assets/common/items/armor/mail/orichalcum/chest.ron
+++ b/assets/common/items/armor/mail/orichalcum/chest.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Orichalcum Chest",
+ name: "Orichalcum Chestguard",
description: "An ancient alloy. Myths remain of heroes who wore this metal.",
kind: Armor((
kind: Chest("Orichalcum"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 005fb95b75..12b0daefb6 100644
--- a/assets/common/items/armor/mail/orichalcum/foot.ron
+++ b/assets/common/items/armor/mail/orichalcum/foot.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Orichalcum Boots",
+ name: "Orichalcum Warboots",
description: "An ancient alloy. Myths remain of heroes who wore this metal.",
kind: Armor((
kind: Foot("Orichalcum"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 94e2c03500..6eacd8bec6 100644
--- a/assets/common/items/armor/mail/orichalcum/hand.ron
+++ b/assets/common/items/armor/mail/orichalcum/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 57407d6a08..60f911561c 100644
--- a/assets/common/items/armor/mail/orichalcum/pants.ron
+++ b/assets/common/items/armor/mail/orichalcum/pants.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Orichalcum Skirt",
+ name: "Orichalcum Legplates",
description: "An ancient alloy. Myths remain of heroes who wore this metal.",
kind: Armor((
kind: Pants("Orichalcum"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 984262a6d1..8accbd2e19 100644
--- a/assets/common/items/armor/mail/orichalcum/shoulder.ron
+++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Legendary,
tags: [
- Material((
- material: Orichalcum,
- )),
+ 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 48c9f43213..35ed95ae3c 100644
--- a/assets/common/items/armor/mail/steel/back.ron
+++ b/assets/common/items/armor/mail/steel/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ 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 f5354a05b3..ee915840ab 100644
--- a/assets/common/items/armor/mail/steel/belt.ron
+++ b/assets/common/items/armor/mail/steel/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ 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 0dd02633a0..242e129839 100644
--- a/assets/common/items/armor/mail/steel/chest.ron
+++ b/assets/common/items/armor/mail/steel/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ 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 0a23bb79e9..c26bbbfda8 100644
--- a/assets/common/items/armor/mail/steel/foot.ron
+++ b/assets/common/items/armor/mail/steel/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ 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 b51b00c8d2..2e63c0663d 100644
--- a/assets/common/items/armor/mail/steel/hand.ron
+++ b/assets/common/items/armor/mail/steel/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ 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 e7b639a8a7..71b662f762 100644
--- a/assets/common/items/armor/mail/steel/pants.ron
+++ b/assets/common/items/armor/mail/steel/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ 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 1f40bc73e2..1fbe069230 100644
--- a/assets/common/items/armor/mail/steel/shoulder.ron
+++ b/assets/common/items/armor/mail/steel/shoulder.ron
@@ -1,5 +1,5 @@
ItemDef(
- name: "Steel Shoulder Pad",
+ name: "Steel Shoulders",
description: "The metal alloy plates provide better protection and comfort.",
kind: Armor((
kind: Shoulder("Steel"),
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Steel,
- )),
+ Material(Steel),
],
)
\ 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 7b8f097efd..dad6f6c043 100644
--- a/assets/common/items/armor/misc/back/short_1.ron
+++ b/assets/common/items/armor/misc/back/short_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 2618a4a1ae..ef1bcbb707 100644
--- a/assets/common/items/armor/misc/chest/worker_green_0.ron
+++ b/assets/common/items/armor/misc/chest/worker_green_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 f014f3973d..e51e53482d 100644
--- a/assets/common/items/armor/misc/chest/worker_green_1.ron
+++ b/assets/common/items/armor/misc/chest/worker_green_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 3179dbc0be..f6bd0040d9 100644
--- a/assets/common/items/armor/misc/chest/worker_orange_0.ron
+++ b/assets/common/items/armor/misc/chest/worker_orange_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 d6b2cce841..d23dd4a42a 100644
--- a/assets/common/items/armor/misc/chest/worker_orange_1.ron
+++ b/assets/common/items/armor/misc/chest/worker_orange_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 dfd5acd8e6..745ccb17cf 100644
--- a/assets/common/items/armor/misc/chest/worker_purple_0.ron
+++ b/assets/common/items/armor/misc/chest/worker_purple_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 5bbd65b191..3ed911dda6 100644
--- a/assets/common/items/armor/misc/chest/worker_purple_1.ron
+++ b/assets/common/items/armor/misc/chest/worker_purple_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 daf9547d28..cc4f7355de 100644
--- a/assets/common/items/armor/misc/chest/worker_purple_brown.ron
+++ b/assets/common/items/armor/misc/chest/worker_purple_brown.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 c49c588151..9ea9a39050 100644
--- a/assets/common/items/armor/misc/chest/worker_red_0.ron
+++ b/assets/common/items/armor/misc/chest/worker_red_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 78b4e65173..cea4e98d91 100644
--- a/assets/common/items/armor/misc/chest/worker_red_1.ron
+++ b/assets/common/items/armor/misc/chest/worker_red_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 e809cec031..6d90b6dd88 100644
--- a/assets/common/items/armor/misc/chest/worker_yellow_0.ron
+++ b/assets/common/items/armor/misc/chest/worker_yellow_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 aa614616f0..1d61d98d0d 100644
--- a/assets/common/items/armor/misc/chest/worker_yellow_1.ron
+++ b/assets/common/items/armor/misc/chest/worker_yellow_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ Material(Linen),
],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/misc/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron
index ab37ab5266..fbaea0b013 100644
--- a/assets/common/items/armor/misc/foot/jackalope_slippers.ron
+++ b/assets/common/items/armor/misc/foot/jackalope_slippers.ron
@@ -13,5 +13,7 @@ ItemDef(
),
)),
quality: High,
- tags: [],
+ tags: [
+ Material(Linen)
+ ],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron
index b66e718c72..0cd499d92f 100644
--- a/assets/common/items/armor/misc/foot/sandals.ron
+++ b/assets/common/items/armor/misc/foot/sandals.ron
@@ -13,5 +13,7 @@ ItemDef(
),
)),
quality: Low,
- tags: [],
+ tags: [
+ Material(Linen)
+ ],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/misc/neck/plain_0.ron b/assets/common/items/armor/misc/neck/plain_0.ron
index 8d43a5c3c1..6e860542cb 100644
--- a/assets/common/items/armor/misc/neck/plain_0.ron
+++ b/assets/common/items/armor/misc/neck/plain_0.ron
@@ -13,5 +13,7 @@ ItemDef(
),
)),
quality: Common,
- tags: [],
+ tags: [
+ Material(Iron)
+ ],
)
\ No newline at end of file
diff --git a/assets/common/items/armor/misc/neck/plain_1.ron b/assets/common/items/armor/misc/neck/plain_1.ron
index 3e10f5c2e1..a99a5772e0 100644
--- a/assets/common/items/armor/misc/neck/plain_1.ron
+++ b/assets/common/items/armor/misc/neck/plain_1.ron
@@ -13,5 +13,7 @@ ItemDef(
),
)),
quality: Moderate,
- tags: [],
+ tags: [
+ Material(Steel)
+ ],
)
\ 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 e4e6ebe014..b2696a4f84 100644
--- a/assets/common/items/armor/misc/pants/worker_blue.ron
+++ b/assets/common/items/armor/misc/pants/worker_blue.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 ba821a071b..4bf4bc249a 100644
--- a/assets/common/items/armor/misc/pants/worker_brown.ron
+++ b/assets/common/items/armor/misc/pants/worker_brown.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 ba23c22979..e39dd295dc 100644
--- a/assets/common/items/armor/misc/shoulder/iron_spikes.ron
+++ b/assets/common/items/armor/misc/shoulder/iron_spikes.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Iron,
- )),
+ 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 0409cb4374..b141da6d8b 100644
--- a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron
+++ b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 9e277f8a68..5a27ef132e 100644
--- a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron
+++ b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 d25233a3b6..19fac3e0ff 100644
--- a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron
+++ b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 75e6713591..e18bd09c8a 100644
--- a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron
+++ b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Leather,
- )),
+ 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 75f0d16ff5..a24390a970 100644
--- a/assets/common/items/armor/rugged/chest.ron
+++ b/assets/common/items/armor/rugged/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 1cef62435f..1c92363cb6 100644
--- a/assets/common/items/armor/rugged/pants.ron
+++ b/assets/common/items/armor/rugged/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Low,
tags: [
- Material((
- material: Linen,
- )),
+ 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 d2b7e899e7..4ff8843337 100644
--- a/assets/common/items/armor/savage/back.ron
+++ b/assets/common/items/armor/savage/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 5215277503..8180c6add8 100644
--- a/assets/common/items/armor/savage/belt.ron
+++ b/assets/common/items/armor/savage/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 b43fc2253d..d05f9467f3 100644
--- a/assets/common/items/armor/savage/chest.ron
+++ b/assets/common/items/armor/savage/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 2d381e672c..e2ee8bf8c0 100644
--- a/assets/common/items/armor/savage/foot.ron
+++ b/assets/common/items/armor/savage/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Leather,
- )),
+ 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 364aee20ef..8b42a39fff 100644
--- a/assets/common/items/armor/savage/hand.ron
+++ b/assets/common/items/armor/savage/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 74db4685f4..ec1cffbfb3 100644
--- a/assets/common/items/armor/savage/pants.ron
+++ b/assets/common/items/armor/savage/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 3636b99050..ef8868ebe0 100644
--- a/assets/common/items/armor/savage/shoulder.ron
+++ b/assets/common/items/armor/savage/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Leather,
- )),
+ 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 e55c7e2891..bec335cfca 100644
--- a/assets/common/items/armor/tarasque/belt.ron
+++ b/assets/common/items/armor/tarasque/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 d9b2dd52c9..7078c48691 100644
--- a/assets/common/items/armor/tarasque/chest.ron
+++ b/assets/common/items/armor/tarasque/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 a91f5d65a0..6446cc7576 100644
--- a/assets/common/items/armor/tarasque/foot.ron
+++ b/assets/common/items/armor/tarasque/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 93f000be67..423489dc8d 100644
--- a/assets/common/items/armor/tarasque/hand.ron
+++ b/assets/common/items/armor/tarasque/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 175aa3a450..de5e7d3717 100644
--- a/assets/common/items/armor/tarasque/pants.ron
+++ b/assets/common/items/armor/tarasque/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 4fbaa7af20..ceb89a009b 100644
--- a/assets/common/items/armor/tarasque/shoulder.ron
+++ b/assets/common/items/armor/tarasque/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Carapace,
- )),
+ 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 970b44f95f..6885ac974c 100644
--- a/assets/common/items/armor/twigs/belt.ron
+++ b/assets/common/items/armor/twigs/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 8579cfbe29..ad24330739 100644
--- a/assets/common/items/armor/twigs/chest.ron
+++ b/assets/common/items/armor/twigs/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 830e76ed87..70bcd18c7d 100644
--- a/assets/common/items/armor/twigs/foot.ron
+++ b/assets/common/items/armor/twigs/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 6d30dea7d3..43606e85b8 100644
--- a/assets/common/items/armor/twigs/hand.ron
+++ b/assets/common/items/armor/twigs/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 bc8e938a38..3db5dd1ed8 100644
--- a/assets/common/items/armor/twigs/pants.ron
+++ b/assets/common/items/armor/twigs/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 309cad0e00..304f1c591a 100644
--- a/assets/common/items/armor/twigs/shoulder.ron
+++ b/assets/common/items/armor/twigs/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 e251ce22c2..1cac07f5ee 100644
--- a/assets/common/items/armor/twigsflowers/belt.ron
+++ b/assets/common/items/armor/twigsflowers/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 b98ca6bd41..5a4ce01513 100644
--- a/assets/common/items/armor/twigsflowers/chest.ron
+++ b/assets/common/items/armor/twigsflowers/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 d269d06692..8186335677 100644
--- a/assets/common/items/armor/twigsflowers/foot.ron
+++ b/assets/common/items/armor/twigsflowers/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 1314d2d1d0..037d979a0c 100644
--- a/assets/common/items/armor/twigsflowers/hand.ron
+++ b/assets/common/items/armor/twigsflowers/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 828907bfe0..459aaed2ec 100644
--- a/assets/common/items/armor/twigsflowers/pants.ron
+++ b/assets/common/items/armor/twigsflowers/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 4e96198c08..33d5791d23 100644
--- a/assets/common/items/armor/twigsflowers/shoulder.ron
+++ b/assets/common/items/armor/twigsflowers/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 9eaf1ba22b..7ae7843ead 100644
--- a/assets/common/items/armor/twigsleaves/belt.ron
+++ b/assets/common/items/armor/twigsleaves/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 d4fef357ba..07da87ed9f 100644
--- a/assets/common/items/armor/twigsleaves/chest.ron
+++ b/assets/common/items/armor/twigsleaves/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 9da5d853fc..05cdb9f779 100644
--- a/assets/common/items/armor/twigsleaves/foot.ron
+++ b/assets/common/items/armor/twigsleaves/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 6709a7ec8f..2e30872111 100644
--- a/assets/common/items/armor/twigsleaves/hand.ron
+++ b/assets/common/items/armor/twigsleaves/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 18e706e0d1..12df18e8e2 100644
--- a/assets/common/items/armor/twigsleaves/pants.ron
+++ b/assets/common/items/armor/twigsleaves/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Moderate,
tags: [
- Material((
- material: Linen,
- )),
+ 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 d3c7b99a13..53654ac120 100644
--- a/assets/common/items/armor/twigsleaves/shoulder.ron
+++ b/assets/common/items/armor/twigsleaves/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: Common,
tags: [
- Material((
- material: Linen,
- )),
+ 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 73b1b4669a..b0975a7b64 100644
--- a/assets/common/items/armor/velorite_mage/back.ron
+++ b/assets/common/items/armor/velorite_mage/back.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 008ca0c962..8e64b58013 100644
--- a/assets/common/items/armor/velorite_mage/belt.ron
+++ b/assets/common/items/armor/velorite_mage/belt.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 e9332b663e..564c8e7eff 100644
--- a/assets/common/items/armor/velorite_mage/chest.ron
+++ b/assets/common/items/armor/velorite_mage/chest.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 f35c811859..0372f571d3 100644
--- a/assets/common/items/armor/velorite_mage/foot.ron
+++ b/assets/common/items/armor/velorite_mage/foot.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 612adf2789..6fde6c22b1 100644
--- a/assets/common/items/armor/velorite_mage/hand.ron
+++ b/assets/common/items/armor/velorite_mage/hand.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 cbf80e35e7..7312ec25c2 100644
--- a/assets/common/items/armor/velorite_mage/pants.ron
+++ b/assets/common/items/armor/velorite_mage/pants.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 69b3d33b7d..6fdeaf8376 100644
--- a/assets/common/items/armor/velorite_mage/shoulder.ron
+++ b/assets/common/items/armor/velorite_mage/shoulder.ron
@@ -14,8 +14,6 @@ ItemDef(
)),
quality: High,
tags: [
- Material((
- material: Velorite,
- )),
+ 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 0f92f4b9eb..d6d68e6264 100644
--- a/assets/common/items/crafting_ing/hide/animal_hide.ron
+++ b/assets/common/items/crafting_ing/hide/animal_hide.ron
@@ -5,5 +5,7 @@ ItemDef(
kind: "AnimalHide",
),
quality: Common,
- tags: [Material((material: Leather))],
+ tags: [
+ Material(Leather)
+ ],
)
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/hide/rugged_hide.ron b/assets/common/items/crafting_ing/hide/rugged_hide.ron
index 81877a3987..0c8bcc29d7 100644
--- a/assets/common/items/crafting_ing/hide/rugged_hide.ron
+++ b/assets/common/items/crafting_ing/hide/rugged_hide.ron
@@ -5,5 +5,7 @@ ItemDef(
kind: "RuggedHide",
),
quality: Common,
- tags: [Material((material: Leather))],
+ tags: [
+ 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 b13c839595..c9c1c4d5c7 100644
--- a/assets/common/items/crafting_ing/hide/tough_hide.ron
+++ b/assets/common/items/crafting_ing/hide/tough_hide.ron
@@ -5,5 +5,7 @@ ItemDef(
kind: "ToughHide",
),
quality: Common,
- tags: [Material((material: Leather))],
+ tags: [
+ Material(Leather)
+ ],
)
\ No newline at end of file
diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron
index d3791f31fc..f68e7960bd 100644
--- a/assets/common/recipe_book.ron
+++ b/assets/common/recipe_book.ron
@@ -307,7 +307,7 @@
inputs: [
(Item("common.items.crafting_ing.animal_misc.lively_vine"), 1),
(Item("common.items.crafting_ing.cloth.cotton"), 1),
- ],
+ ],
craft_sprite: Some(SpinningWheel),
),
"moonweave": (
@@ -1690,7 +1690,7 @@
"tin pickaxe": (
output: ("common.items.tool.pickaxe_stone", 1),
inputs: [
- (Item("common.items.crafting_ing.cloth.linen"), 1),
+ (Item("common.items.crafting_ing.cloth.linen"), 1),
(Item("common.items.crafting_ing.stones"), 5),
(Item("common.items.tool.craftsman_hammer"), 0),
],
@@ -1699,7 +1699,7 @@
"steel pickaxe": (
output: ("common.items.tool.pickaxe_steel", 1),
inputs: [
- (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+ (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.mineral.ingot.steel"), 5),
(Item("common.items.tool.craftsman_hammer"), 0),
],
@@ -1708,42 +1708,42 @@
"linen": (
output: ("common.items.crafting_ing.cloth.linen", 1),
inputs: [
- (Tag(Material((material: Linen))), 1),
+ (Tag(Material(Linen)), 1),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
),
"wool": (
output: ("common.items.crafting_ing.cloth.wool", 1),
inputs: [
- (Tag(Material((material: Wool))), 1),
+ (Tag(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),
+ (Tag(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),
+ (Tag(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),
+ (Tag(Material(Bronze)), 1),
],
craft_sprite: Some(Anvil),
),
"iron": (
output: ("common.items.mineral.ingot.iron", 1),
inputs: [
- (Tag(Material((material: Iron))), 1),
+ (Tag(Material(Iron)), 1),
],
craft_sprite: Some(Anvil),
),
diff --git a/assets/voxygen/element/ui/crafting/icons/materials.png b/assets/voxygen/element/ui/crafting/icons/processed_material.png
similarity index 100%
rename from assets/voxygen/element/ui/crafting/icons/materials.png
rename to assets/voxygen/element/ui/crafting/icons/processed_material.png
diff --git a/assets/voxygen/i18n/en/hud/crafting.ron b/assets/voxygen/i18n/en/hud/crafting.ron
index 0e9a767784..f702b1540f 100644
--- a/assets/voxygen/i18n/en/hud/crafting.ron
+++ b/assets/voxygen/i18n/en/hud/crafting.ron
@@ -29,7 +29,7 @@
"hud.crafting.tabs.utility": "Utility",
"hud.crafting.tabs.weapon": "Weapons",
"hud.crafting.tabs.bag": "Bags",
- "hud.crafting.tabs.material": "Materials",
+ "hud.crafting.tabs.processed_material": "Materials",
},
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index fc4220e579..64583dfa60 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -28,6 +28,7 @@ use serde::{de, Deserialize, Serialize, Serializer};
use specs::{Component, DerefFlaggedStorage};
use specs_idvs::IdvStorage;
use std::{fmt, sync::Arc};
+use strum_macros::IntoStaticStr;
use tracing::error;
use vek::Rgb;
@@ -100,7 +101,8 @@ pub enum MaterialKind {
Hide,
}
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, IntoStaticStr)]
+#[strum(serialize_all = "snake_case")]
pub enum Material {
Bronze,
Iron,
@@ -172,6 +174,7 @@ impl Material {
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
pub struct MaterialTag {
material: Material,
}
@@ -181,40 +184,7 @@ impl MaterialTag {
}
impl TagExampleInfo for MaterialTag {
- fn name(&self) -> &'static str {
- match self.material {
- 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 name(&self) -> &'static str { self.material.into() }
fn exemplar_identifier(&self) -> &'static str { "common.items.tag_examples.placeholder" }
}
diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs
index 29eda00fba..d2d34f96e5 100644
--- a/voxygen/src/hud/crafting.rs
+++ b/voxygen/src/hud/crafting.rs
@@ -147,7 +147,7 @@ pub enum CraftingTab {
Tool,
Utility,
Glider,
- Material,
+ ProcessedMaterial,
}
impl CraftingTab {
fn name_key(&self) -> &str {
@@ -162,7 +162,7 @@ impl CraftingTab {
CraftingTab::Utility => "hud.crafting.tabs.utility",
CraftingTab::Weapon => "hud.crafting.tabs.weapon",
CraftingTab::Bag => "hud.crafting.tabs.bag",
- CraftingTab::Material => "hud.crafting.tabs.material",
+ CraftingTab::ProcessedMaterial => "hud.crafting.tabs.processed_material",
}
}
@@ -178,7 +178,7 @@ impl CraftingTab {
CraftingTab::Utility => imgs.icon_utility,
CraftingTab::Weapon => imgs.icon_weapon,
CraftingTab::Bag => imgs.icon_bag,
- CraftingTab::Material => imgs.icon_material,
+ CraftingTab::ProcessedMaterial => imgs.icon_processed_material,
}
}
@@ -192,7 +192,7 @@ impl CraftingTab {
},
CraftingTab::Glider => matches!(item.kind(), ItemKind::Glider(_)),
CraftingTab::Potion => item.tags().contains(&ItemTag::Potion),
- CraftingTab::Material => {
+ CraftingTab::ProcessedMaterial => {
item.tags().contains(&ItemTag::MetalIngot)
| item.tags().contains(&ItemTag::Textile)
| item.tags().contains(&ItemTag::Leather)
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 1abff67ca1..f4ab8b2ec1 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -107,7 +107,7 @@ image_ids! {
icon_utility: "voxygen.element.ui.crafting.icons.utilities",
icon_weapon: "voxygen.element.ui.crafting.icons.weapons",
icon_bag: "voxygen.element.items.item_bag_leather_large",
- icon_material: "voxygen.element.ui.crafting.icons.materials",
+ icon_processed_material: "voxygen.element.ui.crafting.icons.processed_material",
// Group Window
member_frame: "voxygen.element.ui.groups.group_member_frame",
diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs
index da42e2a9a9..5544ca9c03 100644
--- a/voxygen/src/scene/terrain/watcher.rs
+++ b/voxygen/src/scene/terrain/watcher.rs
@@ -125,9 +125,8 @@ impl BlocksOfInterest {
Some(SpriteKind::Forge) => {
interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle)))
},
- Some(SpriteKind::TanningRack) => {
- interactables.push((pos, Interaction::Craft(CraftingTab::Material)))
- },
+ Some(SpriteKind::TanningRack) => interactables
+ .push((pos, Interaction::Craft(CraftingTab::ProcessedMaterial))),
Some(SpriteKind::SpinningWheel) => {
interactables.push((pos, Interaction::Craft(CraftingTab::All)))
},