From 868b5b00aaa52deebbc36db07a9b68ac369cebcd Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Thu, 20 May 2021 22:04:36 -0500
Subject: [PATCH] Removed armor stat hackery. Added new armor stats to
remaining armor items. Fixed broken tests.
---
assets/common/items/armor/misc/bag/heavy_seabag.ron | 6 +++++-
.../common/items/armor/misc/bag/knitted_red_pouch.ron | 6 +++++-
assets/common/items/armor/misc/bag/liana_kit.ron | 6 +++++-
.../items/armor/misc/bag/mindflayer_spellbag.ron | 6 +++++-
.../common/items/armor/misc/bag/reliable_backpack.ron | 6 +++++-
.../common/items/armor/misc/bag/soulkeeper_cursed.ron | 6 +++++-
assets/common/items/armor/misc/bag/soulkeeper_pure.ron | 6 +++++-
.../items/armor/misc/bag/sturdy_red_backpack.ron | 6 +++++-
.../common/items/armor/misc/bag/tiny_leather_pouch.ron | 6 +++++-
assets/common/items/armor/misc/bag/tiny_red_pouch.ron | 6 +++++-
assets/common/items/armor/misc/bag/troll_hide_pack.ron | 6 +++++-
assets/common/items/armor/misc/bag/woven_red_bag.ron | 6 +++++-
assets/common/items/debug/admin_back.ron | 6 +++++-
assets/common/items/debug/admin_black_hole.ron | 8 ++++++--
assets/common/items/debug/cultist_belt.ron | 4 ++++
assets/common/items/debug/cultist_boots.ron | 4 ++++
assets/common/items/debug/cultist_chest_blue.ron | 4 ++++
assets/common/items/debug/cultist_hands_blue.ron | 4 ++++
assets/common/items/debug/cultist_legs_blue.ron | 4 ++++
assets/common/items/debug/cultist_shoulder_blue.ron | 4 ++++
assets/common/items/debug/dungeon_purple.ron | 4 ++++
assets/common/items/npc_armor/back/backpack_blue.ron | 4 ++++
assets/common/items/npc_armor/back/leather_blue.ron | 4 ++++
.../common/items/npc_armor/biped_large/mindflayer.ron | 4 ++++
.../npc_armor/biped_small/adlet/chest/adlet_bow.ron | 4 ++++
.../npc_armor/biped_small/adlet/chest/adlet_spear.ron | 4 ++++
.../items/npc_armor/biped_small/adlet/foot/adlet.ron | 4 ++++
.../npc_armor/biped_small/adlet/hand/adlet_bow.ron | 4 ++++
.../npc_armor/biped_small/adlet/hand/adlet_spear.ron | 4 ++++
.../npc_armor/biped_small/adlet/head/adlet_bow.ron | 4 ++++
.../npc_armor/biped_small/adlet/head/adlet_spear.ron | 4 ++++
.../npc_armor/biped_small/adlet/pants/adlet_bow.ron | 4 ++++
.../npc_armor/biped_small/adlet/pants/adlet_spear.ron | 4 ++++
.../items/npc_armor/biped_small/adlet/tail/adlet.ron | 4 ++++
.../npc_armor/biped_small/gnarling/chest/gnarling.ron | 4 ++++
.../npc_armor/biped_small/gnarling/foot/gnarling.ron | 4 ++++
.../npc_armor/biped_small/gnarling/hand/gnarling.ron | 4 ++++
.../npc_armor/biped_small/gnarling/head/gnarling.ron | 4 ++++
.../npc_armor/biped_small/gnarling/pants/gnarling.ron | 4 ++++
.../npc_armor/biped_small/gnarling/tail/gnarling.ron | 4 ++++
.../npc_armor/biped_small/haniwa/chest/haniwa.ron | 4 ++++
.../items/npc_armor/biped_small/haniwa/foot/haniwa.ron | 4 ++++
.../items/npc_armor/biped_small/haniwa/hand/haniwa.ron | 4 ++++
.../items/npc_armor/biped_small/haniwa/head/haniwa.ron | 4 ++++
.../npc_armor/biped_small/haniwa/pants/haniwa.ron | 4 ++++
.../items/npc_armor/biped_small/husk/chest/husk.ron | 4 ++++
.../items/npc_armor/biped_small/husk/foot/husk.ron | 4 ++++
.../items/npc_armor/biped_small/husk/hand/husk.ron | 4 ++++
.../items/npc_armor/biped_small/husk/head/husk.ron | 4 ++++
.../items/npc_armor/biped_small/husk/pants/husk.ron | 4 ++++
.../items/npc_armor/biped_small/husk/tail/husk.ron | 4 ++++
.../items/npc_armor/biped_small/kappa/chest/kappa.ron | 4 ++++
.../items/npc_armor/biped_small/kappa/foot/kappa.ron | 4 ++++
.../items/npc_armor/biped_small/kappa/hand/kappa.ron | 4 ++++
.../items/npc_armor/biped_small/kappa/head/kappa.ron | 4 ++++
.../items/npc_armor/biped_small/kappa/pants/kappa.ron | 4 ++++
.../items/npc_armor/biped_small/kappa/tail/kappa.ron | 4 ++++
.../npc_armor/biped_small/myrmidon/chest/myrmidon.ron | 4 ++++
.../npc_armor/biped_small/myrmidon/foot/myrmidon.ron | 4 ++++
.../npc_armor/biped_small/myrmidon/hand/myrmidon.ron | 4 ++++
.../npc_armor/biped_small/myrmidon/head/myrmidon.ron | 4 ++++
.../npc_armor/biped_small/myrmidon/pants/myrmidon.ron | 4 ++++
.../npc_armor/biped_small/myrmidon/tail/myrmidon.ron | 4 ++++
.../npc_armor/biped_small/sahagin/chest/sahagin.ron | 4 ++++
.../npc_armor/biped_small/sahagin/foot/sahagin.ron | 4 ++++
.../npc_armor/biped_small/sahagin/hand/sahagin.ron | 4 ++++
.../npc_armor/biped_small/sahagin/head/sahagin.ron | 4 ++++
.../npc_armor/biped_small/sahagin/pants/sahagin.ron | 4 ++++
.../npc_armor/biped_small/sahagin/tail/sahagin.ron | 4 ++++
assets/common/items/npc_armor/chest/leather_blue.ron | 4 ++++
assets/common/items/npc_armor/chest/plate_red.ron | 4 ++++
assets/common/items/npc_armor/golem/claygolem.ron | 4 ++++
assets/common/items/npc_armor/pants/leather_blue.ron | 4 ++++
assets/common/items/npc_armor/pants/plate_red.ron | 4 ++++
assets/common/items/testing/test_bag_18_slot.ron | 4 ++++
assets/common/items/testing/test_bag_9_slot.ron | 4 ++++
assets/common/items/testing/test_boots.ron | 6 +++++-
.../common/loot_tables/creature/biped_large/troll.ron | 2 +-
assets/common/loot_tables/materials/underground.ron | 4 ++--
common/src/comp/inventory/item/armor.rs | 10 ++++------
common/src/comp/inventory/item/mod.rs | 7 ++++---
81 files changed, 335 insertions(+), 28 deletions(-)
diff --git a/assets/common/items/armor/misc/bag/heavy_seabag.ron b/assets/common/items/armor/misc/bag/heavy_seabag.ron
index df86faff5e..c1eceba019 100644
--- a/assets/common/items/armor/misc/bag/heavy_seabag.ron
+++ b/assets/common/items/armor/misc/bag/heavy_seabag.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Moderate,
diff --git a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron
index 633ec19a9d..7fc38da294 100644
--- a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron
+++ b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Moderate,
diff --git a/assets/common/items/armor/misc/bag/liana_kit.ron b/assets/common/items/armor/misc/bag/liana_kit.ron
index 642e60b75b..0ad45ccfaf 100644
--- a/assets/common/items/armor/misc/bag/liana_kit.ron
+++ b/assets/common/items/armor/misc/bag/liana_kit.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Moderate,
diff --git a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
index ec0f3c0ba0..5f211bebfc 100644
--- a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
+++ b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Epic,
diff --git a/assets/common/items/armor/misc/bag/reliable_backpack.ron b/assets/common/items/armor/misc/bag/reliable_backpack.ron
index c5275ae386..caefd4187f 100644
--- a/assets/common/items/armor/misc/bag/reliable_backpack.ron
+++ b/assets/common/items/armor/misc/bag/reliable_backpack.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: High,
diff --git a/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
index 2e8d7cd43b..1e1d6a0d56 100644
--- a/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
+++ b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Legendary,
diff --git a/assets/common/items/armor/misc/bag/soulkeeper_pure.ron b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron
index 911e9ab18c..ee30c50a77 100644
--- a/assets/common/items/armor/misc/bag/soulkeeper_pure.ron
+++ b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Legendary,
diff --git a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
index a075a8b0a3..2a4669855e 100644
--- a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
+++ b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: High,
diff --git a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
index 3b2c2e935e..9c4665d166 100644
--- a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
+++ b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Common,
diff --git a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron
index fd4c808ec6..f1076980ee 100644
--- a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron
+++ b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Common,
diff --git a/assets/common/items/armor/misc/bag/troll_hide_pack.ron b/assets/common/items/armor/misc/bag/troll_hide_pack.ron
index a708aa157b..97c3abc19e 100644
--- a/assets/common/items/armor/misc/bag/troll_hide_pack.ron
+++ b/assets/common/items/armor/misc/bag/troll_hide_pack.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: High,
diff --git a/assets/common/items/armor/misc/bag/woven_red_bag.ron b/assets/common/items/armor/misc/bag/woven_red_bag.ron
index a41101896e..5ed4d74813 100644
--- a/assets/common/items/armor/misc/bag/woven_red_bag.ron
+++ b/assets/common/items/armor/misc/bag/woven_red_bag.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Moderate,
diff --git a/assets/common/items/debug/admin_back.ron b/assets/common/items/debug/admin_back.ron
index 807aa10fee..f3f04dcc05 100644
--- a/assets/common/items/debug/admin_back.ron
+++ b/assets/common/items/debug/admin_back.ron
@@ -6,7 +6,11 @@ ItemDef(
kind: Back("Admin"),
stats: (
protection: Normal(0.0),
- poise_resilience: Normal(0.0),
+ poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/admin_black_hole.ron b/assets/common/items/debug/admin_black_hole.ron
index 3b43673794..969f65daef 100644
--- a/assets/common/items/debug/admin_black_hole.ron
+++ b/assets/common/items/debug/admin_black_hole.ron
@@ -6,8 +6,12 @@ ItemDef(
kind: Bag("BlackHole"),
stats: (
protection: Normal(0.0),
- poise_resilience: Normal(0.0)
- ),
+ poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Debug,
diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron
index 9557ca7e9a..3c356a6a3e 100644
--- a/assets/common/items/debug/cultist_belt.ron
+++ b/assets/common/items/debug/cultist_belt.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron
index 3f354d647d..5bf7753abc 100644
--- a/assets/common/items/debug/cultist_boots.ron
+++ b/assets/common/items/debug/cultist_boots.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron
index 80bc2d2483..bd4d189ad9 100644
--- a/assets/common/items/debug/cultist_chest_blue.ron
+++ b/assets/common/items/debug/cultist_chest_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron
index 5461404080..a7950d2cd9 100644
--- a/assets/common/items/debug/cultist_hands_blue.ron
+++ b/assets/common/items/debug/cultist_hands_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron
index e180a45a17..402f8c0eb8 100644
--- a/assets/common/items/debug/cultist_legs_blue.ron
+++ b/assets/common/items/debug/cultist_legs_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron
index 4d635b0a6d..36c47cec1a 100644
--- a/assets/common/items/debug/cultist_shoulder_blue.ron
+++ b/assets/common/items/debug/cultist_shoulder_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/debug/dungeon_purple.ron b/assets/common/items/debug/dungeon_purple.ron
index b5e12e5624..b3a3cb5734 100644
--- a/assets/common/items/debug/dungeon_purple.ron
+++ b/assets/common/items/debug/dungeon_purple.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/npc_armor/back/backpack_blue.ron b/assets/common/items/npc_armor/back/backpack_blue.ron
index 070dcbb5b9..f20e5fa6a5 100644
--- a/assets/common/items/npc_armor/back/backpack_blue.ron
+++ b/assets/common/items/npc_armor/back/backpack_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/npc_armor/back/leather_blue.ron b/assets/common/items/npc_armor/back/leather_blue.ron
index aa658b190a..8172ab6164 100644
--- a/assets/common/items/npc_armor/back/leather_blue.ron
+++ b/assets/common/items/npc_armor/back/leather_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(1.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/npc_armor/biped_large/mindflayer.ron b/assets/common/items/npc_armor/biped_large/mindflayer.ron
index 27e4035a44..7b9562b11f 100644
--- a/assets/common/items/npc_armor/biped_large/mindflayer.ron
+++ b/assets/common/items/npc_armor/biped_large/mindflayer.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(60.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Legendary,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index 8f9d7b1e3c..2cc5178d18 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(12.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
index 32e9cf138e..dd6d87fa8f 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(12.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
index 238195dfd2..6e28ef3527 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
index f4dea6f36b..ab23e6e8f4 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
index 6176a32a5e..94700f81f7 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
index a3e444510e..331b2057ab 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
index 88e0597aee..81980a6071 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
index 1f1db8648e..014eaebf90 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
index 89caf74ba7..1fc8755c1f 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
index 514356d9a1..754e1809e4 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
index 33e0a3f95d..fc656217d7 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
index e8e8930a9f..d411bb9c37 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
index 517bf843d2..bea1371b93 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
index f92c5ae5c7..a668ad6e8c 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
index 8faadbde6c..4c73e9742f 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
index e35e45d7f2..2cbea8edec 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(1.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index f1c8cae036..a64e102bda 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(23.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 9184b2f94a..1ea3461c26 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(17.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index f4a9dba2fd..beb14f704b 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(17.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index 482d9566b2..b71fa1fee2 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(17.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index 0cd5e96f71..cc5083a9f4 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(17.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron b/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron
index 52f348aa4d..a3d99617ff 100644
--- a/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron
+++ b/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(18.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron b/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron
index 26d36b1654..b52ba876c2 100644
--- a/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron
+++ b/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron b/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron
index 4bd37ed64c..8b3f423b38 100644
--- a/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron
+++ b/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/husk/head/husk.ron b/assets/common/items/npc_armor/biped_small/husk/head/husk.ron
index d6bdea23b0..ab125992d5 100644
--- a/assets/common/items/npc_armor/biped_small/husk/head/husk.ron
+++ b/assets/common/items/npc_armor/biped_small/husk/head/husk.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron b/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron
index bfd787e8f5..ee6ab471c9 100644
--- a/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron
+++ b/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron b/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron
index 023f942a7b..ffee421e5f 100644
--- a/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron
+++ b/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron
index b0f700ea5b..b50e21ad18 100644
--- a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron
+++ b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron
index 45f99913ce..d9a9368890 100644
--- a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron
+++ b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron
index bf3f6a9cb1..9ff976c183 100644
--- a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron
+++ b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron
index ad80961c42..1c395afab5 100644
--- a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron
+++ b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron
index 8dd3fe9087..6452cdd5e5 100644
--- a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron
+++ b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron
index a05d85356d..d510baf60c 100644
--- a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron
+++ b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(2.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
index 06ec1ec5ef..ec3197634d 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(36.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
index 4c78a77279..c196389001 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(25.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
index 87506fe835..8945d76ca3 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(25.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
index de64307376..90b8beab28 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(25.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
index e6e5eaacb8..2299a4693b 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(25.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
index 9662f9291d..4f3cd54fbc 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(25.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 7792d4a6b4..e10b266d5a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(18.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index 3583b1055b..301d5634b1 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index b2ee494ea7..882a0ba4c4 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index e6c8e5b94a..50a5794bd3 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index a63f3b0b7e..03e6750a70 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 3ea6c9515f..2373e65208 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Low,
diff --git a/assets/common/items/npc_armor/chest/leather_blue.ron b/assets/common/items/npc_armor/chest/leather_blue.ron
index 0d002e5998..bf5631d014 100644
--- a/assets/common/items/npc_armor/chest/leather_blue.ron
+++ b/assets/common/items/npc_armor/chest/leather_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(5.0),
poise_resilience: Normal(5.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/npc_armor/chest/plate_red.ron b/assets/common/items/npc_armor/chest/plate_red.ron
index ee8a80a515..ad80231131 100644
--- a/assets/common/items/npc_armor/chest/plate_red.ron
+++ b/assets/common/items/npc_armor/chest/plate_red.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(5.0),
poise_resilience: Normal(5.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/npc_armor/golem/claygolem.ron b/assets/common/items/npc_armor/golem/claygolem.ron
index 8ba9a70e4c..6269ad0171 100644
--- a/assets/common/items/npc_armor/golem/claygolem.ron
+++ b/assets/common/items/npc_armor/golem/claygolem.ron
@@ -6,6 +6,10 @@ ItemDef(
stats: (
protection: Normal(180.0),
poise_resilience: Normal(1.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)),
quality: Legendary,
diff --git a/assets/common/items/npc_armor/pants/leather_blue.ron b/assets/common/items/npc_armor/pants/leather_blue.ron
index 18da3a7fe9..fb2ddaff00 100644
--- a/assets/common/items/npc_armor/pants/leather_blue.ron
+++ b/assets/common/items/npc_armor/pants/leather_blue.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(10.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/npc_armor/pants/plate_red.ron b/assets/common/items/npc_armor/pants/plate_red.ron
index c43c6ae91d..62f160a5cf 100644
--- a/assets/common/items/npc_armor/pants/plate_red.ron
+++ b/assets/common/items/npc_armor/pants/plate_red.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(10.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/testing/test_bag_18_slot.ron b/assets/common/items/testing/test_bag_18_slot.ron
index c33cc51a40..ea537205b9 100644
--- a/assets/common/items/testing/test_bag_18_slot.ron
+++ b/assets/common/items/testing/test_bag_18_slot.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/testing/test_bag_9_slot.ron b/assets/common/items/testing/test_bag_9_slot.ron
index bea076ce70..1f4f0e0896 100644
--- a/assets/common/items/testing/test_bag_9_slot.ron
+++ b/assets/common/items/testing/test_bag_9_slot.ron
@@ -7,6 +7,10 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
),
)
),
diff --git a/assets/common/items/testing/test_boots.ron b/assets/common/items/testing/test_boots.ron
index ecc6cf63b5..a39fd4ef0a 100644
--- a/assets/common/items/testing/test_boots.ron
+++ b/assets/common/items/testing/test_boots.ron
@@ -7,7 +7,11 @@ ItemDef(
stats: (
protection: Normal(0.0),
poise_resilience: Normal(0.0),
- ),
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
+ ),
)
),
quality: Low,
diff --git a/assets/common/loot_tables/creature/biped_large/troll.ron b/assets/common/loot_tables/creature/biped_large/troll.ron
index 8d756a38c8..a5a670a39f 100644
--- a/assets/common/loot_tables/creature/biped_large/troll.ron
+++ b/assets/common/loot_tables/creature/biped_large/troll.ron
@@ -2,5 +2,5 @@
(1.0, LootTable("common.loot_tables.food.prepared")),
(1.0, LootTable("common.loot_tables.cave_large")),
(1.0, LootTable("common.loot_tables.weapons.tier-2")),
- (5.0, Item("common.items.crafting_ing.leather_troll")),
+ (5.0, Item("common.items.crafting_ing.hide.leather_troll")),
]
\ No newline at end of file
diff --git a/assets/common/loot_tables/materials/underground.ron b/assets/common/loot_tables/materials/underground.ron
index 2ff78e7df9..9147aa87c2 100644
--- a/assets/common/loot_tables/materials/underground.ron
+++ b/assets/common/loot_tables/materials/underground.ron
@@ -1,6 +1,6 @@
[
(2.0, Item("common.items.crafting_ing.stones")),
- (0.5, Item("common.items.ore.veloritefrag")),
- (0.25, Item("common.items.ore.velorite")),
+ (0.5, Item("common.items.mineral.ore.veloritefrag")),
+ (0.25, Item("common.items.mineral.ore.velorite")),
(0.25, LootTable("common.loot_tables.materials.gems")),
]
\ No newline at end of file
diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs
index d2bc4561ed..d115a59adf 100644
--- a/common/src/comp/inventory/item/armor.rs
+++ b/common/src/comp/inventory/item/armor.rs
@@ -28,29 +28,23 @@ impl Armor {
#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
pub struct Stats {
- #[serde(default)]
/// Protection is non-linearly transformed to a damage reduction using
/// (prot / (60 + prot))
protection: Protection,
- #[serde(default)]
/// Poise protection is non-linearly transformed to a poise damage reduction
/// using (prot / (60 + prot))
poise_resilience: Protection,
- #[serde(default)]
/// Energy max is summed, and then applied directly to the max energy stat
/// (multiply values by 10 for expected results, as energy internally is 10x
/// larger to allow smaller changes to occur with an integer)
energy_max: i32,
- #[serde(default)]
/// Energy recovery is summed, and then added to 1.0. When attacks reward
/// energy, it is then multiplied by this value before the energy is
/// rewarded.
energy_recovery: f32,
- #[serde(default)]
/// Crit power is summed, and then added to the default crit multiplier of
/// 1.25. Damage is multiplied by this value when an attack crits.
crit_power: f32,
- #[serde(default)]
stealth: f32,
}
@@ -170,6 +164,10 @@ impl Armor {
stats: Stats {
protection,
poise_resilience,
+ energy_max: 0,
+ energy_recovery: 0.0,
+ crit_power: 0.0,
+ stealth: 0.0,
},
}
}
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index c3045d88bf..1e52dab8c0 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -707,8 +707,8 @@ impl Item {
SpriteKind::Apple => "common.items.food.apple",
SpriteKind::Mushroom => "common.items.food.mushroom",
SpriteKind::CaveMushroom => "common.items.food.mushroom",
- SpriteKind::Velorite => "common.items.ore.velorite",
- SpriteKind::VeloriteFrag => "common.items.ore.veloritefrag",
+ SpriteKind::Velorite => "common.items.mineral.ore.velorite",
+ SpriteKind::VeloriteFrag => "common.items.mineral.ore.veloritefrag",
SpriteKind::BlueFlower => "common.items.flowers.blue",
SpriteKind::PinkFlower => "common.items.flowers.pink",
SpriteKind::PurpleFlower => "common.items.flowers.purple",
@@ -956,7 +956,8 @@ mod tests {
Item::new_from_asset_glob("common.items.npc_weapons.*")
.expect("Failed to iterate over npc weapons.");
- Item::new_from_asset_glob("common.items.ore.*").expect("Failed to iterate over ores.");
+ Item::new_from_asset_glob("common.items.mineral.*")
+ .expect("Failed to iterate over minerals.");
Item::new_from_asset_glob("common.items.tag_examples.*")
.expect("Failed to iterate over tag examples.");