Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed armor stat hackery.

Browse Source 
Added new armor stats to remaining armor items.
Fixed broken tests.
This commit is contained in:
Sam 2021-05-20 22:04:36 -05:00 committed by Marcel Märtens
parent ff66e34be5
commit 2a07fad802
81 changed files with 335 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/common/items/armor/misc/bag/heavy_seabag.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/knitted_red_pouch.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/liana_kit.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/reliable_backpack.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/soulkeeper_pure.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/tiny_red_pouch.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/troll_hide_pack.ron
View File

@ -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,

6
assets/common/items/armor/misc/bag/woven_red_bag.ron
View File

@ -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,

6
assets/common/items/debug/admin_back.ron
View File

@ -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,
),
)
),

8
assets/common/items/debug/admin_black_hole.ron
View File

@ -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,

4
assets/common/items/debug/cultist_belt.ron
View File

@ -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,
),
)
),

4
assets/common/items/debug/cultist_boots.ron
View File

@ -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,
),
)
),

4
assets/common/items/debug/cultist_chest_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/debug/cultist_hands_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/debug/cultist_legs_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/debug/cultist_shoulder_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/debug/dungeon_purple.ron
View File

@ -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,
),
)
),

4
assets/common/items/npc_armor/back/backpack_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/npc_armor/back/leather_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/npc_armor/biped_large/mindflayer.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/husk/chest/husk.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/husk/foot/husk.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/husk/hand/husk.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/husk/head/husk.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/husk/pants/husk.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/husk/tail/husk.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
View File

@ -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,

4
assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
View File

@ -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,

4
assets/common/items/npc_armor/chest/leather_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/npc_armor/chest/plate_red.ron
View File

@ -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,
),
)
),

4
assets/common/items/npc_armor/golem/claygolem.ron
View File

@ -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,

4
assets/common/items/npc_armor/pants/leather_blue.ron
View File

@ -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,
),
)
),

4
assets/common/items/npc_armor/pants/plate_red.ron
View File

@ -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,
),
)
),

4
assets/common/items/testing/test_bag_18_slot.ron
View File

@ -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,
),
)
),

4
assets/common/items/testing/test_bag_9_slot.ron
View File

@ -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,
),
)
),

6
assets/common/items/testing/test_boots.ron
View File

@ -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,

2
assets/common/loot_tables/creature/biped_large/troll.ron
View File

@ -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")),
]

4
assets/common/loot_tables/materials/underground.ron
View File

@ -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")),
]

10
common/src/comp/inventory/item/armor.rs
View File

@ -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,
},
}
}

7
common/src/comp/inventory/item/mod.rs
View File

@ -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.");