From b03af3b712195b5e97d5844c5c3c52f1d0c41132 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Fri, 4 Jun 2021 00:48:42 -0400 Subject: [PATCH] finalize stats t --- assets/common/cave_scatter/vein.ron | 9 +++++++++ assets/common/items/armor/cloth/druid/back.ron | 6 +++--- assets/common/items/armor/cloth/druid/belt.ron | 6 +++--- assets/common/items/armor/cloth/druid/chest.ron | 6 +++--- assets/common/items/armor/cloth/druid/foot.ron | 6 +++--- assets/common/items/armor/cloth/druid/hand.ron | 6 +++--- assets/common/items/armor/cloth/druid/pants.ron | 6 +++--- assets/common/items/armor/cloth/druid/shoulder.ron | 8 ++++---- assets/common/items/armor/cloth/linen/back.ron | 6 +++--- assets/common/items/armor/cloth/linen/belt.ron | 6 +++--- assets/common/items/armor/cloth/linen/chest.ron | 6 +++--- assets/common/items/armor/cloth/linen/foot.ron | 6 +++--- assets/common/items/armor/cloth/linen/hand.ron | 6 +++--- assets/common/items/armor/cloth/linen/pants.ron | 6 +++--- assets/common/items/armor/cloth/linen/shoulder.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/back.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/belt.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/chest.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/foot.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/hand.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/pants.ron | 6 +++--- assets/common/items/armor/cloth/moonweave/shoulder.ron | 6 +++--- assets/common/items/armor/cloth/silken/back.ron | 6 +++--- assets/common/items/armor/cloth/silken/belt.ron | 6 +++--- assets/common/items/armor/cloth/silken/chest.ron | 6 +++--- assets/common/items/armor/cloth/silken/foot.ron | 6 +++--- assets/common/items/armor/cloth/silken/hand.ron | 6 +++--- assets/common/items/armor/cloth/silken/pants.ron | 6 +++--- assets/common/items/armor/cloth/silken/shoulder.ron | 6 +++--- assets/common/items/armor/cloth/sunsilk/back.ron | 6 +++--- assets/common/items/armor/cloth/sunsilk/belt.ron | 4 ++-- assets/common/items/armor/cloth/sunsilk/chest.ron | 4 ++-- assets/common/items/armor/cloth/sunsilk/foot.ron | 4 ++-- assets/common/items/armor/cloth/sunsilk/hand.ron | 6 +++--- assets/common/items/armor/cloth/sunsilk/pants.ron | 4 ++-- assets/common/items/armor/cloth/sunsilk/shoulder.ron | 4 ++-- assets/common/items/armor/cloth/woolen/back.ron | 6 +++--- assets/common/items/armor/cloth/woolen/belt.ron | 6 +++--- assets/common/items/armor/cloth/woolen/chest.ron | 6 +++--- assets/common/items/armor/cloth/woolen/foot.ron | 6 +++--- assets/common/items/armor/cloth/woolen/hand.ron | 6 +++--- assets/common/items/armor/cloth/woolen/pants.ron | 6 +++--- assets/common/items/armor/cloth/woolen/shoulder.ron | 6 +++--- assets/common/items/armor/hide/carapace/back.ron | 4 ++-- assets/common/items/armor/hide/carapace/belt.ron | 4 ++-- assets/common/items/armor/hide/carapace/chest.ron | 4 ++-- assets/common/items/armor/hide/carapace/foot.ron | 4 ++-- assets/common/items/armor/hide/carapace/hand.ron | 4 ++-- assets/common/items/armor/hide/carapace/pants.ron | 4 ++-- assets/common/items/armor/hide/carapace/shoulder.ron | 4 ++-- assets/common/items/armor/hide/dragonscale/back.ron | 4 ++-- assets/common/items/armor/hide/dragonscale/belt.ron | 4 ++-- assets/common/items/armor/hide/dragonscale/chest.ron | 4 ++-- assets/common/items/armor/hide/dragonscale/foot.ron | 4 ++-- assets/common/items/armor/hide/dragonscale/hand.ron | 4 ++-- assets/common/items/armor/hide/dragonscale/pants.ron | 4 ++-- .../common/items/armor/hide/dragonscale/shoulder.ron | 4 ++-- assets/common/items/armor/hide/leather/back.ron | 4 ++-- assets/common/items/armor/hide/leather/belt.ron | 4 ++-- assets/common/items/armor/hide/leather/chest.ron | 2 +- assets/common/items/armor/hide/leather/foot.ron | 4 ++-- assets/common/items/armor/hide/leather/hand.ron | 4 ++-- assets/common/items/armor/hide/leather/head.ron | 2 +- assets/common/items/armor/hide/leather/pants.ron | 4 ++-- assets/common/items/armor/hide/leather/shoulder.ron | 4 ++-- assets/common/items/armor/hide/primal/back.ron | 4 ++-- assets/common/items/armor/hide/primal/belt.ron | 4 ++-- assets/common/items/armor/hide/primal/chest.ron | 4 ++-- assets/common/items/armor/hide/primal/foot.ron | 4 ++-- assets/common/items/armor/hide/primal/hand.ron | 4 ++-- assets/common/items/armor/hide/primal/pants.ron | 4 ++-- assets/common/items/armor/hide/primal/shoulder.ron | 4 ++-- assets/common/items/armor/hide/rawhide/back.ron | 4 ++-- assets/common/items/armor/hide/rawhide/belt.ron | 4 ++-- assets/common/items/armor/hide/rawhide/chest.ron | 4 ++-- assets/common/items/armor/hide/rawhide/foot.ron | 4 ++-- assets/common/items/armor/hide/rawhide/hand.ron | 4 ++-- assets/common/items/armor/hide/rawhide/pants.ron | 4 ++-- assets/common/items/armor/hide/rawhide/shoulder.ron | 4 ++-- assets/common/items/armor/hide/scale/back.ron | 4 ++-- assets/common/items/armor/hide/scale/belt.ron | 4 ++-- assets/common/items/armor/hide/scale/chest.ron | 2 +- assets/common/items/armor/hide/scale/foot.ron | 4 ++-- assets/common/items/armor/hide/scale/hand.ron | 4 ++-- assets/common/items/armor/hide/scale/pants.ron | 4 ++-- assets/common/items/armor/hide/scale/shoulder.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/back.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/belt.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/chest.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/foot.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/hand.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/pants.ron | 4 ++-- assets/common/items/armor/mail/bloodsteel/shoulder.ron | 4 ++-- assets/common/items/armor/mail/bronze/back.ron | 4 ++-- assets/common/items/armor/mail/bronze/belt.ron | 4 ++-- assets/common/items/armor/mail/bronze/chest.ron | 4 ++-- assets/common/items/armor/mail/bronze/foot.ron | 4 ++-- assets/common/items/armor/mail/bronze/hand.ron | 4 ++-- assets/common/items/armor/mail/bronze/pants.ron | 4 ++-- assets/common/items/armor/mail/bronze/shoulder.ron | 4 ++-- assets/common/items/armor/mail/cobalt/back.ron | 4 ++-- assets/common/items/armor/mail/cobalt/belt.ron | 4 ++-- assets/common/items/armor/mail/cobalt/chest.ron | 4 ++-- assets/common/items/armor/mail/cobalt/foot.ron | 4 ++-- assets/common/items/armor/mail/cobalt/hand.ron | 4 ++-- assets/common/items/armor/mail/cobalt/pants.ron | 4 ++-- assets/common/items/armor/mail/cobalt/shoulder.ron | 4 ++-- assets/common/items/armor/mail/iron/back.ron | 4 ++-- assets/common/items/armor/mail/iron/belt.ron | 4 ++-- assets/common/items/armor/mail/iron/chest.ron | 4 ++-- assets/common/items/armor/mail/iron/foot.ron | 4 ++-- assets/common/items/armor/mail/iron/hand.ron | 4 ++-- assets/common/items/armor/mail/iron/pants.ron | 4 ++-- assets/common/items/armor/mail/iron/shoulder.ron | 4 ++-- assets/common/items/armor/mail/orichalcum/back.ron | 4 ++-- assets/common/items/armor/mail/orichalcum/belt.ron | 4 ++-- assets/common/items/armor/mail/orichalcum/chest.ron | 10 +++++----- assets/common/items/armor/mail/orichalcum/foot.ron | 4 ++-- assets/common/items/armor/mail/orichalcum/hand.ron | 4 ++-- assets/common/items/armor/mail/orichalcum/pants.ron | 4 ++-- assets/common/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 ++-- assets/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 ++-- assets/common/items/armor/mail/steel/pants.ron | 4 ++-- assets/common/items/armor/mail/steel/shoulder.ron | 4 ++-- assets/voxygen/shaders/particle-vert.glsl | 2 +- assets/voxygen/voxel/object_manifest.ron | 6 ++++++ world/src/layer/mod.rs | 2 +- 131 files changed, 309 insertions(+), 294 deletions(-) create mode 100644 assets/common/cave_scatter/vein.ron diff --git a/assets/common/cave_scatter/vein.ron b/assets/common/cave_scatter/vein.ron new file mode 100644 index 0000000000..16059e8771 --- /dev/null +++ b/assets/common/cave_scatter/vein.ron @@ -0,0 +1,9 @@ +[ + (10, Velorite), + (10, VeloriteFrag), + (15, Cobalt), + (10, Bloodstone), + (15, Silver), + (10, Gold), + (8, DiamondSmall), +] diff --git a/assets/common/items/armor/cloth/druid/back.ron b/assets/common/items/armor/cloth/druid/back.ron index a2cd388209..f7cf1fe54d 100644 --- a/assets/common/items/armor/cloth/druid/back.ron +++ b/assets/common/items/armor/cloth/druid/back.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Back("Druid"), stats: ( - protection: Normal(0.0), + protection: Normal(3.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 33, + energy_recovery: 0.034, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/druid/belt.ron b/assets/common/items/armor/cloth/druid/belt.ron index 87fea74062..83c83e30c6 100644 --- a/assets/common/items/armor/cloth/druid/belt.ron +++ b/assets/common/items/armor/cloth/druid/belt.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Belt("Druid"), stats: ( - protection: Normal(0.0), + protection: Normal(3.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 33, + energy_recovery: 0.034, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/druid/chest.ron b/assets/common/items/armor/cloth/druid/chest.ron index cdeb99a451..b4c2a41d6a 100644 --- a/assets/common/items/armor/cloth/druid/chest.ron +++ b/assets/common/items/armor/cloth/druid/chest.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Chest("Druid"), stats: ( - protection: Normal(60.0), + protection: Normal(18.0), poise_resilience: Normal(0.0), - energy_max: 660, - energy_recovery: 0.67, + energy_max: 198, + energy_recovery: 0.2, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/druid/foot.ron b/assets/common/items/armor/cloth/druid/foot.ron index b65b3985fe..ab1ff8a9ed 100644 --- a/assets/common/items/armor/cloth/druid/foot.ron +++ b/assets/common/items/armor/cloth/druid/foot.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Foot("Druid"), stats: ( - protection: Normal(0.0), + protection: Normal(6.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 66, + energy_recovery: 0.067, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/druid/hand.ron b/assets/common/items/armor/cloth/druid/hand.ron index 9d925ef2c6..bf70dd235b 100644 --- a/assets/common/items/armor/cloth/druid/hand.ron +++ b/assets/common/items/armor/cloth/druid/hand.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Hand("Druid"), stats: ( - protection: Normal(0.0), + protection: Normal(6.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 66, + energy_recovery: 0.067, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/druid/pants.ron b/assets/common/items/armor/cloth/druid/pants.ron index 0dc96be32f..61036d5def 100644 --- a/assets/common/items/armor/cloth/druid/pants.ron +++ b/assets/common/items/armor/cloth/druid/pants.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Pants("Druid"), stats: ( - protection: Normal(0.0), + protection: Normal(12.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 132, + energy_recovery: 0.134, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/druid/shoulder.ron b/assets/common/items/armor/cloth/druid/shoulder.ron index 38fc89bfc8..1935620239 100644 --- a/assets/common/items/armor/cloth/druid/shoulder.ron +++ b/assets/common/items/armor/cloth/druid/shoulder.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Shoulder("Druid"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(1.0), - energy_max: 0, - energy_recovery: 0.0, + protection: Normal(12.0), + poise_resilience: Normal(0.0), + energy_max: 132, + energy_recovery: 0.134, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/back.ron b/assets/common/items/armor/cloth/linen/back.ron index 4aa7546b1c..080db9f7db 100644 --- a/assets/common/items/armor/cloth/linen/back.ron +++ b/assets/common/items/armor/cloth/linen/back.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Back("Linen"), stats: ( - protection: Normal(0.0), + protection: Normal(1.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 8, + energy_recovery: 0.009, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/belt.ron b/assets/common/items/armor/cloth/linen/belt.ron index 76913fe8e4..882e3d3dad 100644 --- a/assets/common/items/armor/cloth/linen/belt.ron +++ b/assets/common/items/armor/cloth/linen/belt.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Belt("Linen"), stats: ( - protection: Normal(0.0), + protection: Normal(1.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 8, + energy_recovery: 0.009, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/chest.ron b/assets/common/items/armor/cloth/linen/chest.ron index 6aa8f32a6c..1e210a6a31 100644 --- a/assets/common/items/armor/cloth/linen/chest.ron +++ b/assets/common/items/armor/cloth/linen/chest.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Chest("Linen"), stats: ( - protection: Normal(15.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), - energy_max: 165, - energy_recovery: 0.17, + energy_max: 50, + energy_recovery: 0.051, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/foot.ron b/assets/common/items/armor/cloth/linen/foot.ron index 7c7498d565..d5d81b6b83 100644 --- a/assets/common/items/armor/cloth/linen/foot.ron +++ b/assets/common/items/armor/cloth/linen/foot.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Foot("Linen"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 17, + energy_recovery: 0.017, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/hand.ron b/assets/common/items/armor/cloth/linen/hand.ron index adc0b6b1d6..311cbcd8c5 100644 --- a/assets/common/items/armor/cloth/linen/hand.ron +++ b/assets/common/items/armor/cloth/linen/hand.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Hand("Linen"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 17, + energy_recovery: 0.017, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/pants.ron b/assets/common/items/armor/cloth/linen/pants.ron index da9bec82d3..bbdb065f85 100644 --- a/assets/common/items/armor/cloth/linen/pants.ron +++ b/assets/common/items/armor/cloth/linen/pants.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Pants("Linen"), stats: ( - protection: Normal(0.0), + protection: Normal(3.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 33, + energy_recovery: 0.034, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/linen/shoulder.ron b/assets/common/items/armor/cloth/linen/shoulder.ron index 6f7179c296..801375d542 100644 --- a/assets/common/items/armor/cloth/linen/shoulder.ron +++ b/assets/common/items/armor/cloth/linen/shoulder.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Shoulder("Linen"), stats: ( - protection: Normal(0.0), + protection: Normal(3.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 33, + energy_recovery: 0.034, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/back.ron b/assets/common/items/armor/cloth/moonweave/back.ron index 9eb2df6b41..b6f93e0af7 100644 --- a/assets/common/items/armor/cloth/moonweave/back.ron +++ b/assets/common/items/armor/cloth/moonweave/back.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Back("Moonweave"), stats: ( - protection: Normal(0.0), + protection: Normal(4.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 41, + energy_recovery: 0.042, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/belt.ron b/assets/common/items/armor/cloth/moonweave/belt.ron index 70365c3e9b..3d667a7a73 100644 --- a/assets/common/items/armor/cloth/moonweave/belt.ron +++ b/assets/common/items/armor/cloth/moonweave/belt.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Belt("Moonweave"), stats: ( - protection: Normal(0.0), + protection: Normal(4.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 41, + energy_recovery: 0.042, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/chest.ron b/assets/common/items/armor/cloth/moonweave/chest.ron index e42ecd9697..b68dee5861 100644 --- a/assets/common/items/armor/cloth/moonweave/chest.ron +++ b/assets/common/items/armor/cloth/moonweave/chest.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Chest("Moonweave"), stats: ( - protection: Normal(75.0), + protection: Normal(23.0), poise_resilience: Normal(0.0), - energy_max: 825, - energy_recovery: 0.84, + energy_max: 248, + energy_recovery: 0.252, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/foot.ron b/assets/common/items/armor/cloth/moonweave/foot.ron index 9432c92fe7..ba36b9ab0c 100644 --- a/assets/common/items/armor/cloth/moonweave/foot.ron +++ b/assets/common/items/armor/cloth/moonweave/foot.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Foot("Moonweave"), stats: ( - protection: Normal(0.0), + protection: Normal(8.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 83, + energy_recovery: 0.084, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/hand.ron b/assets/common/items/armor/cloth/moonweave/hand.ron index 074f726331..8408882f09 100644 --- a/assets/common/items/armor/cloth/moonweave/hand.ron +++ b/assets/common/items/armor/cloth/moonweave/hand.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Hand("Moonweave"), stats: ( - protection: Normal(0.0), + protection: Normal(8.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 83, + energy_recovery: 0.084, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/pants.ron b/assets/common/items/armor/cloth/moonweave/pants.ron index bb01755710..d076845518 100644 --- a/assets/common/items/armor/cloth/moonweave/pants.ron +++ b/assets/common/items/armor/cloth/moonweave/pants.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Pants("Moonweave"), stats: ( - protection: Normal(0.0), + protection: Normal(17.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 165, + energy_recovery: 0.168, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/moonweave/shoulder.ron b/assets/common/items/armor/cloth/moonweave/shoulder.ron index a93d286eb6..8896aa0c8d 100644 --- a/assets/common/items/armor/cloth/moonweave/shoulder.ron +++ b/assets/common/items/armor/cloth/moonweave/shoulder.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Shoulder("Moonweave"), stats: ( - protection: Normal(0.0), + protection: Normal(17.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 165, + energy_recovery: 0.168, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/back.ron b/assets/common/items/armor/cloth/silken/back.ron index 5f82e8f5f3..ce1cbc2ce1 100644 --- a/assets/common/items/armor/cloth/silken/back.ron +++ b/assets/common/items/armor/cloth/silken/back.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Back("Silken"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 25, + energy_recovery: 0.025, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/belt.ron b/assets/common/items/armor/cloth/silken/belt.ron index e623450326..03095f35b5 100644 --- a/assets/common/items/armor/cloth/silken/belt.ron +++ b/assets/common/items/armor/cloth/silken/belt.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Belt("Silken"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 25, + energy_recovery: 0.025, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/chest.ron b/assets/common/items/armor/cloth/silken/chest.ron index e15183924d..c191b52b3c 100644 --- a/assets/common/items/armor/cloth/silken/chest.ron +++ b/assets/common/items/armor/cloth/silken/chest.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Chest("Silken"), stats: ( - protection: Normal(45.0), + protection: Normal(14.0), poise_resilience: Normal(0.0), - energy_max: 495, - energy_recovery: 0.5, + energy_max: 149, + energy_recovery: 0.15, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/foot.ron b/assets/common/items/armor/cloth/silken/foot.ron index 0cfdbc56c0..a23a21238d 100644 --- a/assets/common/items/armor/cloth/silken/foot.ron +++ b/assets/common/items/armor/cloth/silken/foot.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Foot("Silken"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 50, + energy_recovery: 0.05, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/hand.ron b/assets/common/items/armor/cloth/silken/hand.ron index f56743b2d6..73cbd09296 100644 --- a/assets/common/items/armor/cloth/silken/hand.ron +++ b/assets/common/items/armor/cloth/silken/hand.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Hand("Silken"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 50, + energy_recovery: 0.05, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/pants.ron b/assets/common/items/armor/cloth/silken/pants.ron index 6df79848c7..21f1be7f03 100644 --- a/assets/common/items/armor/cloth/silken/pants.ron +++ b/assets/common/items/armor/cloth/silken/pants.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Pants("Silken"), stats: ( - protection: Normal(0.0), + protection: Normal(9.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 99, + energy_recovery: 0.1, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/silken/shoulder.ron b/assets/common/items/armor/cloth/silken/shoulder.ron index 43b3ed5bca..786247e2ca 100644 --- a/assets/common/items/armor/cloth/silken/shoulder.ron +++ b/assets/common/items/armor/cloth/silken/shoulder.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Shoulder("Silken"), stats: ( - protection: Normal(0.0), + protection: Normal(9.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 99, + energy_recovery: 0.1, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/back.ron b/assets/common/items/armor/cloth/sunsilk/back.ron index d3e0df7dfd..c72de05c19 100644 --- a/assets/common/items/armor/cloth/sunsilk/back.ron +++ b/assets/common/items/armor/cloth/sunsilk/back.ron @@ -5,9 +5,9 @@ ItemDef( kind: Back("Sunsilk"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(0.2), - energy_max: 0, - energy_recovery: 0.0, + poise_resilience: Normal(0.0), + energy_max: 50, + energy_recovery: 0.05, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/belt.ron b/assets/common/items/armor/cloth/sunsilk/belt.ron index 7a91e9601d..f32365b6cc 100644 --- a/assets/common/items/armor/cloth/sunsilk/belt.ron +++ b/assets/common/items/armor/cloth/sunsilk/belt.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 50, + energy_recovery: 0.05, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/chest.ron b/assets/common/items/armor/cloth/sunsilk/chest.ron index 78c043dd39..4fa5117740 100644 --- a/assets/common/items/armor/cloth/sunsilk/chest.ron +++ b/assets/common/items/armor/cloth/sunsilk/chest.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Normal(90.0), poise_resilience: Normal(0.0), - energy_max: 1000, - energy_recovery: 1.0, + energy_max: 300, + energy_recovery: 0.3, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/foot.ron b/assets/common/items/armor/cloth/sunsilk/foot.ron index d730379674..a3b5e23338 100644 --- a/assets/common/items/armor/cloth/sunsilk/foot.ron +++ b/assets/common/items/armor/cloth/sunsilk/foot.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 100, + energy_recovery: 0.1, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/hand.ron b/assets/common/items/armor/cloth/sunsilk/hand.ron index 56a1f22e99..bfdf60a128 100644 --- a/assets/common/items/armor/cloth/sunsilk/hand.ron +++ b/assets/common/items/armor/cloth/sunsilk/hand.ron @@ -5,9 +5,9 @@ ItemDef( kind: Hand("Sunsilk"), stats: ( protection: Normal(0.0), - poise_resilience: Normal(8.0), - energy_max: 0, - energy_recovery: 0.0, + poise_resilience: Normal(0.0), + energy_max: 100, + energy_recovery: 0.1, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/pants.ron b/assets/common/items/armor/cloth/sunsilk/pants.ron index f7bdae8743..c03f85a81b 100644 --- a/assets/common/items/armor/cloth/sunsilk/pants.ron +++ b/assets/common/items/armor/cloth/sunsilk/pants.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 200, + energy_recovery: 0.2, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/sunsilk/shoulder.ron b/assets/common/items/armor/cloth/sunsilk/shoulder.ron index f1b4831695..ae7f0aa20d 100644 --- a/assets/common/items/armor/cloth/sunsilk/shoulder.ron +++ b/assets/common/items/armor/cloth/sunsilk/shoulder.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 200, + energy_recovery: 0.2, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/back.ron b/assets/common/items/armor/cloth/woolen/back.ron index 5207b07884..5637e98a7d 100644 --- a/assets/common/items/armor/cloth/woolen/back.ron +++ b/assets/common/items/armor/cloth/woolen/back.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Back("Woolen"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 17, + energy_recovery: 0.017, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/belt.ron b/assets/common/items/armor/cloth/woolen/belt.ron index 266530b5fc..7725e98ef3 100644 --- a/assets/common/items/armor/cloth/woolen/belt.ron +++ b/assets/common/items/armor/cloth/woolen/belt.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Belt("Woolen"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 17, + energy_recovery: 0.017, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/chest.ron b/assets/common/items/armor/cloth/woolen/chest.ron index 2babb71b10..1c133bb131 100644 --- a/assets/common/items/armor/cloth/woolen/chest.ron +++ b/assets/common/items/armor/cloth/woolen/chest.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Chest("Woolen"), stats: ( - protection: Normal(30.0), + protection: Normal(9.0), poise_resilience: Normal(0.0), - energy_max: 330, - energy_recovery: 0.33, + energy_max: 99, + energy_recovery: 0.099, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/foot.ron b/assets/common/items/armor/cloth/woolen/foot.ron index d69849cf42..3332064853 100644 --- a/assets/common/items/armor/cloth/woolen/foot.ron +++ b/assets/common/items/armor/cloth/woolen/foot.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Foot("Woolen"), stats: ( - protection: Normal(0.0), + protection: Normal(3.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 33, + energy_recovery: 0.033, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/hand.ron b/assets/common/items/armor/cloth/woolen/hand.ron index ceb2a9d8ae..ba6e68e335 100644 --- a/assets/common/items/armor/cloth/woolen/hand.ron +++ b/assets/common/items/armor/cloth/woolen/hand.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Hand("Woolen"), stats: ( - protection: Normal(0.0), + protection: Normal(3.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 33, + energy_recovery: 0.033, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/pants.ron b/assets/common/items/armor/cloth/woolen/pants.ron index 7244bfa7f5..cd2f6f409c 100644 --- a/assets/common/items/armor/cloth/woolen/pants.ron +++ b/assets/common/items/armor/cloth/woolen/pants.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Pants("Woolen"), stats: ( - protection: Normal(0.0), + protection: Normal(6.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 66, + energy_recovery: 0.066, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/cloth/woolen/shoulder.ron b/assets/common/items/armor/cloth/woolen/shoulder.ron index 20e4029c0f..e3f623097c 100644 --- a/assets/common/items/armor/cloth/woolen/shoulder.ron +++ b/assets/common/items/armor/cloth/woolen/shoulder.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Shoulder("Woolen"), stats: ( - protection: Normal(0.0), + protection: Normal(6.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_recovery: 0.0, + energy_max: 66, + energy_recovery: 0.066, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron index ae68c52481..780e1ee878 100644 --- a/assets/common/items/armor/hide/carapace/back.ron +++ b/assets/common/items/armor/hide/carapace/back.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Back("Carapace"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.067, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron index 17c9177a1e..1a91492e12 100644 --- a/assets/common/items/armor/hide/carapace/belt.ron +++ b/assets/common/items/armor/hide/carapace/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Carapace"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.067, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron index 3ba011a6ef..0239a4fbfb 100644 --- a/assets/common/items/armor/hide/carapace/chest.ron +++ b/assets/common/items/armor/hide/carapace/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Carapace"), stats: ( - protection: Normal(96.0), + protection: Normal(29.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 1.33, + crit_power: 0.399, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron index 4e3800be6f..38c73bd1ba 100644 --- a/assets/common/items/armor/hide/carapace/foot.ron +++ b/assets/common/items/armor/hide/carapace/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Carapace"), stats: ( - protection: Normal(0.0), + protection: Normal(10.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.133, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron index 035f8c6ba4..17e90c3d6a 100644 --- a/assets/common/items/armor/hide/carapace/hand.ron +++ b/assets/common/items/armor/hide/carapace/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Carapace"), stats: ( - protection: Normal(0.0), + protection: Normal(10.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.133, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron index 6ac522a97a..98db7669f6 100644 --- a/assets/common/items/armor/hide/carapace/pants.ron +++ b/assets/common/items/armor/hide/carapace/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Carapace"), stats: ( - protection: Normal(0.0), + protection: Normal(19.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.266, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron index 722d91acb5..5544943838 100644 --- a/assets/common/items/armor/hide/carapace/shoulder.ron +++ b/assets/common/items/armor/hide/carapace/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Carapace"), stats: ( - protection: Normal(0.0), + protection: Normal(19.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.266, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron index 417b4b9d73..3171f38986 100644 --- a/assets/common/items/armor/hide/dragonscale/back.ron +++ b/assets/common/items/armor/hide/dragonscale/back.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Back("Dragonscale"), stats: ( - protection: Normal(0.0), + protection: Normal(7.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.1, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron index f473002576..4fdbd247eb 100644 --- a/assets/common/items/armor/hide/dragonscale/belt.ron +++ b/assets/common/items/armor/hide/dragonscale/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Dragonscale"), stats: ( - protection: Normal(0.0), + protection: Normal(7.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.1, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron index ef303129e4..29e48757f4 100644 --- a/assets/common/items/armor/hide/dragonscale/chest.ron +++ b/assets/common/items/armor/hide/dragonscale/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Dragonscale"), stats: ( - protection: Normal(140.0), + protection: Normal(42.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 2.0, + crit_power: 0.6, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron index 0f0c80d10c..221d83d678 100644 --- a/assets/common/items/armor/hide/dragonscale/foot.ron +++ b/assets/common/items/armor/hide/dragonscale/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Dragonscale"), stats: ( - protection: Normal(0.0), + protection: Normal(14.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.2, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron index da00b524e2..623ccbfa6d 100644 --- a/assets/common/items/armor/hide/dragonscale/hand.ron +++ b/assets/common/items/armor/hide/dragonscale/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Dragonscale"), stats: ( - protection: Normal(0.0), + protection: Normal(14.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.2, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron index 391fb14c7c..75c8c602bd 100644 --- a/assets/common/items/armor/hide/dragonscale/pants.ron +++ b/assets/common/items/armor/hide/dragonscale/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Dragonscale"), stats: ( - protection: Normal(0.0), + protection: Normal(28.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.4, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron index 5cc8f8d1ae..11ab2a5f0a 100644 --- a/assets/common/items/armor/hide/dragonscale/shoulder.ron +++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Dragonscale"), stats: ( - protection: Normal(0.0), + protection: Normal(28.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.4, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/back.ron b/assets/common/items/armor/hide/leather/back.ron index 59258c6bd6..33f181f6a1 100644 --- a/assets/common/items/armor/hide/leather/back.ron +++ b/assets/common/items/armor/hide/leather/back.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Back("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.034, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/belt.ron b/assets/common/items/armor/hide/leather/belt.ron index 2b5ddecfa8..363d922d7a 100644 --- a/assets/common/items/armor/hide/leather/belt.ron +++ b/assets/common/items/armor/hide/leather/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.034, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/chest.ron b/assets/common/items/armor/hide/leather/chest.ron index 2830c9720f..f9c6bf0932 100644 --- a/assets/common/items/armor/hide/leather/chest.ron +++ b/assets/common/items/armor/hide/leather/chest.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.67, + crit_power: 0.201, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/foot.ron b/assets/common/items/armor/hide/leather/foot.ron index ca03edf42c..3e8b4be132 100644 --- a/assets/common/items/armor/hide/leather/foot.ron +++ b/assets/common/items/armor/hide/leather/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.067, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/hand.ron b/assets/common/items/armor/hide/leather/hand.ron index 2358d2d09c..2879ba1272 100644 --- a/assets/common/items/armor/hide/leather/hand.ron +++ b/assets/common/items/armor/hide/leather/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.067, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/head.ron b/assets/common/items/armor/hide/leather/head.ron index 32aef4b7de..afce390a52 100644 --- a/assets/common/items/armor/hide/leather/head.ron +++ b/assets/common/items/armor/hide/leather/head.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(1.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, diff --git a/assets/common/items/armor/hide/leather/pants.ron b/assets/common/items/armor/hide/leather/pants.ron index ef83c54543..169eb8a5bf 100644 --- a/assets/common/items/armor/hide/leather/pants.ron +++ b/assets/common/items/armor/hide/leather/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(10.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.134, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/leather/shoulder.ron b/assets/common/items/armor/hide/leather/shoulder.ron index fa320902e8..1567f12c60 100644 --- a/assets/common/items/armor/hide/leather/shoulder.ron +++ b/assets/common/items/armor/hide/leather/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Leather"), stats: ( - protection: Normal(0.0), + protection: Normal(10.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.134, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/back.ron b/assets/common/items/armor/hide/primal/back.ron index 289770000d..4af4657c11 100644 --- a/assets/common/items/armor/hide/primal/back.ron +++ b/assets/common/items/armor/hide/primal/back.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Back("Primal"), stats: ( - protection: Normal(0.0), + protection: Normal(6.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.084, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/belt.ron b/assets/common/items/armor/hide/primal/belt.ron index dc83fe94d5..e36ce06325 100644 --- a/assets/common/items/armor/hide/primal/belt.ron +++ b/assets/common/items/armor/hide/primal/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Primal"), stats: ( - protection: Normal(0.0), + protection: Normal(6.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.084, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/chest.ron b/assets/common/items/armor/hide/primal/chest.ron index d786128be2..29fae8040c 100644 --- a/assets/common/items/armor/hide/primal/chest.ron +++ b/assets/common/items/armor/hide/primal/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Primal"), stats: ( - protection: Normal(120.0), + protection: Normal(36.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 1.67, + crit_power: 0.501, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/foot.ron b/assets/common/items/armor/hide/primal/foot.ron index b015e39b5a..eb3d0b8e9b 100644 --- a/assets/common/items/armor/hide/primal/foot.ron +++ b/assets/common/items/armor/hide/primal/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Primal"), stats: ( - protection: Normal(0.0), + protection: Normal(12.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.167, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/hand.ron b/assets/common/items/armor/hide/primal/hand.ron index f80433eec9..485b33cb27 100644 --- a/assets/common/items/armor/hide/primal/hand.ron +++ b/assets/common/items/armor/hide/primal/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Primal"), stats: ( - protection: Normal(0.0), + protection: Normal(12.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.167, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/pants.ron b/assets/common/items/armor/hide/primal/pants.ron index 3556cde5c4..0fff2445f2 100644 --- a/assets/common/items/armor/hide/primal/pants.ron +++ b/assets/common/items/armor/hide/primal/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Primal"), stats: ( - protection: Normal(0.0), + protection: Normal(24.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.334, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/primal/shoulder.ron b/assets/common/items/armor/hide/primal/shoulder.ron index 66d0d6ddc3..4f4f4b7681 100644 --- a/assets/common/items/armor/hide/primal/shoulder.ron +++ b/assets/common/items/armor/hide/primal/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Primal"), stats: ( - protection: Normal(0.0), + protection: Normal(24.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.334, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/back.ron b/assets/common/items/armor/hide/rawhide/back.ron index e1c9f59f8f..0b6891b9f8 100644 --- a/assets/common/items/armor/hide/rawhide/back.ron +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Back("Rawhide"), stats: ( - protection: Normal(0.0), + protection: Normal(1.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.017, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron index 8a6de7f3f9..6dcaec9159 100644 --- a/assets/common/items/armor/hide/rawhide/belt.ron +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Rawhide"), stats: ( - protection: Normal(0.0), + protection: Normal(1.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.017, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron index 95ad638fb7..4f26b207ed 100644 --- a/assets/common/items/armor/hide/rawhide/chest.ron +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Rawhide"), stats: ( - protection: Normal(24.0), + protection: Normal(7.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.33, + crit_power: 0.099, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron index a2ad439ad5..05279de472 100644 --- a/assets/common/items/armor/hide/rawhide/foot.ron +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Rawhide"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.033, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron index d25ce99072..6282ca5bdc 100644 --- a/assets/common/items/armor/hide/rawhide/hand.ron +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Rawhide"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.033, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron index 3897efecb0..55835a2cad 100644 --- a/assets/common/items/armor/hide/rawhide/pants.ron +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Rawhide"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.066, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/rawhide/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron index 823cb7494e..51c779b45c 100644 --- a/assets/common/items/armor/hide/rawhide/shoulder.ron +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Rawhide"), stats: ( - protection: Normal(0.0), + protection: Normal(5.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.066, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron index 7b9d76d678..107ce92535 100644 --- a/assets/common/items/armor/hide/scale/back.ron +++ b/assets/common/items/armor/hide/scale/back.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Back("Scale"), stats: ( - protection: Normal(0.0), + protection: Normal(4.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.05, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron index ebf3834227..cf302f4392 100644 --- a/assets/common/items/armor/hide/scale/belt.ron +++ b/assets/common/items/armor/hide/scale/belt.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Belt("Scale"), stats: ( - protection: Normal(0.0), + protection: Normal(4.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.05, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron index a5414f7e5c..d9dc0e6b52 100644 --- a/assets/common/items/armor/hide/scale/chest.ron +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 1.0, + crit_power: 0.3, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron index 52ebbbc538..8cc2f9a2e8 100644 --- a/assets/common/items/armor/hide/scale/foot.ron +++ b/assets/common/items/armor/hide/scale/foot.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Foot("Scale"), stats: ( - protection: Normal(0.0), + protection: Normal(7.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.1, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron index f1558dd8fe..c2cc691746 100644 --- a/assets/common/items/armor/hide/scale/hand.ron +++ b/assets/common/items/armor/hide/scale/hand.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Hand("Scale"), stats: ( - protection: Normal(0.0), + protection: Normal(7.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.1, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron index 7e1611b8db..8da67cb76a 100644 --- a/assets/common/items/armor/hide/scale/pants.ron +++ b/assets/common/items/armor/hide/scale/pants.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Pants("Scale"), stats: ( - protection: Normal(0.0), + protection: Normal(14.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.2, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/hide/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron index ac2a73e2db..951b12795a 100644 --- a/assets/common/items/armor/hide/scale/shoulder.ron +++ b/assets/common/items/armor/hide/scale/shoulder.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Shoulder("Scale"), stats: ( - protection: Normal(0.0), + protection: Normal(14.0), poise_resilience: Normal(0.0), energy_max: 0, energy_recovery: 0.0, - crit_power: 0.0, + crit_power: 0.2, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/mail/bloodsteel/back.ron b/assets/common/items/armor/mail/bloodsteel/back.ron index f4db973669..7373f8c9fe 100644 --- a/assets/common/items/armor/mail/bloodsteel/back.ron +++ b/assets/common/items/armor/mail/bloodsteel/back.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Back("Bloodsteel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(10.0), + poise_resilience: Normal(2.5), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bloodsteel/belt.ron b/assets/common/items/armor/mail/bloodsteel/belt.ron index 2798b7550b..292fd2c02b 100644 --- a/assets/common/items/armor/mail/bloodsteel/belt.ron +++ b/assets/common/items/armor/mail/bloodsteel/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Bloodsteel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(10.0), + poise_resilience: Normal(2.5), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bloodsteel/chest.ron b/assets/common/items/armor/mail/bloodsteel/chest.ron index 17ecaca5b4..3386aa8b36 100644 --- a/assets/common/items/armor/mail/bloodsteel/chest.ron +++ b/assets/common/items/armor/mail/bloodsteel/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Bloodsteel"), stats: ( - protection: Normal(200.0), - poise_resilience: Normal(50.0), + protection: Normal(60.0), + poise_resilience: Normal(15.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bloodsteel/foot.ron b/assets/common/items/armor/mail/bloodsteel/foot.ron index 21de5c993d..0f199adba0 100644 --- a/assets/common/items/armor/mail/bloodsteel/foot.ron +++ b/assets/common/items/armor/mail/bloodsteel/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Bloodsteel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(20.0), + poise_resilience: Normal(5.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bloodsteel/hand.ron b/assets/common/items/armor/mail/bloodsteel/hand.ron index 54887a6874..9f5ece65d7 100644 --- a/assets/common/items/armor/mail/bloodsteel/hand.ron +++ b/assets/common/items/armor/mail/bloodsteel/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Bloodsteel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(20.0), + poise_resilience: Normal(5.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bloodsteel/pants.ron b/assets/common/items/armor/mail/bloodsteel/pants.ron index 77932ae01a..6cad049329 100644 --- a/assets/common/items/armor/mail/bloodsteel/pants.ron +++ b/assets/common/items/armor/mail/bloodsteel/pants.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Pants("Bloodsteel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(40.0), + poise_resilience: Normal(10.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bloodsteel/shoulder.ron b/assets/common/items/armor/mail/bloodsteel/shoulder.ron index 02ae0a8701..1feefd258a 100644 --- a/assets/common/items/armor/mail/bloodsteel/shoulder.ron +++ b/assets/common/items/armor/mail/bloodsteel/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Bloodsteel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(40.0), + poise_resilience: Normal(10.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/back.ron b/assets/common/items/armor/mail/bronze/back.ron index d0a6dc302f..e40e00f37a 100644 --- a/assets/common/items/armor/mail/bronze/back.ron +++ b/assets/common/items/armor/mail/bronze/back.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Back("Bronze"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(2.0), + poise_resilience: Normal(0.5), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/belt.ron b/assets/common/items/armor/mail/bronze/belt.ron index 982f4207e3..0609f1e30a 100644 --- a/assets/common/items/armor/mail/bronze/belt.ron +++ b/assets/common/items/armor/mail/bronze/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Bronze"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(2.0), + poise_resilience: Normal(0.5), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/chest.ron b/assets/common/items/armor/mail/bronze/chest.ron index b3f2cc44c0..ea85e4f285 100644 --- a/assets/common/items/armor/mail/bronze/chest.ron +++ b/assets/common/items/armor/mail/bronze/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Bronze"), stats: ( - protection: Normal(40.0), - poise_resilience: Normal(10.0), + protection: Normal(12.0), + poise_resilience: Normal(3.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/foot.ron b/assets/common/items/armor/mail/bronze/foot.ron index 01572de437..6a6c71563c 100644 --- a/assets/common/items/armor/mail/bronze/foot.ron +++ b/assets/common/items/armor/mail/bronze/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Bronze"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(4.0), + poise_resilience: Normal(1.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/hand.ron b/assets/common/items/armor/mail/bronze/hand.ron index be98f73ae6..9597a15da5 100644 --- a/assets/common/items/armor/mail/bronze/hand.ron +++ b/assets/common/items/armor/mail/bronze/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Bronze"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(4.0), + poise_resilience: Normal(1.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/pants.ron b/assets/common/items/armor/mail/bronze/pants.ron index ff3c9a6d2a..df11ae9bc3 100644 --- a/assets/common/items/armor/mail/bronze/pants.ron +++ b/assets/common/items/armor/mail/bronze/pants.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Pants("Bronze"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(8.0), + poise_resilience: Normal(2.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/bronze/shoulder.ron b/assets/common/items/armor/mail/bronze/shoulder.ron index 76943965cc..321e8d629d 100644 --- a/assets/common/items/armor/mail/bronze/shoulder.ron +++ b/assets/common/items/armor/mail/bronze/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Bronze"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(8.0), + poise_resilience: Normal(2.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/back.ron b/assets/common/items/armor/mail/cobalt/back.ron index da1620a26e..2b5fcbd789 100644 --- a/assets/common/items/armor/mail/cobalt/back.ron +++ b/assets/common/items/armor/mail/cobalt/back.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Back("Cobalt"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(8.0), + poise_resilience: Normal(2.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/belt.ron b/assets/common/items/armor/mail/cobalt/belt.ron index 7c078b0e5f..e1b0244d55 100644 --- a/assets/common/items/armor/mail/cobalt/belt.ron +++ b/assets/common/items/armor/mail/cobalt/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Cobalt"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(8.0), + poise_resilience: Normal(2.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/chest.ron b/assets/common/items/armor/mail/cobalt/chest.ron index 498967228a..11d71b5162 100644 --- a/assets/common/items/armor/mail/cobalt/chest.ron +++ b/assets/common/items/armor/mail/cobalt/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Cobalt"), stats: ( - protection: Normal(160.0), - poise_resilience: Normal(40.0), + protection: Normal(48.0), + poise_resilience: Normal(12.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/foot.ron b/assets/common/items/armor/mail/cobalt/foot.ron index 296a44ec46..54c219f2f4 100644 --- a/assets/common/items/armor/mail/cobalt/foot.ron +++ b/assets/common/items/armor/mail/cobalt/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Cobalt"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(16.0), + poise_resilience: Normal(4.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/hand.ron b/assets/common/items/armor/mail/cobalt/hand.ron index 7648b80fa3..2c95b0e679 100644 --- a/assets/common/items/armor/mail/cobalt/hand.ron +++ b/assets/common/items/armor/mail/cobalt/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Cobalt"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(16.0), + poise_resilience: Normal(4.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/pants.ron b/assets/common/items/armor/mail/cobalt/pants.ron index f85835bc49..45ce1a1e3f 100644 --- a/assets/common/items/armor/mail/cobalt/pants.ron +++ b/assets/common/items/armor/mail/cobalt/pants.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Pants("Cobalt"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(32.0), + poise_resilience: Normal(8.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/cobalt/shoulder.ron b/assets/common/items/armor/mail/cobalt/shoulder.ron index 86cd2fb2fe..f39b77083d 100644 --- a/assets/common/items/armor/mail/cobalt/shoulder.ron +++ b/assets/common/items/armor/mail/cobalt/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Cobalt"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(32.0), + poise_resilience: Normal(8.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/back.ron b/assets/common/items/armor/mail/iron/back.ron index c89d72995d..12656b9eb2 100644 --- a/assets/common/items/armor/mail/iron/back.ron +++ b/assets/common/items/armor/mail/iron/back.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Back("Iron"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(4.0), + poise_resilience: Normal(1.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/belt.ron b/assets/common/items/armor/mail/iron/belt.ron index d85ad27dd8..e5104d60ff 100644 --- a/assets/common/items/armor/mail/iron/belt.ron +++ b/assets/common/items/armor/mail/iron/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Iron"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(4.0), + poise_resilience: Normal(1.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/chest.ron b/assets/common/items/armor/mail/iron/chest.ron index 70dafc52d9..3202665752 100644 --- a/assets/common/items/armor/mail/iron/chest.ron +++ b/assets/common/items/armor/mail/iron/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Iron"), stats: ( - protection: Normal(80.0), - poise_resilience: Normal(20.0), + protection: Normal(24.0), + poise_resilience: Normal(6.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/foot.ron b/assets/common/items/armor/mail/iron/foot.ron index cfede43267..5ac34082c5 100644 --- a/assets/common/items/armor/mail/iron/foot.ron +++ b/assets/common/items/armor/mail/iron/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Iron"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(8.0), + poise_resilience: Normal(2.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/hand.ron b/assets/common/items/armor/mail/iron/hand.ron index 0fbb877a36..c38fcccf67 100644 --- a/assets/common/items/armor/mail/iron/hand.ron +++ b/assets/common/items/armor/mail/iron/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Iron"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(8.0), + poise_resilience: Normal(2.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/pants.ron b/assets/common/items/armor/mail/iron/pants.ron index 2b00be3b14..37eb57a835 100644 --- a/assets/common/items/armor/mail/iron/pants.ron +++ b/assets/common/items/armor/mail/iron/pants.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Pants("Iron"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(16.0), + poise_resilience: Normal(4.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/iron/shoulder.ron b/assets/common/items/armor/mail/iron/shoulder.ron index c23322511a..b4ef73a9ee 100644 --- a/assets/common/items/armor/mail/iron/shoulder.ron +++ b/assets/common/items/armor/mail/iron/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Iron"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(16.0), + poise_resilience: Normal(4.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron index 07c72632b2..66a79f7800 100644 --- a/assets/common/items/armor/mail/orichalcum/back.ron +++ b/assets/common/items/armor/mail/orichalcum/back.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Back("Orichalcum"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(12.0), + poise_resilience: Normal(3.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron index 88aa5e9bff..949fe90341 100644 --- a/assets/common/items/armor/mail/orichalcum/belt.ron +++ b/assets/common/items/armor/mail/orichalcum/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Orichalcum"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(12.0), + poise_resilience: Normal(3.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron index b5db8128ae..e176cd8f08 100644 --- a/assets/common/items/armor/mail/orichalcum/chest.ron +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Chest("Orichalcum"), stats: ( - protection: Normal(240.0), - poise_resilience: Normal(60.0), - energy_max: 1000, - energy_recovery: 3.0, - crit_power: 2.0, + protection: Normal(72.0), + poise_resilience: Normal(18.0), + energy_max: 0, + energy_recovery: 0.0, + crit_power: 0.0, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/mail/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron index 6ee37e439c..005fb95b75 100644 --- a/assets/common/items/armor/mail/orichalcum/foot.ron +++ b/assets/common/items/armor/mail/orichalcum/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Orichalcum"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(24.0), + poise_resilience: Normal(6.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron index c9b4ec3713..94e2c03500 100644 --- a/assets/common/items/armor/mail/orichalcum/hand.ron +++ b/assets/common/items/armor/mail/orichalcum/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Orichalcum"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(24.0), + poise_resilience: Normal(6.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron index dea6be4802..57407d6a08 100644 --- a/assets/common/items/armor/mail/orichalcum/pants.ron +++ b/assets/common/items/armor/mail/orichalcum/pants.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Pants("Orichalcum"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(48.0), + poise_resilience: Normal(12.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron index 60f67003f5..984262a6d1 100644 --- a/assets/common/items/armor/mail/orichalcum/shoulder.ron +++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Orichalcum"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(48.0), + poise_resilience: Normal(12.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/back.ron b/assets/common/items/armor/mail/steel/back.ron index 5eda08c142..48c9f43213 100644 --- a/assets/common/items/armor/mail/steel/back.ron +++ b/assets/common/items/armor/mail/steel/back.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Back("Steel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(6.0), + poise_resilience: Normal(1.5), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/belt.ron b/assets/common/items/armor/mail/steel/belt.ron index dc26fe65ab..f5354a05b3 100644 --- a/assets/common/items/armor/mail/steel/belt.ron +++ b/assets/common/items/armor/mail/steel/belt.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Belt("Steel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(6.0), + poise_resilience: Normal(1.5), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/chest.ron b/assets/common/items/armor/mail/steel/chest.ron index 019d39d966..0dd02633a0 100644 --- a/assets/common/items/armor/mail/steel/chest.ron +++ b/assets/common/items/armor/mail/steel/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Steel"), stats: ( - protection: Normal(120.0), - poise_resilience: Normal(30.0), + protection: Normal(36.0), + poise_resilience: Normal(9.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/foot.ron b/assets/common/items/armor/mail/steel/foot.ron index 6c16f122a0..0a23bb79e9 100644 --- a/assets/common/items/armor/mail/steel/foot.ron +++ b/assets/common/items/armor/mail/steel/foot.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Foot("Steel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(12.0), + poise_resilience: Normal(3.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/hand.ron b/assets/common/items/armor/mail/steel/hand.ron index f44ab66581..b51b00c8d2 100644 --- a/assets/common/items/armor/mail/steel/hand.ron +++ b/assets/common/items/armor/mail/steel/hand.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Hand("Steel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(12.0), + poise_resilience: Normal(3.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/pants.ron b/assets/common/items/armor/mail/steel/pants.ron index 31842f839e..e7b639a8a7 100644 --- a/assets/common/items/armor/mail/steel/pants.ron +++ b/assets/common/items/armor/mail/steel/pants.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Pants("Steel"), stats: ( - protection: Normal(0.0), - poise_resilience: Normal(0.0), + protection: Normal(24.0), + poise_resilience: Normal(6.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/common/items/armor/mail/steel/shoulder.ron b/assets/common/items/armor/mail/steel/shoulder.ron index 45a1112953..1f40bc73e2 100644 --- a/assets/common/items/armor/mail/steel/shoulder.ron +++ b/assets/common/items/armor/mail/steel/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("Steel"), stats: ( - protection: Normal(15.0), - poise_resilience: Normal(0.0), + protection: Normal(24.0), + poise_resilience: Normal(6.0), energy_max: 0, energy_recovery: 0.0, crit_power: 0.0, diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl index f2f6fd9cd3..28481b3445 100644 --- a/assets/voxygen/shaders/particle-vert.glsl +++ b/assets/voxygen/shaders/particle-vert.glsl @@ -70,7 +70,7 @@ const int LASER = 28; const int BUBBLES = 29; const int WATER = 30; const int ICE_SPIKES = 31; -const int DUST = 31; +const int DUST = 32; // meters per second squared (acceleration) const float earth_gravity = 9.807; diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index 5940c0e8bd..54f85607bb 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/assets/voxygen/voxel/object_manifest.ron @@ -713,6 +713,12 @@ bone0: ( offset: (-4.5, -4.5, 0.0), central: ("object.sea_lantern"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), BirdMeat: ( bone0: ( offset: (-5.5, -3.0, 0.0), diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index c72124687b..d3a0e2b3c0 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -270,7 +270,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { } } if vein_condition && cave_base < surface_z as i32 - 25 { - let kind = *Lottery::::load_expect("common.cave_scatter.deep_floor") + let kind = *Lottery::::load_expect("common.cave_scatter.vein") .read() .choose(); canvas.map(Vec3::new(wpos2d.x, wpos2d.y, vein_floor), |block| {