Merge branch 'sam/indirect-armor' into 'master'

Armor stats from set

See merge request veloren/veloren!3411

.cargo/config

@@ -21,3 +21,4 @@ tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features trac
 dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
 # misc
 swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
+ci-clippy = "clippy --all-targets --locked --features=bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak"

assets/common/items/armor/alchemist/belt.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Alchemist"),
-            protection: Some(Normal(8.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(2.0),
-            energy_reward: Some(0.025),
-            crit_power: Some(0.02),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/alchemist/chest.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Alchemist"),
-            protection: Some(Normal(48.0)),
-            poise_resilience: Some(Normal(6.0)),
-            energy_max: Some(13.5),
-            energy_reward: Some(0.135),
-            crit_power: Some(0.125),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/alchemist/hat.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "It seems like a parrot was perched up here.",
     kind: Armor((
         kind: Head,
-        stats: (
+        stats: FromSet("Alchemist"),
-            protection: Some(Normal(4.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(1.0),
-            energy_reward: Some(0.015),
-            crit_power: Some(0.02),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/alchemist/pants.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Alchemist"),
-            protection: Some(Normal(32.0)),
-            poise_resilience: Some(Normal(4.0)),
-            energy_max: Some(9.0),
-            energy_reward: Some(0.1),
-            crit_power: Some(0.08),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/assassin/belt.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Only the best for a member of the creed.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Assassin"),
-            protection: Some(Normal(2.0)),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/assassin/chest.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Only the best for a member of the creed.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Assassin"),
-            protection: Some(Normal(15.0)),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/assassin/foot.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Only the best for a member of the creed.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Assassin"),
-            protection: Some(Normal(4.0)),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/assassin/hand.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Only the best for a member of the creed.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Assassin"),
-            protection: Some(Normal(6.0)),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/assassin/head.ron

@@ -3,8 +3,8 @@ ItemDef(
     description: "A general assassination mask preventing the wearer from being identified.",
     kind: Armor((
         kind: Head,
-        stats: (
+        stats: Direct((
-        ),
+        )),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/assassin/pants.ron

@@ -3,10 +3,7 @@ ItemDef(
     description: "Only the best for a member of the creed.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Assassin"),
-            protection: Some(Normal(10.0)),
-            poise_resilience: Some(Normal(1.0)),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/assassin/shoulder.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Only the best for a member of the creed.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Assassin"),
-            protection: Some(Normal(8.0)),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/blacksmith/belt.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Blacksmith"),
-            protection: Some(Normal(8.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(2.0),
-            energy_reward: Some(0.025),
-            crit_power: Some(0.02),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/blacksmith/chest.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Blacksmith"),
-            protection: Some(Normal(48.0)),
-            poise_resilience: Some(Normal(6.0)),
-            energy_max: Some(13.5),
-            energy_reward: Some(0.135),
-            crit_power: Some(0.125),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/blacksmith/hand.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Blacksmith"),
-            protection: Some(Normal(16.0)),
-            poise_resilience: Some(Normal(2.0)),
-            energy_max: Some(4.5),
-            energy_reward: Some(0.045),
-            crit_power: Some(0.04),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/blacksmith/hat.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Head,
-        stats: (
+        stats: FromSet("Blacksmith"),
-            protection: Some(Normal(4.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(1.0),
-            energy_reward: Some(0.015),
-            crit_power: Some(0.02),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/blacksmith/pants.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Blacksmith"),
-            protection: Some(Normal(32.0)),
-            poise_resilience: Some(Normal(4.0)),
-            energy_max: Some(9.0),
-            energy_reward: Some(0.1),
-            crit_power: Some(0.08),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/bonerattler/belt.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Sections of vertebrae fastened together with hide and a bonerattler eye for the buckle.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Bonerattler"),
-            protection: Some(Normal(3.0)),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/bonerattler/chest.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "The spiny back and hide of a bonerattler fastened together into a protective cuirass.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Bonerattler"),
-            protection: Some(Normal(25.0)),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/bonerattler/foot.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Boots made from the claws and hide of a bonerattler.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Bonerattler"),
-            protection: Some(Normal(5.0)),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/bonerattler/hand.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "The hide and bone from a bonerattler provide strong protection for the wearer.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Bonerattler"),
-            protection: Some(Normal(10.0)),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/bonerattler/pants.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Assorted bones and hide from a bonerattler provide protection around the wearer's legs.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Bonerattler"),
-            protection: Some(Normal(20.0)),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/bonerattler/shoulder.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Roughly formed bonerattler hide provide some strong protection.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Bonerattler"),
-            protection: Some(Normal(15.0)),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/chef/belt.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Chef"),
-            protection: Some(Normal(8.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(2.0),
-            energy_reward: Some(0.025),
-            crit_power: Some(0.02),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/chef/chest.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Chef"),
-            protection: Some(Normal(48.0)),
-            poise_resilience: Some(Normal(6.0)),
-            energy_max: Some(13.5),
-            energy_reward: Some(0.135),
-            crit_power: Some(0.125),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/chef/hat.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Head,
-        stats: (
+        stats: FromSet("Chef"),
-            protection: Some(Normal(4.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(1.0),
-            energy_reward: Some(0.015),
-            crit_power: Some(0.02),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/chef/pants.ron

@@ -3,13 +3,7 @@ ItemDef(
     description: "",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Chef"),
-            protection: Some(Normal(32.0)),
-            poise_resilience: Some(Normal(4.0)),
-            energy_max: Some(9.0),
-            energy_reward: Some(0.1),
-            crit_power: Some(0.08),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/druid/back.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(3.0)),
-            energy_max: Some(3.3),
-            energy_reward: Some(0.034),
-            stealth: Some(0.034),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/druid/belt.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(3.0)),
-            energy_max: Some(3.3),
-            energy_reward: Some(0.034),
-            stealth: Some(0.034),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/druid/chest.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(18.0)),
-            energy_max: Some(19.8),
-            energy_reward: Some(0.2),
-            stealth: Some(0.2),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/druid/foot.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(6.0)),
-            energy_max: Some(6.6),
-            energy_reward: Some(0.067),
-            stealth: Some(0.067),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/druid/hand.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(6.0)),
-            energy_max: Some(6.6),
-            energy_reward: Some(0.067),
-            stealth: Some(0.067),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/druid/pants.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(12.0)),
-            energy_max: Some(13.2),
-            energy_reward: Some(0.134),
-            stealth: Some(0.134),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/druid/shoulder.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Incredibly light, with the essence of nature.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Lifecloth"),
-            protection: Some(Normal(12.0)),
-            energy_max: Some(13.2),
-            energy_reward: Some(0.134),
-            stealth: Some(0.134),
-        ),
     )),
     quality: High,
     tags: [

assets/common/items/armor/cloth/linen/back.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(1.0)),
-            energy_max: Some(0.8),
-            energy_reward: Some(0.009),
-            stealth: Some(0.009),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/linen/belt.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(1.0)),
-            energy_max: Some(0.8),
-            energy_reward: Some(0.009),
-            stealth: Some(0.009),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/linen/chest.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(5.0)),
-            energy_max: Some(5.0),
-            energy_reward: Some(0.051),
-            stealth: Some(0.051),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/linen/foot.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(2.0)),
-            energy_max: Some(1.7),
-            energy_reward: Some(0.017),
-            stealth: Some(0.017),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/linen/hand.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(2.0)),
-            energy_max: Some(1.7),
-            energy_reward: Some(0.017),
-            stealth: Some(0.017),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/linen/pants.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(3.0)),
-            energy_max: Some(3.3),
-            energy_reward: Some(0.034),
-            stealth: Some(0.034),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/linen/shoulder.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Roughly stitched, but it seems to hold.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Linen"),
-            protection: Some(Normal(3.0)),
-            energy_max: Some(3.3),
-            energy_reward: Some(0.034),
-            stealth: Some(0.034),
-        ),
     )),
     quality: Low,
     tags: [

assets/common/items/armor/cloth/moonweave/back.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(4.0)),
-            energy_max: Some(4.1),
-            energy_reward: Some(0.042),
-            stealth: Some(0.042),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/moonweave/belt.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(4.0)),
-            energy_max: Some(4.1),
-            energy_reward: Some(0.042),
-            stealth: Some(0.042),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/moonweave/chest.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(23.0)),
-            energy_max: Some(24.8),
-            energy_reward: Some(0.252),
-            stealth: Some(0.252),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/moonweave/foot.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(8.0)),
-            energy_max: Some(8.3),
-            energy_reward: Some(0.084),
-            stealth: Some(0.084),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/moonweave/hand.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(8.0)),
-            energy_max: Some(8.3),
-            energy_reward: Some(0.084),
-            stealth: Some(0.084),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/moonweave/pants.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(17.0)),
-            energy_max: Some(16.5),
-            energy_reward: Some(0.168),
-            stealth: Some(0.168),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/moonweave/shoulder.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "The fabric dances silently, like moonlight.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Moonweave"),
-            protection: Some(Normal(17.0)),
-            energy_max: Some(16.5),
-            energy_reward: Some(0.168),
-            stealth: Some(0.168),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cloth/silken/back.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(2.0)),
-            energy_max: Some(2.5),
-            energy_reward: Some(0.025),
-            stealth: Some(0.025),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/silken/belt.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(2.0)),
-            energy_max: Some(2.5),
-            energy_reward: Some(0.025),
-            stealth: Some(0.025),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/silken/chest.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(14.0)),
-            energy_max: Some(14.9),
-            energy_reward: Some(0.15),
-            stealth: Some(0.15),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/silken/foot.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(5.0)),
-            energy_max: Some(5.0),
-            energy_reward: Some(0.05),
-            stealth: Some(0.05),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/silken/hand.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(5.0)),
-            energy_max: Some(5.0),
-            energy_reward: Some(0.05),
-            stealth: Some(0.05),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/silken/pants.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(9.0)),
-            energy_max: Some(9.9),
-            energy_reward: Some(0.1),
-            stealth: Some(0.1),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/silken/shoulder.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Weaved with care by a skilled tailor.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Silk"),
-            protection: Some(Normal(9.0)),
-            energy_max: Some(9.9),
-            energy_reward: Some(0.1),
-            stealth: Some(0.1),
-        ),
     )),
     quality: Moderate,
     tags: [

assets/common/items/armor/cloth/sunsilk/back.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(5.0)),
-            energy_max: Some(5.0),
-            energy_reward: Some(0.05),
-            stealth: Some(0.05),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/sunsilk/belt.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(5.0)),
-            energy_max: Some(5.0),
-            energy_reward: Some(0.05),
-            stealth: Some(0.05),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/sunsilk/chest.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(27.0)),
-            energy_max: Some(30.0),
-            energy_reward: Some(0.3),
-            stealth: Some(0.3),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/sunsilk/foot.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(9.0)),
-            energy_max: Some(10.0),
-            energy_reward: Some(0.1),
-            stealth: Some(0.1),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/sunsilk/hand.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(9.0)),
-            energy_max: Some(10.0),
-            energy_reward: Some(0.1),
-            stealth: Some(0.1),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/sunsilk/pants.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(18.0)),
-            energy_max: Some(20.0),
-            energy_reward: Some(0.2),
-            stealth: Some(0.2),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/sunsilk/shoulder.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "It radiates with the sun's power, and the grace to harness it.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Sunsilk"),
-            protection: Some(Normal(18.0)),
-            energy_max: Some(20.0),
-            energy_reward: Some(0.2),
-            stealth: Some(0.2),
-        ),
     )),
     quality: Legendary,
     tags: [

assets/common/items/armor/cloth/woolen/back.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(2.0)),
-            energy_max: Some(1.7),
-            energy_reward: Some(0.017),
-            stealth: Some(0.017),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth/woolen/belt.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(2.0)),
-            energy_max: Some(1.7),
-            energy_reward: Some(0.017),
-            stealth: Some(0.017),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth/woolen/chest.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(9.0)),
-            energy_max: Some(9.9),
-            energy_reward: Some(0.099),
-            stealth: Some(0.099),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth/woolen/foot.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(3.0)),
-            energy_max: Some(3.3),
-            energy_reward: Some(0.033),
-            stealth: Some(0.033),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth/woolen/hand.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(3.0)),
-            energy_max: Some(3.3),
-            energy_reward: Some(0.033),
-            stealth: Some(0.033),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth/woolen/pants.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(6.0)),
-            energy_max: Some(6.6),
-            energy_reward: Some(0.066),
-            stealth: Some(0.066),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth/woolen/shoulder.ron

@@ -3,12 +3,7 @@ ItemDef(
     description: "Thick and ready for the snow.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Wool"),
-            protection: Some(Normal(6.0)),
-            energy_max: Some(6.6),
-            energy_reward: Some(0.066),
-            stealth: Some(0.066),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/belt.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish rough fabric belt, dyed blue.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/chest.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish rough fabric surcoat, dyed blue.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/foot.ron

@@ -3,8 +3,7 @@ ItemDef(
     description: "Cobbled rough fabric boots, dyed blue.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/hand.ron

@@ -3,8 +3,7 @@ ItemDef(
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed blue.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/pants.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish, rough fabric skirt, dyed blue.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/shoulder_0.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A rough fabric coat, dyed blue.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_blue/shoulder_1.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "Simple shoulderpads made from blue cloth.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Cloth Blue"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_green/belt.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish rough fabric belt, dyed green.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Cloth Green"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_green/chest.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish rough fabric surcoat, dyed green.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Cloth Green"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_green/foot.ron

@@ -3,8 +3,7 @@ ItemDef(
     description: "Cobbled rough fabric boots, dyed green.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Cloth Green"),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_green/hand.ron

@@ -3,8 +3,7 @@ ItemDef(
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed green.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Cloth Green"),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_green/pants.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish, rough fabric skirt, dyed green.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Cloth Green"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_green/shoulder.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A rough fabric coat, dyed green.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Cloth Green"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_purple/belt.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish rough fabric belt, dyed purple.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Cloth Purple"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_purple/chest.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish rough fabric surcoat, dyed purple.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Cloth Purple"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_purple/foot.ron

@@ -3,8 +3,7 @@ ItemDef(
     description: "Cobbled rough fabric boots, dyed purple.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Cloth Purple"),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_purple/hand.ron

@@ -3,8 +3,7 @@ ItemDef(
     description: "Rough cloth bracelets provide a stylish fashion statement, dyed purple.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Cloth Purple"),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_purple/pants.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A stylish, rough fabric skirt, dyed purple.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Cloth Purple"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cloth_purple/shoulder.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "A rough fabric coat, dyed purple.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Cloth Purple"),
-            protection: Some(Normal(1.0)),
-        ),
     )),
     quality: Common,
     tags: [

assets/common/items/armor/cultist/bandana.ron

@@ -3,14 +3,14 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Head,
-        stats: (
+        stats: Direct((
             protection: Some(Normal(8.0)),
             poise_resilience: Some(Normal(1.0)),
             energy_max: Some(2.0),
             energy_reward: Some(0.025),
             crit_power: Some(0.01),
             stealth: Some(0.04),
-        ),
+        )),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cultist/belt.ron

@@ -3,14 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Cultist"),
-            protection: Some(Normal(8.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(2.0),
-            energy_reward: Some(0.025),
-            crit_power: Some(0.02),
-            stealth: Some(0.02),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cultist/chest.ron

@@ -3,14 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Cultist"),
-            protection: Some(Normal(44.0)),
-            poise_resilience: Some(Normal(5.0)),
-            energy_max: Some(13.5),
-            energy_reward: Some(0.135),
-            crit_power: Some(0.125),
-            stealth: Some(0.125),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cultist/foot.ron

@@ -3,14 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Foot,
-        stats: (
+        stats: FromSet("Cultist"),
-            protection: Some(Normal(16.0)),
-            poise_resilience: Some(Normal(2.0)),
-            energy_max: Some(4.5),
-            energy_reward: Some(0.045),
-            crit_power: Some(0.04),
-            stealth: Some(0.04),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cultist/hand.ron

@@ -3,14 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Hand,
-        stats: (
+        stats: FromSet("Cultist"),
-            protection: Some(Normal(16.0)),
-            poise_resilience: Some(Normal(2.0)),
-            energy_max: Some(4.5),
-            energy_reward: Some(0.045),
-            crit_power: Some(0.04),
-            stealth: Some(0.04),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cultist/necklace.ron

@@ -3,12 +3,12 @@ ItemDef(
     description: "You can still feel the Mindflayer's presence within this amulet...",
     kind: Armor((
         kind: Neck,
-        stats: (
+        stats: Direct((
             protection: Some(Normal(2.0)),
             energy_max: Some(4.5),
             energy_reward: Some(0.05),
             crit_power: Some(0.03),
-        ),
+        )),
     )),
     quality: Epic,
     tags: [],

assets/common/items/armor/cultist/pants.ron

@@ -3,14 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Pants,
-        stats: (
+        stats: FromSet("Cultist"),
-            protection: Some(Normal(30.0)),
-            poise_resilience: Some(Normal(4.0)),
-            energy_max: Some(9.0),
-            energy_reward: Some(0.1),
-            crit_power: Some(0.08),
-            stealth: Some(0.08),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/cultist/ring.ron

@@ -3,12 +3,12 @@ ItemDef(
     description: "Once belonged to a cultist.",
     kind: Armor((
         kind: Ring,
-        stats: (
+        stats: Direct((
             protection: Some(Normal(1.0)),
             energy_max: Some(5),
             energy_reward: Some(0.025),
             crit_power: Some(0.02),
-        ),
+        )),
     )),
     quality: Epic,
     tags: [],

assets/common/items/armor/cultist/shoulder.ron

@@ -3,14 +3,7 @@ ItemDef(
     description: "Ceremonial attire used by members.",
     kind: Armor((
         kind: Shoulder,
-        stats: (
+        stats: FromSet("Cultist"),
-            protection: Some(Normal(30.0)),
-            poise_resilience: Some(Normal(5.0)),
-            energy_max: Some(9.0),
-            energy_reward: Some(0.1),
-            crit_power: Some(0.08),
-            stealth: Some(0.08),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/ferocious/back.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "The dark side of nature",
     kind: Armor((
         kind: Back,
-        stats: (
+        stats: FromSet("Ferocious"),
-            protection: Some(Normal(6.0)),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/ferocious/belt.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "The dark side of nature",
     kind: Armor((
         kind: Belt,
-        stats: (
+        stats: FromSet("Ferocious"),
-            protection: Some(Normal(12.0)),
-        ),
     )),
     quality: Epic,
     tags: [

assets/common/items/armor/ferocious/chest.ron

@@ -3,9 +3,7 @@ ItemDef(
     description: "The dark side of nature",
     kind: Armor((
         kind: Chest,
-        stats: (
+        stats: FromSet("Ferocious"),
-            protection: Some(Normal(60.0)),
-        ),
     )),
     quality: Epic,
     tags: [