From 661764f4aa8c66a6de59a9d8a923723ed6993aec Mon Sep 17 00:00:00 2001 From: jiminycrick Date: Tue, 12 Jan 2021 19:26:51 -0800 Subject: [PATCH] Some preliminary balancing Fix rebase --- assets/common/abilities/hammer/charged.ron | 2 +- assets/common/abilities/hammer/leap.ron | 2 +- .../common/abilities/hammer/singlestrike.ron | 2 +- assets/common/items/armor/back/admin.ron | 20 +- assets/common/items/armor/back/backpack_0.ron | 21 +- .../items/armor/back/dungeon_purple-0.ron | 18 +- .../items/armor/back/leather_adventurer.ron | 20 +- assets/common/items/armor/back/short_0.ron | 18 +- assets/common/items/armor/back/short_1.ron | 18 +- .../items/armor/back/velorite_mage_0.ron | 18 +- assets/common/items/armor/back/warlock.ron | 18 +- assets/common/items/armor/back/warlord.ron | 18 +- .../common/items/armor/bag/heavy_seabag.ron | 5 +- .../items/armor/bag/knitted_red_pouch.ron | 5 +- assets/common/items/armor/bag/liana_kit.ron | 5 +- .../items/armor/bag/mindflayer_spellbag.ron | 5 +- .../items/armor/bag/reliable_backpack.ron | 5 +- .../items/armor/bag/soulkeeper_cursed.ron | 5 +- .../items/armor/bag/soulkeeper_pure.ron | 5 +- .../items/armor/bag/sturdy_red_backpack.ron | 5 +- .../items/armor/bag/tiny_leather_pouch.ron | 5 +- .../common/items/armor/bag/tiny_red_pouch.ron | 5 +- .../items/armor/bag/troll_hide_pack.ron | 5 +- .../common/items/armor/bag/woven_red_bag.ron | 5 +- assets/common/items/armor/belt/assassin.ron | 18 +- .../common/items/armor/belt/bonerattler.ron | 18 +- .../common/items/armor/belt/cloth_blue_0.ron | 18 +- .../common/items/armor/belt/cloth_green_0.ron | 18 +- .../items/armor/belt/cloth_purple_0.ron | 18 +- .../common/items/armor/belt/cultist_belt.ron | 18 +- assets/common/items/armor/belt/druid.ron | 20 +- assets/common/items/armor/belt/leather_0.ron | 18 +- assets/common/items/armor/belt/leather_2.ron | 18 +- .../items/armor/belt/leather_adventurer.ron | 20 +- assets/common/items/armor/belt/plate_0.ron | 18 +- assets/common/items/armor/belt/steel_0.ron | 18 +- assets/common/items/armor/belt/tarasque.ron | 18 +- assets/common/items/armor/belt/twig.ron | 18 +- .../common/items/armor/belt/twigsflowers.ron | 18 +- .../common/items/armor/belt/twigsleaves.ron | 18 +- .../items/armor/belt/velorite_mage_0.ron | 18 +- assets/common/items/armor/belt/warlock.ron | 18 +- assets/common/items/armor/belt/warlord.ron | 18 +- assets/common/items/armor/chest/assassin.ron | 18 +- .../common/items/armor/chest/bonerattler.ron | 18 +- .../common/items/armor/chest/cloth_blue_0.ron | 18 +- .../items/armor/chest/cloth_green_0.ron | 18 +- .../items/armor/chest/cloth_purple_0.ron | 18 +- .../items/armor/chest/cultist_chest_blue.ron | 18 +- .../armor/chest/cultist_chest_purple.ron | 18 +- assets/common/items/armor/chest/druid.ron | 20 +- assets/common/items/armor/chest/leather_0.ron | 18 +- assets/common/items/armor/chest/leather_2.ron | 18 +- .../items/armor/chest/leather_adventurer.ron | 20 +- .../items/armor/chest/plate_green_0.ron | 18 +- .../common/items/armor/chest/rugged_chest.ron | 12 + assets/common/items/armor/chest/steel_0.ron | 18 +- assets/common/items/armor/chest/tarasque.ron | 20 +- assets/common/items/armor/chest/twig.ron | 18 +- .../common/items/armor/chest/twigsflowers.ron | 18 +- .../common/items/armor/chest/twigsleaves.ron | 18 +- .../items/armor/chest/velorite_mage_0.ron | 18 +- assets/common/items/armor/chest/warlock.ron | 18 +- assets/common/items/armor/chest/warlord.ron | 18 +- .../items/armor/chest/worker_green_0.ron | 18 +- .../items/armor/chest/worker_green_1.ron | 18 +- .../items/armor/chest/worker_orange_0.ron | 18 +- .../items/armor/chest/worker_orange_1.ron | 18 +- .../items/armor/chest/worker_purple_0.ron | 18 +- .../items/armor/chest/worker_purple_1.ron | 18 +- .../common/items/armor/chest/worker_red_0.ron | 18 +- .../common/items/armor/chest/worker_red_1.ron | 18 +- .../items/armor/chest/worker_yellow_0.ron | 18 +- .../items/armor/chest/worker_yellow_1.ron | 18 +- assets/common/items/armor/foot/assassin.ron | 18 +- .../common/items/armor/foot/bonerattler.ron | 18 +- .../common/items/armor/foot/cloth_blue_0.ron | 18 +- .../common/items/armor/foot/cloth_green_0.ron | 18 +- .../items/armor/foot/cloth_purple_0.ron | 18 +- .../common/items/armor/foot/cultist_boots.ron | 18 +- assets/common/items/armor/foot/druid.ron | 20 +- .../items/armor/foot/jackalope_slippers.ron | 18 +- assets/common/items/armor/foot/leather_0.ron | 18 +- assets/common/items/armor/foot/leather_2.ron | 18 +- .../items/armor/foot/leather_adventurer.ron | 20 +- assets/common/items/armor/foot/plate_0.ron | 18 +- assets/common/items/armor/foot/sandals_0.ron | 12 + assets/common/items/armor/foot/steel_0.ron | 18 +- assets/common/items/armor/foot/tarasque.ron | 20 +- assets/common/items/armor/foot/twig.ron | 18 +- .../common/items/armor/foot/twigsflowers.ron | 18 +- .../common/items/armor/foot/twigsleaves.ron | 18 +- .../items/armor/foot/velorite_mage_0.ron | 18 +- assets/common/items/armor/foot/warlock.ron | 18 +- assets/common/items/armor/foot/warlord.ron | 18 +- assets/common/items/armor/hand/assassin.ron | 18 +- .../common/items/armor/hand/bonerattler.ron | 18 +- .../common/items/armor/hand/cloth_blue_0.ron | 18 +- .../common/items/armor/hand/cloth_green_0.ron | 18 +- .../items/armor/hand/cloth_purple_0.ron | 18 +- .../items/armor/hand/cultist_hands_blue.ron | 18 +- .../items/armor/hand/cultist_hands_purple.ron | 18 +- assets/common/items/armor/hand/druid.ron | 20 +- assets/common/items/armor/hand/leather_0.ron | 18 +- assets/common/items/armor/hand/leather_2.ron | 18 +- .../items/armor/hand/leather_adventurer.ron | 20 +- assets/common/items/armor/hand/plate_0.ron | 18 +- assets/common/items/armor/hand/steel_0.ron | 18 +- assets/common/items/armor/hand/tarasque.ron | 18 +- assets/common/items/armor/hand/twig.ron | 18 +- .../common/items/armor/hand/twigsflowers.ron | 18 +- .../common/items/armor/hand/twigsleaves.ron | 18 +- .../items/armor/hand/velorite_mage_0.ron | 18 +- assets/common/items/armor/hand/warlock.ron | 18 +- assets/common/items/armor/hand/warlord.ron | 18 +- .../common/items/armor/head/assa_mask_0.ron | 18 +- assets/common/items/armor/head/leather_0.ron | 18 +- assets/common/items/armor/head/warlock.ron | 18 +- assets/common/items/armor/head/warlord.ron | 18 +- assets/common/items/armor/neck/neck_0.ron | 20 +- assets/common/items/armor/neck/neck_1.ron | 18 +- assets/common/items/armor/pants/assassin.ron | 18 +- .../common/items/armor/pants/bonerattler.ron | 20 +- .../common/items/armor/pants/cloth_blue_0.ron | 18 +- .../items/armor/pants/cloth_green_0.ron | 18 +- .../items/armor/pants/cloth_purple_0.ron | 18 +- .../items/armor/pants/cultist_legs_blue.ron | 18 +- .../items/armor/pants/cultist_legs_purple.ron | 18 +- assets/common/items/armor/pants/druid.ron | 20 +- assets/common/items/armor/pants/hunting.ron | 18 +- assets/common/items/armor/pants/leather_0.ron | 18 +- assets/common/items/armor/pants/leather_2.ron | 18 +- .../items/armor/pants/leather_adventurer.ron | 20 +- .../items/armor/pants/plate_green_0.ron | 18 +- .../common/items/armor/pants/rugged_pants.ron | 12 + assets/common/items/armor/pants/steel_0.ron | 18 +- assets/common/items/armor/pants/tarasque.ron | 18 +- assets/common/items/armor/pants/twig.ron | 18 +- .../common/items/armor/pants/twigsflowers.ron | 18 +- .../common/items/armor/pants/twigsleaves.ron | 18 +- .../items/armor/pants/velorite_mage_0.ron | 18 +- assets/common/items/armor/pants/warlock.ron | 18 +- assets/common/items/armor/pants/warlord.ron | 18 +- .../items/armor/pants/worker_blue_0.ron | 18 +- assets/common/items/armor/ring/ring_0.ron | 18 +- .../common/items/armor/ring/ring_gold_0.ron | 18 +- .../items/armor/ring/ring_purp_high_0.ron | 18 +- .../common/items/armor/shoulder/assassin.ron | 18 +- .../items/armor/shoulder/bonerattler.ron | 18 +- .../items/armor/shoulder/cloth_blue_0.ron | 18 +- .../items/armor/shoulder/cloth_blue_1.ron | 18 +- .../items/armor/shoulder/cloth_green_0.ron | 18 +- .../items/armor/shoulder/cloth_purple_0.ron | 18 +- .../armor/shoulder/cultist_shoulder_blue.ron | 18 +- .../shoulder/cultist_shoulder_purple.ron | 18 +- .../items/armor/shoulder/druidshoulder.ron | 18 +- .../items/armor/shoulder/iron_spikes.ron | 18 +- .../common/items/armor/shoulder/leather_0.ron | 18 +- .../common/items/armor/shoulder/leather_1.ron | 18 +- .../common/items/armor/shoulder/leather_2.ron | 18 +- .../armor/shoulder/leather_adventurer.ron | 20 +- .../items/armor/shoulder/leather_iron_0.ron | 18 +- .../items/armor/shoulder/leather_iron_1.ron | 18 +- .../items/armor/shoulder/leather_iron_2.ron | 18 +- .../items/armor/shoulder/leather_iron_3.ron | 18 +- .../items/armor/shoulder/leather_strips.ron | 18 +- .../common/items/armor/shoulder/plate_0.ron | 18 +- .../common/items/armor/shoulder/steel_0.ron | 18 +- .../common/items/armor/shoulder/tarasque.ron | 18 +- assets/common/items/armor/shoulder/twigs.ron | 18 +- .../items/armor/shoulder/twigsflowers.ron | 18 +- .../items/armor/shoulder/twigsleaves.ron | 18 +- .../items/armor/shoulder/velorite_mage_0.ron | 18 +- .../common/items/armor/shoulder/warlock.ron | 18 +- .../common/items/armor/shoulder/warlord.ron | 18 +- assets/common/items/armor/starter/lantern.ron | 13 - .../items/armor/starter/rugged_chest.ron | 14 - .../items/armor/starter/rugged_pants.ron | 14 - .../common/items/armor/starter/sandals_0.ron | 14 - assets/common/items/armor/tabard/admin.ron | 22 +- assets/common/items/debug/boost.ron | 2 +- .../items/debug/cultist_purp_2h_boss-0.ron | 2 +- assets/common/items/debug/possess.ron | 2 +- .../glider_cloverleaf.ron} | 0 .../items/npc_weapons/axe/malachite_axe-0.ron | 2 +- .../items/npc_weapons/axe/starter_axe.ron | 2 +- .../items/npc_weapons/bow/horn_longbow-0.ron | 2 +- .../items/npc_weapons/bow/saurok_bow.ron | 2 +- .../npc_weapons/dagger/starter_dagger.ron | 2 +- .../common/items/npc_weapons/empty/empty.ron | 2 +- .../npc_weapons/hammer/cultist_purp_2h-0.ron | 2 +- .../npc_weapons/hammer/cyclops_hammer.ron | 2 +- .../items/npc_weapons/hammer/ogre_hammer.ron | 2 +- .../npc_weapons/hammer/starter_hammer.ron | 2 +- .../items/npc_weapons/hammer/troll_hammer.ron | 2 +- .../npc_weapons/hammer/wendigo_hammer.ron | 2 +- .../items/npc_weapons/shield/shield_1.ron | 2 +- .../items/npc_weapons/staff/bone_staff.ron | 2 +- .../items/npc_weapons/staff/cultist_staff.ron | 2 +- .../npc_weapons/staff/mindflayer_staff.ron | 2 +- .../items/npc_weapons/staff/ogre_staff.ron | 2 +- .../items/npc_weapons/staff/saurok_staff.ron | 2 +- .../npc_weapons/sword/cultist_purp_2h-0.ron | 2 +- .../sword/cultist_purp_2h_boss-0.ron | 2 +- .../npc_weapons/sword/dullahan_sword.ron | 2 +- .../items/npc_weapons/sword/saurok_sword.ron | 2 +- .../items/npc_weapons/sword/starter_sword.ron | 2 +- .../npc_weapons/sword/zweihander_sword_0.ron | 2 +- .../common/items/npc_weapons/tool/broom.ron | 2 +- .../items/npc_weapons/tool/fishing_rod.ron | 2 +- assets/common/items/npc_weapons/tool/hoe.ron | 2 +- .../common/items/npc_weapons/tool/pickaxe.ron | 2 +- .../items/npc_weapons/tool/pitchfork.ron | 2 +- assets/common/items/npc_weapons/tool/rake.ron | 2 +- .../items/npc_weapons/tool/shovel-0.ron | 2 +- .../items/npc_weapons/tool/shovel-1.ron | 2 +- .../items/npc_weapons/unique/beast_claws.ron | 2 +- .../items/npc_weapons/unique/quadlowbasic.ron | 2 +- .../npc_weapons/unique/quadlowbreathe.ron | 2 +- .../items/npc_weapons/unique/quadlowquick.ron | 2 +- .../npc_weapons/unique/quadlowranged.ron | 2 +- .../items/npc_weapons/unique/quadlowtail.ron | 2 +- .../items/npc_weapons/unique/quadmedbasic.ron | 2 +- .../npc_weapons/unique/quadmedcharge.ron | 2 +- .../items/npc_weapons/unique/quadmedhoof.ron | 2 +- .../items/npc_weapons/unique/quadmedjump.ron | 2 +- .../items/npc_weapons/unique/quadmedquick.ron | 2 +- .../npc_weapons/unique/quadsmallbasic.ron | 2 +- .../npc_weapons/unique/stone_golems_fist.ron | 2 +- .../npc_weapons/unique/theropodbasic.ron | 2 +- .../items/npc_weapons/unique/theropodbird.ron | 2 +- .../items/weapons/axe/bloodsteel_axe-0.ron | 22 +- .../items/weapons/axe/bloodsteel_axe-1.ron | 24 +- .../items/weapons/axe/bloodsteel_axe-2.ron | 24 +- .../common/items/weapons/axe/bronze_axe-0.ron | 22 +- .../common/items/weapons/axe/bronze_axe-1.ron | 22 +- .../common/items/weapons/axe/cobalt_axe-0.ron | 22 +- .../common/items/weapons/axe/iron_axe-0.ron | 22 +- .../common/items/weapons/axe/iron_axe-1.ron | 22 +- .../common/items/weapons/axe/iron_axe-2.ron | 22 +- .../common/items/weapons/axe/iron_axe-3.ron | 22 +- .../common/items/weapons/axe/iron_axe-4.ron | 24 +- .../common/items/weapons/axe/iron_axe-5.ron | 24 +- .../common/items/weapons/axe/iron_axe-6.ron | 22 +- .../common/items/weapons/axe/iron_axe-7.ron | 22 +- .../common/items/weapons/axe/iron_axe-8.ron | 22 +- .../common/items/weapons/axe/iron_axe-9.ron | 22 +- .../items/weapons/axe/malachite_axe-0.ron | 22 +- assets/common/items/weapons/axe/orc_axe-0.ron | 22 +- .../common/items/weapons/axe/starter_axe.ron | 22 +- .../common/items/weapons/axe/steel_axe-0.ron | 22 +- .../common/items/weapons/axe/steel_axe-1.ron | 22 +- .../common/items/weapons/axe/steel_axe-2.ron | 22 +- .../common/items/weapons/axe/steel_axe-3.ron | 22 +- .../common/items/weapons/axe/steel_axe-4.ron | 22 +- .../common/items/weapons/axe/steel_axe-5.ron | 22 +- .../common/items/weapons/axe/steel_axe-6.ron | 22 +- .../items/weapons/axe/worn_iron_axe-0.ron | 24 +- .../items/weapons/axe/worn_iron_axe-1.ron | 22 +- .../items/weapons/axe/worn_iron_axe-2.ron | 24 +- .../items/weapons/axe/worn_iron_axe-3.ron | 22 +- .../items/weapons/axe/worn_iron_axe-4.ron | 22 +- .../items/weapons/bow/horn_longbow-0.ron | 24 +- .../items/weapons/bow/iron_longbow-0.ron | 26 +- .../items/weapons/bow/leafy_longbow-0.ron | 24 +- .../items/weapons/bow/leafy_shortbow-0.ron | 24 +- .../weapons/bow/nature_ore_longbow-0.ron | 24 +- .../common/items/weapons/bow/rare_longbow.ron | 24 +- .../common/items/weapons/bow/starter_bow.ron | 24 +- .../items/weapons/bow/wood_longbow-0.ron | 24 +- .../items/weapons/bow/wood_longbow-1.ron | 24 +- .../items/weapons/bow/wood_shortbow-0.ron | 24 +- .../items/weapons/bow/wood_shortbow-1.ron | 24 +- .../common/items/weapons/dagger/basic_0.ron | 22 +- .../common/items/weapons/dagger/cultist_0.ron | 22 +- .../items/weapons/dagger/starter_dagger.ron | 22 +- assets/common/items/weapons/empty/empty.ron | 22 +- .../items/weapons/hammer/bronze_hammer-0.ron | 22 +- .../items/weapons/hammer/bronze_hammer-1.ron | 22 +- .../items/weapons/hammer/cobalt_hammer-0.ron | 22 +- .../items/weapons/hammer/cobalt_hammer-1.ron | 22 +- .../weapons/hammer/cultist_purp_2h-0.ron | 22 +- .../items/weapons/hammer/flimsy_hammer.ron | 22 +- .../common/items/weapons/hammer/hammer_1.ron | 24 +- .../items/weapons/hammer/iron_hammer-0.ron | 22 +- .../items/weapons/hammer/iron_hammer-1.ron | 22 +- .../items/weapons/hammer/iron_hammer-2.ron | 22 +- .../items/weapons/hammer/iron_hammer-3.ron | 22 +- .../items/weapons/hammer/iron_hammer-4.ron | 22 +- .../items/weapons/hammer/iron_hammer-5.ron | 22 +- .../items/weapons/hammer/iron_hammer-6.ron | 22 +- .../items/weapons/hammer/iron_hammer-7.ron | 24 +- .../items/weapons/hammer/iron_hammer-8.ron | 22 +- .../common/items/weapons/hammer/mjolnir.ron | 2 +- .../items/weapons/hammer/ramshead_hammer.ron | 24 +- .../items/weapons/hammer/runic_hammer.ron | 22 +- .../items/weapons/hammer/starter_hammer.ron | 24 +- .../items/weapons/hammer/steel_hammer-0.ron | 22 +- .../items/weapons/hammer/steel_hammer-1.ron | 22 +- .../items/weapons/hammer/steel_hammer-2.ron | 22 +- .../items/weapons/hammer/steel_hammer-3.ron | 22 +- .../items/weapons/hammer/steel_hammer-4.ron | 24 +- .../items/weapons/hammer/steel_hammer-5.ron | 22 +- .../items/weapons/hammer/stone_hammer-0.ron | 22 +- .../items/weapons/hammer/stone_hammer-1.ron | 22 +- .../items/weapons/hammer/stone_hammer-2.ron | 22 +- .../items/weapons/hammer/stone_hammer-3.ron | 22 +- .../items/weapons/hammer/wood_hammer-0.ron | 22 +- .../weapons/hammer/worn_iron_hammer-0.ron | 22 +- .../weapons/hammer/worn_iron_hammer-1.ron | 22 +- .../weapons/hammer/worn_iron_hammer-2.ron | 22 +- .../weapons/hammer/worn_iron_hammer-3.ron | 22 +- .../weapons/sceptre/sceptre_velorite_0.ron | 2 +- .../items/weapons/sceptre/staff_nature.ron | 2 +- .../items/weapons/sceptre/starter_sceptre.ron | 24 +- .../common/items/weapons/shield/shield_1.ron | 22 +- .../items/weapons/staff/amethyst_staff.ron | 22 +- .../common/items/weapons/staff/bone_staff.ron | 24 +- .../items/weapons/staff/cultist_staff.ron | 22 +- assets/common/items/weapons/staff/staff_1.ron | 22 +- .../items/weapons/staff/starter_staff.ron | 22 +- .../items/weapons/sword/cultist_purp_2h-0.ron | 22 +- .../weapons/sword/frost_cleaver_2h-0.ron | 22 +- .../weapons/sword/frost_cleaver_2h-1.ron | 24 +- .../weapons/sword/greatsword_2h_dam-0.ron | 22 +- .../weapons/sword/greatsword_2h_dam-1.ron | 22 +- .../weapons/sword/greatsword_2h_dam-2.ron | 22 +- .../weapons/sword/greatsword_2h_fine-0.ron | 24 +- .../weapons/sword/greatsword_2h_fine-1.ron | 24 +- .../weapons/sword/greatsword_2h_fine-2.ron | 24 +- .../weapons/sword/greatsword_2h_orn-0.ron | 24 +- .../weapons/sword/greatsword_2h_orn-1.ron | 24 +- .../weapons/sword/greatsword_2h_orn-2.ron | 24 +- .../weapons/sword/greatsword_2h_simple-0.ron | 24 +- .../weapons/sword/greatsword_2h_simple-1.ron | 24 +- .../weapons/sword/greatsword_2h_simple-2.ron | 24 +- .../items/weapons/sword/long_2h_dam-0.ron | 24 +- .../items/weapons/sword/long_2h_dam-1.ron | 24 +- .../items/weapons/sword/long_2h_dam-2.ron | 24 +- .../items/weapons/sword/long_2h_dam-3.ron | 24 +- .../items/weapons/sword/long_2h_dam-4.ron | 24 +- .../items/weapons/sword/long_2h_dam-5.ron | 24 +- .../items/weapons/sword/long_2h_fine-0.ron | 22 +- .../items/weapons/sword/long_2h_fine-1.ron | 22 +- .../items/weapons/sword/long_2h_fine-2.ron | 22 +- .../items/weapons/sword/long_2h_fine-3.ron | 22 +- .../items/weapons/sword/long_2h_fine-4.ron | 22 +- .../items/weapons/sword/long_2h_fine-5.ron | 22 +- .../items/weapons/sword/long_2h_orn-0.ron | 24 +- .../items/weapons/sword/long_2h_orn-1.ron | 24 +- .../items/weapons/sword/long_2h_orn-2.ron | 24 +- .../items/weapons/sword/long_2h_orn-3.ron | 24 +- .../items/weapons/sword/long_2h_orn-4.ron | 24 +- .../items/weapons/sword/long_2h_orn-5.ron | 24 +- .../items/weapons/sword/long_2h_simple-0.ron | 24 +- .../items/weapons/sword/long_2h_simple-1.ron | 24 +- .../items/weapons/sword/long_2h_simple-2.ron | 24 +- .../items/weapons/sword/long_2h_simple-3.ron | 24 +- .../items/weapons/sword/long_2h_simple-4.ron | 24 +- .../items/weapons/sword/long_2h_simple-5.ron | 24 +- .../items/weapons/sword/short_sword_0.ron | 24 +- .../items/weapons/sword/starter_sword.ron | 22 +- .../common/items/weapons/sword/wood_sword.ron | 22 +- .../weapons/sword/zweihander_sword_0.ron | 24 +- assets/common/items/weapons/tool/broom.ron | 24 +- .../common/items/weapons/tool/fishing_rod.ron | 22 +- assets/common/items/weapons/tool/hoe.ron | 24 +- assets/common/items/weapons/tool/pickaxe.ron | 22 +- .../common/items/weapons/tool/pitchfork.ron | 22 +- assets/common/items/weapons/tool/rake.ron | 22 +- assets/common/items/weapons/tool/shovel-0.ron | 24 +- assets/common/items/weapons/tool/shovel-1.ron | 24 +- common/Cargo.toml | 8 +- common/src/bin/csv_export/main.rs | 50 ++- common/src/bin/csv_import/main.rs | 360 ++++++++++++++++++ common/src/comp/ability.rs | 21 +- common/src/comp/inventory/item/armor.rs | 19 + common/src/comp/inventory/item/mod.rs | 1 + common/src/comp/inventory/item/tool.rs | 26 +- common/src/comp/inventory/loadout_builder.rs | 10 +- common/src/comp/poise.rs | 46 ++- common/src/states/combo_melee.rs | 7 +- common/sys/src/beam.rs | 2 +- common/sys/src/melee.rs | 6 +- common/sys/src/projectile.rs | 6 +- common/sys/src/shockwave.rs | 3 +- common/sys/src/stats.rs | 2 +- server/src/events/entity_manipulation.rs | 8 +- server/src/state_ext.rs | 8 +- .../audio/sfx/event_mapper/combat/tests.rs | 5 + voxygen/src/hud/util.rs | 23 +- 391 files changed, 3399 insertions(+), 3514 deletions(-) create mode 100644 assets/common/items/armor/chest/rugged_chest.ron create mode 100644 assets/common/items/armor/foot/sandals_0.ron create mode 100644 assets/common/items/armor/pants/rugged_pants.ron delete mode 100644 assets/common/items/armor/starter/lantern.ron delete mode 100644 assets/common/items/armor/starter/rugged_chest.ron delete mode 100644 assets/common/items/armor/starter/rugged_pants.ron delete mode 100644 assets/common/items/armor/starter/sandals_0.ron rename assets/common/items/{armor/starter/glider.ron => glider/glider_cloverleaf.ron} (100%) create mode 100644 common/src/bin/csv_import/main.rs diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron index 857d060d0e..3d9e09471c 100644 --- a/assets/common/abilities/hammer/charged.ron +++ b/assets/common/abilities/hammer/charged.ron @@ -3,7 +3,7 @@ ChargedMelee( energy_drain: 300, initial_damage: 10, scaled_damage: 160, - initial_poise_damage: 10, + initial_poise_damage: 5, scaled_poise_damage: 70, initial_knockback: 10.0, scaled_knockback: 50.0, diff --git a/assets/common/abilities/hammer/leap.ron b/assets/common/abilities/hammer/leap.ron index 1e7a1faad7..578282360b 100644 --- a/assets/common/abilities/hammer/leap.ron +++ b/assets/common/abilities/hammer/leap.ron @@ -5,7 +5,7 @@ LeapMelee( swing_duration: 150, recover_duration: 200, base_damage: 240, - base_poise_damage: 60, + base_poise_damage: 40, knockback: 25.0, range: 4.5, max_angle: 360.0, diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index 93cc1503a6..663e9a1f85 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -3,7 +3,7 @@ ComboMelee( stage: 1, base_damage: 130, damage_increase: 10, - base_poise_damage: 30, + base_poise_damage: 10, poise_damage_increase: 5, knockback: 0.0, range: 4.5, diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/back/admin.ron index 048e196395..be8f116c26 100644 --- a/assets/common/items/armor/back/admin.ron +++ b/assets/common/items/armor/back/admin.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Admin's Cape", + name: "Admin\'s Cape", description: "With great power comes\ngreat responsibility.", - kind: Armor( - ( - kind: Back("Admin"), - stats: ( - protection: Invincible, - poise_protection: Invincible, - ), - ) - ), + kind: Armor(( + kind: Back("Admin"), + stats: ( + protection: Invincible, + poise_protection: Invincible, + ), + )), quality: Debug, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/backpack_0.ron b/assets/common/items/armor/back/backpack_0.ron index 9bbafa8171..ec8998d410 100644 --- a/assets/common/items/armor/back/backpack_0.ron +++ b/assets/common/items/armor/back/backpack_0.ron @@ -1,15 +1,12 @@ ItemDef( - name: "Traveler's Backpack", + name: "Traveler\'s Backpack", description: "Comfort and capacity united.", - kind: Armor( - ( - kind: Back("Backpack0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Back("Backpack0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: High, - slots: 18, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/dungeon_purple-0.ron b/assets/common/items/armor/back/dungeon_purple-0.ron index 1366d50d58..0889812bde 100644 --- a/assets/common/items/armor/back/dungeon_purple-0.ron +++ b/assets/common/items/armor/back/dungeon_purple-0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Cultist Cape", description: "Smells like dark magic and candles.", - kind: Armor( - ( - kind: Back("DungPurp0"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0) - ), - ) - ), + kind: Armor(( + kind: Back("DungPurp0"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(1.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/leather_adventurer.ron b/assets/common/items/armor/back/leather_adventurer.ron index 162f67ff32..0032013ba4 100644 --- a/assets/common/items/armor/back/leather_adventurer.ron +++ b/assets/common/items/armor/back/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Cape", - description: "'Tightly packed pieces of leather to endure all weather.'", - kind: Armor( - ( - kind: Back("Short2"), - stats: ( - protection: Normal(0.2), - poise_protection: Normal(0.2), - ), - ) - ), + description: "\'Tightly packed pieces of leather to endure all weather.\'", + kind: Armor(( + kind: Back("Short2"), + stats: ( + protection: Normal(0.2), + poise_protection: Normal(0.1), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/back/short_0.ron index 20f2c15ba2..ff2962d3e9 100644 --- a/assets/common/items/armor/back/short_0.ron +++ b/assets/common/items/armor/back/short_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Short leather Cape", description: "Probably made of the finest leather.", - kind: Armor( - ( - kind: Back("Short0"), - stats: ( - protection: Normal(0.3), - poise_protection: Normal(0.3), - ), - ) - ), + kind: Armor(( + kind: Back("Short0"), + stats: ( + protection: Normal(0.3), + poise_protection: Normal(0.5), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/short_1.ron b/assets/common/items/armor/back/short_1.ron index 0dedb2118f..1391bbd026 100644 --- a/assets/common/items/armor/back/short_1.ron +++ b/assets/common/items/armor/back/short_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Blanket", description: "Keeps your shoulders warm.", - kind: Armor( - ( - kind: Back("Short1"), - stats: ( - protection: Normal(0.1), - poise_protection: Normal(0.1), - ), - ) - ), + kind: Armor(( + kind: Back("Short1"), + stats: ( + protection: Normal(0.1), + poise_protection: Normal(0.2), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/velorite_mage_0.ron b/assets/common/items/armor/back/velorite_mage_0.ron index 965418420d..50c2e7439c 100644 --- a/assets/common/items/armor/back/velorite_mage_0.ron +++ b/assets/common/items/armor/back/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Cloak", description: "Keeps your shoulders warm.", - kind: Armor( - ( - kind: Back("VeloriteMage0"), - stats: ( - protection: Normal(2.8), - poise_protection: Normal(2.8), - ), - ) - ), + kind: Armor(( + kind: Back("VeloriteMage0"), + stats: ( + protection: Normal(2.8), + poise_protection: Normal(2.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/warlock.ron b/assets/common/items/armor/back/warlock.ron index cbf2fba0ae..1be6ed6c67 100644 --- a/assets/common/items/armor/back/warlock.ron +++ b/assets/common/items/armor/back/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock cape", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Back("Warlock"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Back("Warlock"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/back/warlord.ron b/assets/common/items/armor/back/warlord.ron index d5de61e11f..4cc6532f28 100644 --- a/assets/common/items/armor/back/warlord.ron +++ b/assets/common/items/armor/back/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord cape", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Back("Warlord"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Back("Warlord"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(5.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/bag/heavy_seabag.ron b/assets/common/items/armor/bag/heavy_seabag.ron index d679a2070f..2327e210d8 100644 --- a/assets/common/items/armor/bag/heavy_seabag.ron +++ b/assets/common/items/armor/bag/heavy_seabag.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("BluePouch"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/bag/knitted_red_pouch.ron b/assets/common/items/armor/bag/knitted_red_pouch.ron index a3829eee99..dd2017f0a4 100644 --- a/assets/common/items/armor/bag/knitted_red_pouch.ron +++ b/assets/common/items/armor/bag/knitted_red_pouch.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("RedSmall"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/bag/liana_kit.ron b/assets/common/items/armor/bag/liana_kit.ron index 6bebf02b17..a79886f16b 100644 --- a/assets/common/items/armor/bag/liana_kit.ron +++ b/assets/common/items/armor/bag/liana_kit.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("GreenMid"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/bag/mindflayer_spellbag.ron b/assets/common/items/armor/bag/mindflayer_spellbag.ron index c9962ce616..8186a13b7c 100644 --- a/assets/common/items/armor/bag/mindflayer_spellbag.ron +++ b/assets/common/items/armor/bag/mindflayer_spellbag.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("PurpleSkull"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Epic, diff --git a/assets/common/items/armor/bag/reliable_backpack.ron b/assets/common/items/armor/bag/reliable_backpack.ron index 732bb75e69..af0805123f 100644 --- a/assets/common/items/armor/bag/reliable_backpack.ron +++ b/assets/common/items/armor/bag/reliable_backpack.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("LeatherLarge"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/bag/soulkeeper_cursed.ron b/assets/common/items/armor/bag/soulkeeper_cursed.ron index 237296d588..6d31fa30b7 100644 --- a/assets/common/items/armor/bag/soulkeeper_cursed.ron +++ b/assets/common/items/armor/bag/soulkeeper_cursed.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("RedFace"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Legendary, diff --git a/assets/common/items/armor/bag/soulkeeper_pure.ron b/assets/common/items/armor/bag/soulkeeper_pure.ron index 7cb1b49c62..2262852aae 100644 --- a/assets/common/items/armor/bag/soulkeeper_pure.ron +++ b/assets/common/items/armor/bag/soulkeeper_pure.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("BlueFace"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Legendary, diff --git a/assets/common/items/armor/bag/sturdy_red_backpack.ron b/assets/common/items/armor/bag/sturdy_red_backpack.ron index e46a915ef4..4864e10cd7 100644 --- a/assets/common/items/armor/bag/sturdy_red_backpack.ron +++ b/assets/common/items/armor/bag/sturdy_red_backpack.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("RedLarge"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/bag/tiny_leather_pouch.ron b/assets/common/items/armor/bag/tiny_leather_pouch.ron index 21d195fdca..01e1a728fc 100644 --- a/assets/common/items/armor/bag/tiny_leather_pouch.ron +++ b/assets/common/items/armor/bag/tiny_leather_pouch.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("LeatherSmall"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/bag/tiny_red_pouch.ron b/assets/common/items/armor/bag/tiny_red_pouch.ron index e8b944c994..25d2eb9566 100644 --- a/assets/common/items/armor/bag/tiny_red_pouch.ron +++ b/assets/common/items/armor/bag/tiny_red_pouch.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("RedTiny"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Common, diff --git a/assets/common/items/armor/bag/troll_hide_pack.ron b/assets/common/items/armor/bag/troll_hide_pack.ron index 242a32dc4d..848f2e0f74 100644 --- a/assets/common/items/armor/bag/troll_hide_pack.ron +++ b/assets/common/items/armor/bag/troll_hide_pack.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("GreenLarge"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: High, diff --git a/assets/common/items/armor/bag/woven_red_bag.ron b/assets/common/items/armor/bag/woven_red_bag.ron index fea605d7e3..bd3b7e6541 100644 --- a/assets/common/items/armor/bag/woven_red_bag.ron +++ b/assets/common/items/armor/bag/woven_red_bag.ron @@ -4,7 +4,10 @@ ItemDef( kind: Armor( ( kind: Bag("RedMed"), - stats: (protection: Normal(0.0)), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), ) ), quality: Moderate, diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/belt/assassin.ron index 1de9474589..82c3df79b3 100644 --- a/assets/common/items/armor/belt/assassin.ron +++ b/assets/common/items/armor/belt/assassin.ron @@ -1,14 +1,12 @@ ItemDef( name: "Assassin Belt", description: "Only the best for a member of the creed.", - kind: Armor( - ( - kind: Belt("Assassin"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Assassin"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/bonerattler.ron b/assets/common/items/armor/belt/bonerattler.ron index 64332f2f29..e4f67b8b28 100644 --- a/assets/common/items/armor/belt/bonerattler.ron +++ b/assets/common/items/armor/belt/bonerattler.ron @@ -1,14 +1,12 @@ ItemDef( name: "Bonerattler Belt", description: "Sections of vertebrae fastened together with hide and a bonerattler eye for the buckle.", - kind: Armor( - ( - kind: Belt("Bonerattler"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Bonerattler"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(5.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/belt/cloth_blue_0.ron index fee453fca8..244b75327e 100644 --- a/assets/common/items/armor/belt/cloth_blue_0.ron +++ b/assets/common/items/armor/belt/cloth_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Linen Belt", description: "A stylish rough fabric belt, dyed blue.", - kind: Armor( - ( - kind: Belt("ClothBlue0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Belt("ClothBlue0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/belt/cloth_green_0.ron index 40778a4651..1ec3329ab2 100644 --- a/assets/common/items/armor/belt/cloth_green_0.ron +++ b/assets/common/items/armor/belt/cloth_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Linen Belt", description: "A stylish rough fabric belt, dyed green.", - kind: Armor( - ( - kind: Belt("ClothGreen0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Belt("ClothGreen0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/belt/cloth_purple_0.ron index fe4ce1652d..7bfa7d79db 100644 --- a/assets/common/items/armor/belt/cloth_purple_0.ron +++ b/assets/common/items/armor/belt/cloth_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Linen Belt", description: "A stylish rough fabric belt, dyed purple.", - kind: Armor( - ( - kind: Belt("ClothPurple0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Belt("ClothPurple0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/cultist_belt.ron b/assets/common/items/armor/belt/cultist_belt.ron index 10459560db..ccadf899bd 100644 --- a/assets/common/items/armor/belt/cultist_belt.ron +++ b/assets/common/items/armor/belt/cultist_belt.ron @@ -1,14 +1,12 @@ ItemDef( name: "Cultist Belt", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Belt("Cultist"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Cultist"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(5.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/druid.ron b/assets/common/items/armor/belt/druid.ron index 8ad26c5363..8a671b09dc 100644 --- a/assets/common/items/armor/belt/druid.ron +++ b/assets/common/items/armor/belt/druid.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Druid's Belt", + name: "Druid\'s Belt", description: "Twisted vines to keep everything secure.", - kind: Armor( - ( - kind: Belt("Druid"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Druid"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/belt/leather_0.ron index 5d690dd4be..bf46b063d9 100644 --- a/assets/common/items/armor/belt/leather_0.ron +++ b/assets/common/items/armor/belt/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Belt", description: "Swift like the wind.", - kind: Armor( - ( - kind: Belt("Leather0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Leather0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/leather_2.ron b/assets/common/items/armor/belt/leather_2.ron index ab1d303584..70bba71722 100644 --- a/assets/common/items/armor/belt/leather_2.ron +++ b/assets/common/items/armor/belt/leather_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Belt", description: "A belt made from simple leather.", - kind: Armor( - ( - kind: Belt("Leather2"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Leather2"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/leather_adventurer.ron b/assets/common/items/armor/belt/leather_adventurer.ron index 7053be8dde..0052919082 100644 --- a/assets/common/items/armor/belt/leather_adventurer.ron +++ b/assets/common/items/armor/belt/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Belt", - description: "'Tightly packed pieces of leather to endure all weather.'", - kind: Armor( - ( - kind: Belt("Leather2"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + description: "\'Tightly packed pieces of leather to endure all weather.\'", + kind: Armor(( + kind: Belt("Leather2"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/belt/plate_0.ron index 5a1839243f..af5b4278e9 100644 --- a/assets/common/items/armor/belt/plate_0.ron +++ b/assets/common/items/armor/belt/plate_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Belt", description: "A tanned leather belt with a forged iron buckle.", - kind: Armor( - ( - kind: Belt("Plate0"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Plate0"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(4.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/steel_0.ron b/assets/common/items/armor/belt/steel_0.ron index 77dbbb4dd2..23c54dd287 100644 --- a/assets/common/items/armor/belt/steel_0.ron +++ b/assets/common/items/armor/belt/steel_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Steel Belt", description: "Metal alloy interlocking plates to improve protection.", - kind: Armor( - ( - kind: Belt("Steel0"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Steel0"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(8.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/tarasque.ron b/assets/common/items/armor/belt/tarasque.ron index 7f106d5a1b..bb87abe2df 100644 --- a/assets/common/items/armor/belt/tarasque.ron +++ b/assets/common/items/armor/belt/tarasque.ron @@ -1,14 +1,12 @@ ItemDef( name: "Tarasque Belt", description: "Shattered band of a tarasque shell, making for a strong belt.", - kind: Armor( - ( - kind: Belt("Tarasque"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Tarasque"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(5.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/twig.ron b/assets/common/items/armor/belt/twig.ron index 8bfd312f3f..9eea381016 100644 --- a/assets/common/items/armor/belt/twig.ron +++ b/assets/common/items/armor/belt/twig.ron @@ -1,14 +1,12 @@ ItemDef( name: "Twig Belt", description: "Small bits of nature magically held together into the shape of a belt.", - kind: Armor( - ( - kind: Belt("Twig"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Twig"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/twigsflowers.ron b/assets/common/items/armor/belt/twigsflowers.ron index 1244ff9ad8..edccb1669f 100644 --- a/assets/common/items/armor/belt/twigsflowers.ron +++ b/assets/common/items/armor/belt/twigsflowers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Flowery Belt", description: "Magically imbued twigs, held together with a flower intertwining its stem to hold the belt together.", - kind: Armor( - ( - kind: Belt("Twigsflowers"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Twigsflowers"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/twigsleaves.ron b/assets/common/items/armor/belt/twigsleaves.ron index 0002f686ad..b415bf6278 100644 --- a/assets/common/items/armor/belt/twigsleaves.ron +++ b/assets/common/items/armor/belt/twigsleaves.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leafy Belt", description: "Dried leaves cover over the standard twig belt, providing a slightly different texture.", - kind: Armor( - ( - kind: Belt("Twigsleaves"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Twigsleaves"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/velorite_mage_0.ron b/assets/common/items/armor/belt/velorite_mage_0.ron index 0ad537c8c5..c43098f982 100644 --- a/assets/common/items/armor/belt/velorite_mage_0.ron +++ b/assets/common/items/armor/belt/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Belt", description: "", - kind: Armor( - ( - kind: Belt("VeloriteMage0"), - stats: ( - protection: Normal(5.8), - poise_protection: Normal(5.8), - ), - ) - ), + kind: Armor(( + kind: Belt("VeloriteMage0"), + stats: ( + protection: Normal(5.8), + poise_protection: Normal(5.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/warlock.ron b/assets/common/items/armor/belt/warlock.ron index 15b8470714..b210b580fb 100644 --- a/assets/common/items/armor/belt/warlock.ron +++ b/assets/common/items/armor/belt/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock Belt", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Belt("Warlock"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Warlock"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(7.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/belt/warlord.ron b/assets/common/items/armor/belt/warlord.ron index d45e522d53..2b072c4e53 100644 --- a/assets/common/items/armor/belt/warlord.ron +++ b/assets/common/items/armor/belt/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Belt", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Belt("Warlord"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Belt("Warlord"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(5.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/chest/assassin.ron index 6113a1c565..3187fc429a 100644 --- a/assets/common/items/armor/chest/assassin.ron +++ b/assets/common/items/armor/chest/assassin.ron @@ -1,14 +1,12 @@ ItemDef( name: "Assassin Chest", description: "Only the best for a member of the creed.", - kind: Armor( - ( - kind: Chest("Assassin"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Assassin"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(10.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/bonerattler.ron b/assets/common/items/armor/chest/bonerattler.ron index c798ba2f26..3949ff758a 100644 --- a/assets/common/items/armor/chest/bonerattler.ron +++ b/assets/common/items/armor/chest/bonerattler.ron @@ -1,14 +1,12 @@ ItemDef( name: "Bonerattler Cuirass", description: "The spiny back and hide of a bonerattler fastened together into a protective cuirass.", - kind: Armor( - ( - kind: Chest("Bonerattler"), - stats: ( - protection: Normal(25.0), - poise_protection: Normal(25.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Bonerattler"), + stats: ( + protection: Normal(25.0), + poise_protection: Normal(35.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/chest/cloth_blue_0.ron index e0e486ad74..ddffa3c1c4 100644 --- a/assets/common/items/armor/chest/cloth_blue_0.ron +++ b/assets/common/items/armor/chest/cloth_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Linen Chest", description: "A stylish rough fabric surcoat, dyed blue.", - kind: Armor( - ( - kind: Chest("ClothBlue0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("ClothBlue0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/chest/cloth_green_0.ron index 34916646a9..0bc51f37b4 100644 --- a/assets/common/items/armor/chest/cloth_green_0.ron +++ b/assets/common/items/armor/chest/cloth_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Linen Chest", description: "A stylish rough fabric surcoat, dyed green.", - kind: Armor( - ( - kind: Chest("ClothGreen0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("ClothGreen0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/chest/cloth_purple_0.ron index c387c407c5..b0cf7f56f3 100644 --- a/assets/common/items/armor/chest/cloth_purple_0.ron +++ b/assets/common/items/armor/chest/cloth_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Linen Chest", description: "A stylish rough fabric surcoat, dyed purple.", - kind: Armor( - ( - kind: Chest("ClothPurple0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("ClothPurple0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/cultist_chest_blue.ron b/assets/common/items/armor/chest/cultist_chest_blue.ron index 1a0544647e..49ec4b6f23 100644 --- a/assets/common/items/armor/chest/cultist_chest_blue.ron +++ b/assets/common/items/armor/chest/cultist_chest_blue.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Chest", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("VeloriteMage0"), - stats: ( - protection: Normal(30.0), - poise_protection: Normal(30.0), - ), - ) - ), + kind: Armor(( + kind: Chest("VeloriteMage0"), + stats: ( + protection: Normal(30.0), + poise_protection: Normal(15.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/cultist_chest_purple.ron b/assets/common/items/armor/chest/cultist_chest_purple.ron index c0ae9ce679..82201b964e 100644 --- a/assets/common/items/armor/chest/cultist_chest_purple.ron +++ b/assets/common/items/armor/chest/cultist_chest_purple.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Cultist Chest", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("CultistPurple"), - stats: ( - protection: Normal(30.0), - poise_protection: Normal(30.0), - ), - ) - ), + kind: Armor(( + kind: Chest("CultistPurple"), + stats: ( + protection: Normal(30.0), + poise_protection: Normal(15.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/druid.ron b/assets/common/items/armor/chest/druid.ron index eb0ab16c9e..2c70e7923f 100644 --- a/assets/common/items/armor/chest/druid.ron +++ b/assets/common/items/armor/chest/druid.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Druid's Vest", + name: "Druid\'s Vest", description: "Vines and leaves formed into a tunic.", - kind: Armor( - ( - kind: Chest("Druid"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Druid"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(4.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/chest/leather_0.ron index 813ac219dd..81e07c395f 100644 --- a/assets/common/items/armor/chest/leather_0.ron +++ b/assets/common/items/armor/chest/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Chest", description: "Swift like the wind.", - kind: Armor( - ( - kind: Chest("Leather0"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Leather0"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(7.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/leather_2.ron b/assets/common/items/armor/chest/leather_2.ron index a70d363825..8fa3bf79ac 100644 --- a/assets/common/items/armor/chest/leather_2.ron +++ b/assets/common/items/armor/chest/leather_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Cuirass", description: "A cuirass made of simple leather.", - kind: Armor( - ( - kind: Chest("Leather2"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Leather2"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(8.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/leather_adventurer.ron b/assets/common/items/armor/chest/leather_adventurer.ron index fabc88942e..f717e6addb 100644 --- a/assets/common/items/armor/chest/leather_adventurer.ron +++ b/assets/common/items/armor/chest/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Chest", - description: "'Tightly packed pieces of leather to endure all weather.'", - kind: Armor( - ( - kind: Chest("Leather2"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + description: "Tightly packed pieces of leather to endure all weather.", + kind: Armor(( + kind: Chest("Leather2"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/plate_green_0.ron b/assets/common/items/armor/chest/plate_green_0.ron index ca63bac807..7448fdc129 100644 --- a/assets/common/items/armor/chest/plate_green_0.ron +++ b/assets/common/items/armor/chest/plate_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Chestplate", description: "Formed iron plate resulting in very heavy but solid protection, worn over a simple rough linen shirt, dyed green.", - kind: Armor( - ( - kind: Chest("PlateGreen0"), - stats: ( - protection: Normal(20.0), - poise_protection: Normal(20.0), - ), - ) - ), + kind: Armor(( + kind: Chest("PlateGreen0"), + stats: ( + protection: Normal(20.0), + poise_protection: Normal(18.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/rugged_chest.ron b/assets/common/items/armor/chest/rugged_chest.ron new file mode 100644 index 0000000000..3bff40df6d --- /dev/null +++ b/assets/common/items/armor/chest/rugged_chest.ron @@ -0,0 +1,12 @@ +ItemDef( + name: "Rugged Shirt", + description: "Smells like Adventure.", + kind: Armor(( + kind: Chest("Rugged0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), + quality: Low, +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/steel_0.ron b/assets/common/items/armor/chest/steel_0.ron index 38d39923ca..dab33b0f1e 100644 --- a/assets/common/items/armor/chest/steel_0.ron +++ b/assets/common/items/armor/chest/steel_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Steel Cuirass", description: "The metal alloy provides a somewhat lighter and stronger cuirass.", - kind: Armor( - ( - kind: Chest("Steel0"), - stats: ( - protection: Normal(25.0), - poise_protection: Normal(25.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Steel0"), + stats: ( + protection: Normal(25.0), + poise_protection: Normal(40.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/tarasque.ron b/assets/common/items/armor/chest/tarasque.ron index 12c45f6205..261471590c 100644 --- a/assets/common/items/armor/chest/tarasque.ron +++ b/assets/common/items/armor/chest/tarasque.ron @@ -1,14 +1,12 @@ ItemDef( name: "Tarasque Cuirass", - description: "The rough protective underbelly and back of a tarasque's shell, formed to fit humanoid proportions.", - kind: Armor( - ( - kind: Chest("Tarasque"), - stats: ( - protection: Normal(25.0), - poise_protection: Normal(25.0), - ), - ) - ), + description: "The rough protective underbelly and back of a tarasque\'s shell, formed to fit humanoid proportions.", + kind: Armor(( + kind: Chest("Tarasque"), + stats: ( + protection: Normal(25.0), + poise_protection: Normal(30.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/twig.ron b/assets/common/items/armor/chest/twig.ron index 61ecf0cdfa..38b965b741 100644 --- a/assets/common/items/armor/chest/twig.ron +++ b/assets/common/items/armor/chest/twig.ron @@ -1,14 +1,12 @@ ItemDef( name: "Twig Shirt", description: "Small sticks magically imbued to hold together to form a shirt.", - kind: Armor( - ( - kind: Chest("Twig"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Twig"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(10.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/twigsflowers.ron b/assets/common/items/armor/chest/twigsflowers.ron index 1adb866952..f7a1bfd169 100644 --- a/assets/common/items/armor/chest/twigsflowers.ron +++ b/assets/common/items/armor/chest/twigsflowers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Flowery Shirt", description: "Magically imbued twigs decorated with flowers and their stems, letting others know your intentions of peace and love.", - kind: Armor( - ( - kind: Chest("Twigsflowers"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Twigsflowers"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(8.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/twigsleaves.ron b/assets/common/items/armor/chest/twigsleaves.ron index b0a056a2fb..d8fdb9334c 100644 --- a/assets/common/items/armor/chest/twigsleaves.ron +++ b/assets/common/items/armor/chest/twigsleaves.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leafy Shirt", description: "Leaves cover the magically imbued twig shirt, providing a more natural appearance.", - kind: Armor( - ( - kind: Chest("Twigsleaves"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Twigsleaves"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(10.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/velorite_mage_0.ron b/assets/common/items/armor/chest/velorite_mage_0.ron index 2b8fb3a339..19690922fc 100644 --- a/assets/common/items/armor/chest/velorite_mage_0.ron +++ b/assets/common/items/armor/chest/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Vest", description: "", - kind: Armor( - ( - kind: Chest("VeloriteMage0"), - stats: ( - protection: Normal(28.0), - poise_protection: Normal(28.0), - ), - ) - ), + kind: Armor(( + kind: Chest("VeloriteMage0"), + stats: ( + protection: Normal(28.0), + poise_protection: Normal(20.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/warlock.ron b/assets/common/items/armor/chest/warlock.ron index 2d26ff39b0..5b74429801 100644 --- a/assets/common/items/armor/chest/warlock.ron +++ b/assets/common/items/armor/chest/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock Vest", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Chest("Warlock"), - stats: ( - protection: Normal(40.0), - poise_protection: Normal(40.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Warlock"), + stats: ( + protection: Normal(40.0), + poise_protection: Normal(29.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/warlord.ron b/assets/common/items/armor/chest/warlord.ron index 424f348ee1..86c32007bd 100644 --- a/assets/common/items/armor/chest/warlord.ron +++ b/assets/common/items/armor/chest/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Cuirass", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Chest("Warlord"), - stats: ( - protection: Normal(40.0), - poise_protection: Normal(40.0), - ), - ) - ), + kind: Armor(( + kind: Chest("Warlord"), + stats: ( + protection: Normal(40.0), + poise_protection: Normal(29.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_green_0.ron b/assets/common/items/armor/chest/worker_green_0.ron index 8ce2830435..9895131a50 100644 --- a/assets/common/items/armor/chest/worker_green_0.ron +++ b/assets/common/items/armor/chest/worker_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerGreen0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerGreen0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_green_1.ron b/assets/common/items/armor/chest/worker_green_1.ron index 3f8cf13375..8426dc28f5 100644 --- a/assets/common/items/armor/chest/worker_green_1.ron +++ b/assets/common/items/armor/chest/worker_green_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerGreen1"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerGreen1"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_orange_0.ron b/assets/common/items/armor/chest/worker_orange_0.ron index 292eec0530..bd4e8fb522 100644 --- a/assets/common/items/armor/chest/worker_orange_0.ron +++ b/assets/common/items/armor/chest/worker_orange_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Orange Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerOrange0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerOrange0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_orange_1.ron b/assets/common/items/armor/chest/worker_orange_1.ron index a24a8fb2b6..8e689c7f66 100644 --- a/assets/common/items/armor/chest/worker_orange_1.ron +++ b/assets/common/items/armor/chest/worker_orange_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Orange Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerOrange1"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerOrange1"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_purple_0.ron b/assets/common/items/armor/chest/worker_purple_0.ron index c125f34903..606aec6417 100644 --- a/assets/common/items/armor/chest/worker_purple_0.ron +++ b/assets/common/items/armor/chest/worker_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerPurple0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerPurple0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_purple_1.ron b/assets/common/items/armor/chest/worker_purple_1.ron index eac9d1046d..625a81638e 100644 --- a/assets/common/items/armor/chest/worker_purple_1.ron +++ b/assets/common/items/armor/chest/worker_purple_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerPurple1"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerPurple1"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_red_0.ron b/assets/common/items/armor/chest/worker_red_0.ron index c7585b7a19..8eee348d9f 100644 --- a/assets/common/items/armor/chest/worker_red_0.ron +++ b/assets/common/items/armor/chest/worker_red_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Red Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerRed0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerRed0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_red_1.ron b/assets/common/items/armor/chest/worker_red_1.ron index f32c5fdb4d..3f61bbb680 100644 --- a/assets/common/items/armor/chest/worker_red_1.ron +++ b/assets/common/items/armor/chest/worker_red_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Red Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerRed1"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerRed1"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_yellow_0.ron b/assets/common/items/armor/chest/worker_yellow_0.ron index fed422d41e..01d0c8505d 100644 --- a/assets/common/items/armor/chest/worker_yellow_0.ron +++ b/assets/common/items/armor/chest/worker_yellow_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Yellow Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerYellow0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerYellow0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/chest/worker_yellow_1.ron b/assets/common/items/armor/chest/worker_yellow_1.ron index 74afcc1a29..a7e6056262 100644 --- a/assets/common/items/armor/chest/worker_yellow_1.ron +++ b/assets/common/items/armor/chest/worker_yellow_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Yellow Worker Shirt", description: "Was used by a farmer, until recently.", - kind: Armor( - ( - kind: Chest("WorkerYellow1"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Chest("WorkerYellow1"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/foot/assassin.ron index 7b9294970e..47c89fd869 100644 --- a/assets/common/items/armor/foot/assassin.ron +++ b/assets/common/items/armor/foot/assassin.ron @@ -1,14 +1,12 @@ ItemDef( name: "Assassin Boots", description: "Only the best for a member of the creed.", - kind: Armor( - ( - kind: Foot("Assassin"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Assassin"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(2.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/bonerattler.ron b/assets/common/items/armor/foot/bonerattler.ron index d0c62846ae..80bae2b93d 100644 --- a/assets/common/items/armor/foot/bonerattler.ron +++ b/assets/common/items/armor/foot/bonerattler.ron @@ -1,14 +1,12 @@ ItemDef( name: "Bonerattler Boots", description: "Boots made from the claws and hide of a bonerattler.", - kind: Armor( - ( - kind: Foot("Bonerattler"), - stats: ( - protection: Normal(5.0), - poise_protection: Normal(5.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Bonerattler"), + stats: ( + protection: Normal(5.0), + poise_protection: Normal(10.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/foot/cloth_blue_0.ron index 0cc4f2312e..df4dbcc8d3 100644 --- a/assets/common/items/armor/foot/cloth_blue_0.ron +++ b/assets/common/items/armor/foot/cloth_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Linen Boots", description: "Cobbled rough fabric boots, dyed blue.", - kind: Armor( - ( - kind: Foot("ClothBlue0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Foot("ClothBlue0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/foot/cloth_green_0.ron index 5fcbb896a0..87de9052ae 100644 --- a/assets/common/items/armor/foot/cloth_green_0.ron +++ b/assets/common/items/armor/foot/cloth_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Linen Boots", description: "Cobbled rough fabric boots, dyed green.", - kind: Armor( - ( - kind: Foot("ClothGreen0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Foot("ClothGreen0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/foot/cloth_purple_0.ron index 81ecbab724..cae5b9cbe1 100644 --- a/assets/common/items/armor/foot/cloth_purple_0.ron +++ b/assets/common/items/armor/foot/cloth_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Linen Boots", description: "Cobbled rough fabric boots, dyed purple.", - kind: Armor( - ( - kind: Foot("ClothPurple0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Foot("ClothPurple0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/cultist_boots.ron b/assets/common/items/armor/foot/cultist_boots.ron index 862c9613c7..7706cc1df2 100644 --- a/assets/common/items/armor/foot/cultist_boots.ron +++ b/assets/common/items/armor/foot/cultist_boots.ron @@ -1,14 +1,12 @@ ItemDef( name: "Cultist Boots", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Foot("Cultist"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Cultist"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(3.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/druid.ron b/assets/common/items/armor/foot/druid.ron index 81598674ae..22fda43cce 100644 --- a/assets/common/items/armor/foot/druid.ron +++ b/assets/common/items/armor/foot/druid.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Druid's Slippers", + name: "Druid\'s Slippers", description: "For treading softly through the woods.", - kind: Armor( - ( - kind: Foot("Druid"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Druid"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/jackalope_slippers.ron b/assets/common/items/armor/foot/jackalope_slippers.ron index 147cf08aff..e7560776a9 100644 --- a/assets/common/items/armor/foot/jackalope_slippers.ron +++ b/assets/common/items/armor/foot/jackalope_slippers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Fluffy Jackalope Slippers", description: "So warm and cozy!", - kind: Armor( - ( - kind: Foot("JackalopeSlips"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Foot("JackalopeSlips"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(10.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/foot/leather_0.ron index 7b73d97d51..f3bc007f24 100644 --- a/assets/common/items/armor/foot/leather_0.ron +++ b/assets/common/items/armor/foot/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Boots", description: "Swift like the wind.", - kind: Armor( - ( - kind: Foot("Leather0"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Leather0"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(2.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/leather_2.ron b/assets/common/items/armor/foot/leather_2.ron index 7f9692e7ac..7155635ac4 100644 --- a/assets/common/items/armor/foot/leather_2.ron +++ b/assets/common/items/armor/foot/leather_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Boots", description: "Boots made of simple leather.", - kind: Armor( - ( - kind: Foot("Leather2"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Leather2"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(3.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/leather_adventurer.ron b/assets/common/items/armor/foot/leather_adventurer.ron index bca44d8e63..dde7c383e2 100644 --- a/assets/common/items/armor/foot/leather_adventurer.ron +++ b/assets/common/items/armor/foot/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Kickers", - description: "'Tightly packed pieces of leather to endure all weather.", - kind: Armor( - ( - kind: Foot("Leather2"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + description: "\'Tightly packed pieces of leather to endure all weather.", + kind: Armor(( + kind: Foot("Leather2"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/foot/plate_0.ron index a8fe2e35b6..625f267e1c 100644 --- a/assets/common/items/armor/foot/plate_0.ron +++ b/assets/common/items/armor/foot/plate_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Feet", description: "Quickly shaped iron plates, forming boots that are uncomfortable but durable.", - kind: Armor( - ( - kind: Foot("Plate0"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Plate0"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(8.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/sandals_0.ron b/assets/common/items/armor/foot/sandals_0.ron new file mode 100644 index 0000000000..c31247236b --- /dev/null +++ b/assets/common/items/armor/foot/sandals_0.ron @@ -0,0 +1,12 @@ +ItemDef( + name: "Worn out Sandals", + description: "Loyal companions.", + kind: Armor(( + kind: Foot("Sandal0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), + quality: Low, +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/steel_0.ron b/assets/common/items/armor/foot/steel_0.ron index e0149a53bc..17a7530e2b 100644 --- a/assets/common/items/armor/foot/steel_0.ron +++ b/assets/common/items/armor/foot/steel_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Steel Boots", description: "Metal alloy boots providing a more comfortable and durable protection.", - kind: Armor( - ( - kind: Foot("Steel0"), - stats: ( - protection: Normal(5.0), - poise_protection: Normal(5.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Steel0"), + stats: ( + protection: Normal(5.0), + poise_protection: Normal(10.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/tarasque.ron b/assets/common/items/armor/foot/tarasque.ron index 943cabc984..f7f74d5491 100644 --- a/assets/common/items/armor/foot/tarasque.ron +++ b/assets/common/items/armor/foot/tarasque.ron @@ -1,14 +1,12 @@ ItemDef( name: "Tarasque Boots", - description: "Tarasque claws form the outside of these boots, protecting the wearer's feet.", - kind: Armor( - ( - kind: Foot("Tarasque"), - stats: ( - protection: Normal(5.0), - poise_protection: Normal(5.0), - ), - ) - ), + description: "Tarasque claws form the outside of these boots, protecting the wearer\'s feet.", + kind: Armor(( + kind: Foot("Tarasque"), + stats: ( + protection: Normal(5.0), + poise_protection: Normal(9.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/twig.ron b/assets/common/items/armor/foot/twig.ron index dfcb6d69b1..857f7d3d03 100644 --- a/assets/common/items/armor/foot/twig.ron +++ b/assets/common/items/armor/foot/twig.ron @@ -1,14 +1,12 @@ ItemDef( name: "Twig Boots", description: "Small twigs intertwined and imbued with magic to provide simple protection.", - kind: Armor( - ( - kind: Foot("Twig"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Twig"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(2.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/twigsflowers.ron b/assets/common/items/armor/foot/twigsflowers.ron index 63f231bae6..90cf78f704 100644 --- a/assets/common/items/armor/foot/twigsflowers.ron +++ b/assets/common/items/armor/foot/twigsflowers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Flowery Boots", description: "Woven and magically imbued, these boots of twigs and flowers provide simple protection and peace to the wearer.", - kind: Armor( - ( - kind: Foot("Twigsflowers"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Twigsflowers"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(2.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/twigsleaves.ron b/assets/common/items/armor/foot/twigsleaves.ron index 75f3b9d45a..9bfada7d9a 100644 --- a/assets/common/items/armor/foot/twigsleaves.ron +++ b/assets/common/items/armor/foot/twigsleaves.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leafy Boots", description: "Leaves cover the magically entwined twigs to provide simple protection from the elements.", - kind: Armor( - ( - kind: Foot("Twigsleaves"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Twigsleaves"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(2.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/velorite_mage_0.ron b/assets/common/items/armor/foot/velorite_mage_0.ron index f1cbf70c86..25105b5a82 100644 --- a/assets/common/items/armor/foot/velorite_mage_0.ron +++ b/assets/common/items/armor/foot/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Boots", description: "", - kind: Armor( - ( - kind: Foot("VeloriteMage0"), - stats: ( - protection: Normal(5.9), - poise_protection: Normal(5.9), - ), - ) - ), + kind: Armor(( + kind: Foot("VeloriteMage0"), + stats: ( + protection: Normal(5.9), + poise_protection: Normal(5.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/warlock.ron b/assets/common/items/armor/foot/warlock.ron index 6aa7b9a91e..4e4a8223c4 100644 --- a/assets/common/items/armor/foot/warlock.ron +++ b/assets/common/items/armor/foot/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock Slippers", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Foot("Warlock"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Warlock"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(5.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/foot/warlord.ron b/assets/common/items/armor/foot/warlord.ron index a3a4bbc84e..8233a71004 100644 --- a/assets/common/items/armor/foot/warlord.ron +++ b/assets/common/items/armor/foot/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Feet", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Foot("Warlord"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Foot("Warlord"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(6.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/hand/assassin.ron index 95450cc92d..b62b7af3a1 100644 --- a/assets/common/items/armor/hand/assassin.ron +++ b/assets/common/items/armor/hand/assassin.ron @@ -1,14 +1,12 @@ ItemDef( name: "Assassin Gloves", description: "Only the best for a member of the creed.", - kind: Armor( - ( - kind: Hand("Assassin"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Assassin"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/bonerattler.ron b/assets/common/items/armor/hand/bonerattler.ron index d78f676564..02301694c5 100644 --- a/assets/common/items/armor/hand/bonerattler.ron +++ b/assets/common/items/armor/hand/bonerattler.ron @@ -1,14 +1,12 @@ ItemDef( name: "Bonerattler Gauntlets", description: "The hide and bone from a bonerattler provide strong protection for the wearer.", - kind: Armor( - ( - kind: Hand("Bonerattler"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Bonerattler"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(12.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/hand/cloth_blue_0.ron index baef2df7da..4244708141 100644 --- a/assets/common/items/armor/hand/cloth_blue_0.ron +++ b/assets/common/items/armor/hand/cloth_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Linen Wrists", description: "Rough cloth bracelets provide a stylish fashion statement, dyed blue.", - kind: Armor( - ( - kind: Hand("ClothBlue0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Hand("ClothBlue0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/hand/cloth_green_0.ron index d17e6b63fb..f6ff4a304d 100644 --- a/assets/common/items/armor/hand/cloth_green_0.ron +++ b/assets/common/items/armor/hand/cloth_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Linen Wrists", description: "Rough cloth bracelets provide a stylish fashion statement, dyed green.", - kind: Armor( - ( - kind: Hand("ClothGreen0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Hand("ClothGreen0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/hand/cloth_purple_0.ron index f0a7d6b253..f690a0e462 100644 --- a/assets/common/items/armor/hand/cloth_purple_0.ron +++ b/assets/common/items/armor/hand/cloth_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Silk Wrists", description: "Rough cloth bracelets provide a stylish fashion statement, dyed purple.", - kind: Armor( - ( - kind: Hand("ClothPurple0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Hand("ClothPurple0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/cultist_hands_blue.ron b/assets/common/items/armor/hand/cultist_hands_blue.ron index 2fe9f2b680..030a7810b6 100644 --- a/assets/common/items/armor/hand/cultist_hands_blue.ron +++ b/assets/common/items/armor/hand/cultist_hands_blue.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Gloves", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("VeloriteMage0"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Hand("VeloriteMage0"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(10.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/cultist_hands_purple.ron b/assets/common/items/armor/hand/cultist_hands_purple.ron index 51dd24f8c4..bca58dc2de 100644 --- a/assets/common/items/armor/hand/cultist_hands_purple.ron +++ b/assets/common/items/armor/hand/cultist_hands_purple.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Cultist Gloves", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("CultistPurple"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Hand("CultistPurple"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(8.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/druid.ron b/assets/common/items/armor/hand/druid.ron index 39f0a6bf5d..75a56addf4 100644 --- a/assets/common/items/armor/hand/druid.ron +++ b/assets/common/items/armor/hand/druid.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Druid's Gloves", + name: "Druid\'s Gloves", description: "Soft, strong, and flexible.", - kind: Armor( - ( - kind: Hand("Druid"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Druid"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/hand/leather_0.ron index 796dc8fca8..34cb811a62 100644 --- a/assets/common/items/armor/hand/leather_0.ron +++ b/assets/common/items/armor/hand/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Gloves", description: "Swift like the wind.", - kind: Armor( - ( - kind: Hand("Leather0"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Leather0"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(3.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/leather_2.ron b/assets/common/items/armor/hand/leather_2.ron index 4170378ceb..200c0155f8 100644 --- a/assets/common/items/armor/hand/leather_2.ron +++ b/assets/common/items/armor/hand/leather_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Gloves", description: "Gloves made of simple leather.", - kind: Armor( - ( - kind: Hand("Leather2"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Leather2"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(5.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/leather_adventurer.ron b/assets/common/items/armor/hand/leather_adventurer.ron index 8a04897ce2..3d91d07641 100644 --- a/assets/common/items/armor/hand/leather_adventurer.ron +++ b/assets/common/items/armor/hand/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Gauntlets", - description: "'Tightly packed pieces of leather to endure all weather.'", - kind: Armor( - ( - kind: Hand("Leather2"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + description: "\'Tightly packed pieces of leather to endure all weather.\'", + kind: Armor(( + kind: Hand("Leather2"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(4.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/hand/plate_0.ron index 3bb81d2cdc..5b4536ba18 100644 --- a/assets/common/items/armor/hand/plate_0.ron +++ b/assets/common/items/armor/hand/plate_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Handguards", description: "Heavy chunks of metal plate, not the most comfortable but keeps the wearer safe.", - kind: Armor( - ( - kind: Hand("Plate0"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Plate0"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(11.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/steel_0.ron b/assets/common/items/armor/hand/steel_0.ron index 22513effe1..c79fee29ad 100644 --- a/assets/common/items/armor/hand/steel_0.ron +++ b/assets/common/items/armor/hand/steel_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Steel Gauntlets", description: "The metal alloy provides better protection and lighter weight, a quite comfortable gauntlet.", - kind: Armor( - ( - kind: Hand("Steel0"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Steel0"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(15.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/tarasque.ron b/assets/common/items/armor/hand/tarasque.ron index 916da7c2c0..5ec60153fb 100644 --- a/assets/common/items/armor/hand/tarasque.ron +++ b/assets/common/items/armor/hand/tarasque.ron @@ -1,14 +1,12 @@ ItemDef( name: "Tarasque Gauntlets", description: "Shattered fragments from a tarasque shell shaped into a protective gauntlets.", - kind: Armor( - ( - kind: Hand("Tarasque"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Tarasque"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(12.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/twig.ron b/assets/common/items/armor/hand/twig.ron index 1432b30cbe..b333c5230d 100644 --- a/assets/common/items/armor/hand/twig.ron +++ b/assets/common/items/armor/hand/twig.ron @@ -1,14 +1,12 @@ ItemDef( name: "Twig Wraps", description: "Magically imbued twigs interlocked into simple hand wraps.", - kind: Armor( - ( - kind: Hand("Twig"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Twig"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(6.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/twigsflowers.ron b/assets/common/items/armor/hand/twigsflowers.ron index d1f201a9ef..88c94c0113 100644 --- a/assets/common/items/armor/hand/twigsflowers.ron +++ b/assets/common/items/armor/hand/twigsflowers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Flowery Wraps", description: "Wrapped and intertwined twigs held together with magic and flowers with their stems, providing peace and protection for the wearer.", - kind: Armor( - ( - kind: Hand("Twigsflowers"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Twigsflowers"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(4.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/twigsleaves.ron b/assets/common/items/armor/hand/twigsleaves.ron index 905027e43d..e744ca2840 100644 --- a/assets/common/items/armor/hand/twigsleaves.ron +++ b/assets/common/items/armor/hand/twigsleaves.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leafy Wraps", description: "Leaves help hide the magic-interlocking twigs, and provide mild protection from the elements.", - kind: Armor( - ( - kind: Hand("Twigsleaves"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Twigsleaves"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(7.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/velorite_mage_0.ron b/assets/common/items/armor/hand/velorite_mage_0.ron index abef7c24e8..40695e44db 100644 --- a/assets/common/items/armor/hand/velorite_mage_0.ron +++ b/assets/common/items/armor/hand/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Gauntlets", description: "", - kind: Armor( - ( - kind: Hand("VeloriteMage0"), - stats: ( - protection: Normal(11.5), - poise_protection: Normal(11.5), - ), - ) - ), + kind: Armor(( + kind: Hand("VeloriteMage0"), + stats: ( + protection: Normal(11.5), + poise_protection: Normal(13.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/warlock.ron b/assets/common/items/armor/hand/warlock.ron index 43a5070086..ee11e4774e 100644 --- a/assets/common/items/armor/hand/warlock.ron +++ b/assets/common/items/armor/hand/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock Gloves", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Hand("Warlock"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Warlock"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(16.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/hand/warlord.ron b/assets/common/items/armor/hand/warlord.ron index 421bc31ad0..8296cd5762 100644 --- a/assets/common/items/armor/hand/warlord.ron +++ b/assets/common/items/armor/hand/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Handguards", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Hand("Warlord"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Hand("Warlord"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(14.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/head/assa_mask_0.ron b/assets/common/items/armor/head/assa_mask_0.ron index fe3c1e9359..03737444fa 100644 --- a/assets/common/items/armor/head/assa_mask_0.ron +++ b/assets/common/items/armor/head/assa_mask_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Dark Assassin Mask", description: "A general assassination mask preventing the wearer from being identified.", - kind: Armor( - ( - kind: Head("AssaMask0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Head("AssaMask0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/head/leather_0.ron b/assets/common/items/armor/head/leather_0.ron index 296427caab..ff3c2db2ab 100644 --- a/assets/common/items/armor/head/leather_0.ron +++ b/assets/common/items/armor/head/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Leather Cap", description: "Swift like the wind.", - kind: Armor( - ( - kind: Head("Leather0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), + kind: Armor(( + kind: Head("Leather0"), + stats: ( + protection: Normal(0.0), + poise_protection: Normal(0.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/head/warlock.ron b/assets/common/items/armor/head/warlock.ron index 6d784ff978..b094cb5aea 100644 --- a/assets/common/items/armor/head/warlock.ron +++ b/assets/common/items/armor/head/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Head("Warlock"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Head("Warlock"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/head/warlord.ron b/assets/common/items/armor/head/warlord.ron index 42619e4f4c..21f30e05ef 100644 --- a/assets/common/items/armor/head/warlord.ron +++ b/assets/common/items/armor/head/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Helmet", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Head("Warlord"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Head("Warlord"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(10.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/neck/neck_0.ron index 58b7bdc43b..630b6d56d0 100644 --- a/assets/common/items/armor/neck/neck_0.ron +++ b/assets/common/items/armor/neck/neck_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Plain Necklace", - description: "It's become tarnished with age.", - kind: Armor( - ( - kind: Neck("Neck0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + description: "It\'s become tarnished with age.", + kind: Armor(( + kind: Neck("Neck0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/neck/neck_1.ron b/assets/common/items/armor/neck/neck_1.ron index 327d5f9bd3..a6ab8c83ec 100644 --- a/assets/common/items/armor/neck/neck_1.ron +++ b/assets/common/items/armor/neck/neck_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Gem of lesser Protection", description: "Surrounded by a discrete magical glow.", - kind: Armor( - ( - kind: Neck("Neck1"), - stats: ( - protection: Normal(2.0), - poise_protection: Normal(2.0), - ), - ) - ), + kind: Armor(( + kind: Neck("Neck1"), + stats: ( + protection: Normal(2.0), + poise_protection: Normal(1.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/pants/assassin.ron index 682b51cc23..ba594eaf56 100644 --- a/assets/common/items/armor/pants/assassin.ron +++ b/assets/common/items/armor/pants/assassin.ron @@ -1,14 +1,12 @@ ItemDef( name: "Assassin Pants", description: "Only the best for a member of the creed.", - kind: Armor( - ( - kind: Pants("Assassin"), - stats: ( - protection: Normal(10.0), - poise_protection: Normal(10.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Assassin"), + stats: ( + protection: Normal(10.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/bonerattler.ron b/assets/common/items/armor/pants/bonerattler.ron index 90ad1c8b4e..83bdd272ae 100644 --- a/assets/common/items/armor/pants/bonerattler.ron +++ b/assets/common/items/armor/pants/bonerattler.ron @@ -1,14 +1,12 @@ ItemDef( name: "Bonerattler Chausses", - description: "Assorted bones and hide from a bonerattler provide protection around the wearer's legs.", - kind: Armor( - ( - kind: Pants("Bonerattler"), - stats: ( - protection: Normal(20.0), - poise_protection: Normal(20.0), - ), - ) - ), + description: "Assorted bones and hide from a bonerattler provide protection around the wearer\'s legs.", + kind: Armor(( + kind: Pants("Bonerattler"), + stats: ( + protection: Normal(20.0), + poise_protection: Normal(24.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron index 272bf3145b..bbeac292b0 100644 --- a/assets/common/items/armor/pants/cloth_blue_0.ron +++ b/assets/common/items/armor/pants/cloth_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Linen Skirt", description: "A stylish, rough fabric skirt, dyed blue.", - kind: Armor( - ( - kind: Pants("ClothBlue0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Pants("ClothBlue0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron index fc7063325b..838d7b9076 100644 --- a/assets/common/items/armor/pants/cloth_green_0.ron +++ b/assets/common/items/armor/pants/cloth_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Linen Skirt", description: "A stylish, rough fabric skirt, dyed green.", - kind: Armor( - ( - kind: Pants("ClothGreen0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Pants("ClothGreen0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron index 5bbf79b764..aae0ec55a1 100644 --- a/assets/common/items/armor/pants/cloth_purple_0.ron +++ b/assets/common/items/armor/pants/cloth_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Linen Skirt", description: "A stylish, rough fabric skirt, dyed purple.", - kind: Armor( - ( - kind: Pants("ClothPurple0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Pants("ClothPurple0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/cultist_legs_blue.ron b/assets/common/items/armor/pants/cultist_legs_blue.ron index 601dc97f91..8ec6f453e8 100644 --- a/assets/common/items/armor/pants/cultist_legs_blue.ron +++ b/assets/common/items/armor/pants/cultist_legs_blue.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Skirt", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("VeloriteMage0"), - stats: ( - protection: Normal(24.0), - poise_protection: Normal(24.0), - ), - ) - ), + kind: Armor(( + kind: Pants("VeloriteMage0"), + stats: ( + protection: Normal(24.0), + poise_protection: Normal(10.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/cultist_legs_purple.ron b/assets/common/items/armor/pants/cultist_legs_purple.ron index d19780d7c9..ced96aa5d1 100644 --- a/assets/common/items/armor/pants/cultist_legs_purple.ron +++ b/assets/common/items/armor/pants/cultist_legs_purple.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Cultist Skirt", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("CultistPurple"), - stats: ( - protection: Normal(24.0), - poise_protection: Normal(24.0), - ), - ) - ), + kind: Armor(( + kind: Pants("CultistPurple"), + stats: ( + protection: Normal(24.0), + poise_protection: Normal(14.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/druid.ron b/assets/common/items/armor/pants/druid.ron index d3d93f948b..89175715d7 100644 --- a/assets/common/items/armor/pants/druid.ron +++ b/assets/common/items/armor/pants/druid.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Druid's Kilt", + name: "Druid\'s Kilt", description: "Feel the breeze!", - kind: Armor( - ( - kind: Pants("Druid"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Druid"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(2.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/hunting.ron b/assets/common/items/armor/pants/hunting.ron index 40571bb6e3..9949f01188 100644 --- a/assets/common/items/armor/pants/hunting.ron +++ b/assets/common/items/armor/pants/hunting.ron @@ -1,14 +1,12 @@ ItemDef( name: "Hunting Pants", description: "Crafted from soft, supple leather.", - kind: Armor( - ( - kind: Pants("Hunting"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Hunting"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/pants/leather_0.ron index 6ffea50e25..dc7ddf2596 100644 --- a/assets/common/items/armor/pants/leather_0.ron +++ b/assets/common/items/armor/pants/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Pants", description: "Swift like the wind.", - kind: Armor( - ( - kind: Pants("Leather0"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Leather0"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(4.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/leather_2.ron b/assets/common/items/armor/pants/leather_2.ron index 4de3b3c13e..b42fd74be2 100644 --- a/assets/common/items/armor/pants/leather_2.ron +++ b/assets/common/items/armor/pants/leather_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Leg Armour", description: "Leg armour made of simple leather.", - kind: Armor( - ( - kind: Pants("Leather2"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Leather2"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(4.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/leather_adventurer.ron b/assets/common/items/armor/pants/leather_adventurer.ron index f884358bea..ec8373085f 100644 --- a/assets/common/items/armor/pants/leather_adventurer.ron +++ b/assets/common/items/armor/pants/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Pantalons", - description: "'Tightly packed pieces of leather to endure all weather.'", - kind: Armor( - ( - kind: Pants("Leather2"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + description: "\'Tightly packed pieces of leather to endure all weather.\'", + kind: Armor(( + kind: Pants("Leather2"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(3.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/plate_green_0.ron b/assets/common/items/armor/pants/plate_green_0.ron index 91608dd4e8..dae01fd5dd 100644 --- a/assets/common/items/armor/pants/plate_green_0.ron +++ b/assets/common/items/armor/pants/plate_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Legguards", description: "Heavy iron plate formed into protective greaves, decorated with rough green fabric.", - kind: Armor( - ( - kind: Pants("PlateGreen0"), - stats: ( - protection: Normal(16.0), - poise_protection: Normal(16.0), - ), - ) - ), + kind: Armor(( + kind: Pants("PlateGreen0"), + stats: ( + protection: Normal(16.0), + poise_protection: Normal(14.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/rugged_pants.ron b/assets/common/items/armor/pants/rugged_pants.ron new file mode 100644 index 0000000000..1b1b080186 --- /dev/null +++ b/assets/common/items/armor/pants/rugged_pants.ron @@ -0,0 +1,12 @@ +ItemDef( + name: "Rugged Commoner\'s Pants", + description: "They remind you of the old days.", + kind: Armor(( + kind: Pants("Rugged0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), + quality: Low, +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/steel_0.ron b/assets/common/items/armor/pants/steel_0.ron index 053b2dc4f7..2b574bc0f1 100644 --- a/assets/common/items/armor/pants/steel_0.ron +++ b/assets/common/items/armor/pants/steel_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Steel Chausses", description: "The metal alloy provides improvements to fit, durability, and lightness.", - kind: Armor( - ( - kind: Pants("Steel0"), - stats: ( - protection: Normal(20.0), - poise_protection: Normal(20.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Steel0"), + stats: ( + protection: Normal(20.0), + poise_protection: Normal(26.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/tarasque.ron b/assets/common/items/armor/pants/tarasque.ron index 50ab6b05fa..f9307351fc 100644 --- a/assets/common/items/armor/pants/tarasque.ron +++ b/assets/common/items/armor/pants/tarasque.ron @@ -1,14 +1,12 @@ ItemDef( name: "Tarasque Chausses", description: "Fragmented tarasque shell tied together to form protective leg armor.", - kind: Armor( - ( - kind: Pants("Tarasque"), - stats: ( - protection: Normal(20.0), - poise_protection: Normal(20.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Tarasque"), + stats: ( + protection: Normal(20.0), + poise_protection: Normal(13.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/twig.ron b/assets/common/items/armor/pants/twig.ron index 681e19e214..0d77fee2c5 100644 --- a/assets/common/items/armor/pants/twig.ron +++ b/assets/common/items/armor/pants/twig.ron @@ -1,14 +1,12 @@ ItemDef( name: "Twig Pants", description: "Magically imbued twigs formed into links similar to chainmail.", - kind: Armor( - ( - kind: Pants("Twig"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Twig"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(9.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/twigsflowers.ron b/assets/common/items/armor/pants/twigsflowers.ron index 0b1bf9d12e..9f5144f925 100644 --- a/assets/common/items/armor/pants/twigsflowers.ron +++ b/assets/common/items/armor/pants/twigsflowers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Flowery Pants", description: "Chainmail woven twigs enhanced with flower stems to provide protection and peace.", - kind: Armor( - ( - kind: Pants("Twigsflowers"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Twigsflowers"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(4.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/twigsleaves.ron b/assets/common/items/armor/pants/twigsleaves.ron index 41a039044d..64b5f402e0 100644 --- a/assets/common/items/armor/pants/twigsleaves.ron +++ b/assets/common/items/armor/pants/twigsleaves.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leafy Pants", description: "Leaves cover the magically imbued chainmail twigs, providing protection from the elements.", - kind: Armor( - ( - kind: Pants("Twigsleaves"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Twigsleaves"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(8.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/velorite_mage_0.ron b/assets/common/items/armor/pants/velorite_mage_0.ron index f535d9e98e..24bde08cdf 100644 --- a/assets/common/items/armor/pants/velorite_mage_0.ron +++ b/assets/common/items/armor/pants/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Kilt", description: "", - kind: Armor( - ( - kind: Pants("VeloriteMage0"), - stats: ( - protection: Normal(23.0), - poise_protection: Normal(23.0), - ), - ) - ), + kind: Armor(( + kind: Pants("VeloriteMage0"), + stats: ( + protection: Normal(23.0), + poise_protection: Normal(23.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/warlock.ron b/assets/common/items/armor/pants/warlock.ron index 1851d47312..d90eaad5b1 100644 --- a/assets/common/items/armor/pants/warlock.ron +++ b/assets/common/items/armor/pants/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock Kilt", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Pants("Warlock"), - stats: ( - protection: Normal(30.0), - poise_protection: Normal(30.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Warlock"), + stats: ( + protection: Normal(30.0), + poise_protection: Normal(20.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/warlord.ron b/assets/common/items/armor/pants/warlord.ron index 317b581f02..e79de3fdfd 100644 --- a/assets/common/items/armor/pants/warlord.ron +++ b/assets/common/items/armor/pants/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Legguards", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Pants("Warlord"), - stats: ( - protection: Normal(30.0), - poise_protection: Normal(30.0), - ), - ) - ), + kind: Armor(( + kind: Pants("Warlord"), + stats: ( + protection: Normal(30.0), + poise_protection: Normal(24.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/pants/worker_blue_0.ron b/assets/common/items/armor/pants/worker_blue_0.ron index 5966cbb41c..03010751ed 100644 --- a/assets/common/items/armor/pants/worker_blue_0.ron +++ b/assets/common/items/armor/pants/worker_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Worker Pants", description: "Pants used by a farmer, until recently.", - kind: Armor( - ( - kind: Pants("WorkerBlue0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Pants("WorkerBlue0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/ring/ring_0.ron index c80d88af8a..0518883f0e 100644 --- a/assets/common/items/armor/ring/ring_0.ron +++ b/assets/common/items/armor/ring/ring_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Scratched Ring", description: "Barely fits your finger.", - kind: Armor( - ( - kind: Ring("Ring0"), - stats: ( - protection: Normal(0.1), - poise_protection: Normal(0.1), - ), - ) - ), + kind: Armor(( + kind: Ring("Ring0"), + stats: ( + protection: Normal(0.1), + poise_protection: Normal(0.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/ring/ring_gold_0.ron b/assets/common/items/armor/ring/ring_gold_0.ron index 91a8609f02..5c81641263 100644 --- a/assets/common/items/armor/ring/ring_gold_0.ron +++ b/assets/common/items/armor/ring/ring_gold_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Gold Ring", description: "Someone is surely missing it...", - kind: Armor( - ( - kind: Ring("RingGold0"), - stats: ( - protection: Normal(0.5), - poise_protection: Normal(0.5), - ), - ) - ), + kind: Armor(( + kind: Ring("RingGold0"), + stats: ( + protection: Normal(0.5), + poise_protection: Normal(0.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/ring/ring_purp_high_0.ron b/assets/common/items/armor/ring/ring_purp_high_0.ron index 9c13da06a0..8a0712f096 100644 --- a/assets/common/items/armor/ring/ring_purp_high_0.ron +++ b/assets/common/items/armor/ring/ring_purp_high_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Cultist Signet Ring ", description: "Once belonged to a cultist.", - kind: Armor( - ( - kind: Ring("RingSkull0"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Ring("RingSkull0"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(1.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/shoulder/assassin.ron index 9abc1260f3..1c10253bdc 100644 --- a/assets/common/items/armor/shoulder/assassin.ron +++ b/assets/common/items/armor/shoulder/assassin.ron @@ -1,14 +1,12 @@ ItemDef( name: "Assassin Shoulder Guard", description: "Only the best for a member of the creed.", - kind: Armor( - ( - kind: Shoulder("Assassin"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Assassin"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(7.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/bonerattler.ron b/assets/common/items/armor/shoulder/bonerattler.ron index 7e3d2e9c7d..ef28b9afb3 100644 --- a/assets/common/items/armor/shoulder/bonerattler.ron +++ b/assets/common/items/armor/shoulder/bonerattler.ron @@ -1,14 +1,12 @@ ItemDef( name: "Bonerattler Shoulder Pad", description: "Roughly formed bonerattler hide provide some strong protection.", - kind: Armor( - ( - kind: Shoulder("Bonerattler"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Bonerattler"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(17.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron index 862ac8ff92..1d63341e8d 100644 --- a/assets/common/items/armor/shoulder/cloth_blue_0.ron +++ b/assets/common/items/armor/shoulder/cloth_blue_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Linen Coat", description: "A rough fabric coat, dyed blue.", - kind: Armor( - ( - kind: Shoulder("ClothBlue0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("ClothBlue0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cloth_blue_1.ron b/assets/common/items/armor/shoulder/cloth_blue_1.ron index 7838333050..24580035b0 100644 --- a/assets/common/items/armor/shoulder/cloth_blue_1.ron +++ b/assets/common/items/armor/shoulder/cloth_blue_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Blue Cloth Pads", description: "Simple shoulderpads made from blue cloth.", - kind: Armor( - ( - kind: Shoulder("ClothBlue1"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("ClothBlue1"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron index f2eb62d66d..ca40e6834d 100644 --- a/assets/common/items/armor/shoulder/cloth_green_0.ron +++ b/assets/common/items/armor/shoulder/cloth_green_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Green Linen Coat", description: "A rough fabric coat, dyed green.", - kind: Armor( - ( - kind: Shoulder("ClothGreen0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("ClothGreen0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron index be11c3a74f..e62af412b7 100644 --- a/assets/common/items/armor/shoulder/cloth_purple_0.ron +++ b/assets/common/items/armor/shoulder/cloth_purple_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Linen Coat", description: "A rough fabric coat, dyed purple.", - kind: Armor( - ( - kind: Shoulder("ClothPurple0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("ClothPurple0"), + stats: ( + protection: Normal(1.0), + poise_protection: Normal(1.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron index 45d255daa9..8bd3713d34 100644 --- a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron +++ b/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Mantle", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Shoulder("VeloriteMage0"), - stats: ( - protection: Normal(18.0), - poise_protection: Normal(18.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("VeloriteMage0"), + stats: ( + protection: Normal(18.0), + poise_protection: Normal(10.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron index 080efcec72..d030dfe23b 100644 --- a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron +++ b/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron @@ -1,14 +1,12 @@ ItemDef( name: "Purple Cultist Mantle", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Shoulder("CultistPurple"), - stats: ( - protection: Normal(18.0), - poise_protection: Normal(18.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("CultistPurple"), + stats: ( + protection: Normal(18.0), + poise_protection: Normal(10.0), + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/druidshoulder.ron b/assets/common/items/armor/shoulder/druidshoulder.ron index 558290d0a6..2d86189db0 100644 --- a/assets/common/items/armor/shoulder/druidshoulder.ron +++ b/assets/common/items/armor/shoulder/druidshoulder.ron @@ -1,14 +1,12 @@ ItemDef( name: "Druid Shoulders", description: "Forged for protectors of the wild.", - kind: Armor( - ( - kind: Shoulder("DruidShoulder"), - stats: ( - protection: Normal(3.0), - poise_protection: Normal(3.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("DruidShoulder"), + stats: ( + protection: Normal(3.0), + poise_protection: Normal(6.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/iron_spikes.ron b/assets/common/items/armor/shoulder/iron_spikes.ron index cc08a60deb..fd09631a2a 100644 --- a/assets/common/items/armor/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/shoulder/iron_spikes.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Spiked Pauldrons", description: "The heavy, rough iron plate has an interlocking spikes shoved through several slots in the center to dissuade attackers.", - kind: Armor( - ( - kind: Shoulder("IronSpikes"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("IronSpikes"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(15.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/shoulder/leather_0.ron index c44e7a7520..6f272a0d32 100644 --- a/assets/common/items/armor/shoulder/leather_0.ron +++ b/assets/common/items/armor/shoulder/leather_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Pauldrons", description: "Animal hide tanned and formed into shoulder pads.", - kind: Armor( - ( - kind: Shoulder("Leather0"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Leather0"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(3.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/shoulder/leather_1.ron index df814b6af8..ff538ac34b 100644 --- a/assets/common/items/armor/shoulder/leather_1.ron +++ b/assets/common/items/armor/shoulder/leather_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Swift Shoulderpads", description: "Swift like the wind.", - kind: Armor( - ( - kind: Shoulder("Leather1"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Leather1"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(5.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_2.ron b/assets/common/items/armor/shoulder/leather_2.ron index 32b67a32a1..ac296dab96 100644 --- a/assets/common/items/armor/shoulder/leather_2.ron +++ b/assets/common/items/armor/shoulder/leather_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Shoulder Pad", description: "A simple shoulder pad made of leather.", - kind: Armor( - ( - kind: Shoulder("Leather2"), - stats: ( - protection: Normal(6.0), - poise_protection: Normal(6.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Leather2"), + stats: ( + protection: Normal(6.0), + poise_protection: Normal(2.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_adventurer.ron b/assets/common/items/armor/shoulder/leather_adventurer.ron index 57caf4d057..b0ac340d3d 100644 --- a/assets/common/items/armor/shoulder/leather_adventurer.ron +++ b/assets/common/items/armor/shoulder/leather_adventurer.ron @@ -1,14 +1,12 @@ ItemDef( name: "Agile Guards", - description: "'Tightly packed pieces of leather to endure all weather.'", - kind: Armor( - ( - kind: Shoulder("Leather2"), - stats: ( - protection: Normal(8.0), - poise_protection: Normal(8.0), - ), - ) - ), + description: "Tightly packed pieces of leather to endure all weather.", + kind: Armor(( + kind: Shoulder("Leather2"), + stats: ( + protection: Normal(8.0), + poise_protection: Normal(4.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_iron_0.ron b/assets/common/items/armor/shoulder/leather_iron_0.ron index 48514de458..f2d0c99be8 100644 --- a/assets/common/items/armor/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/shoulder/leather_iron_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather shoulders decorated with heavy iron hooks provide protection to the wearer.", - kind: Armor( - ( - kind: Shoulder("IronLeather0"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("IronLeather0"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(5.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_iron_1.ron b/assets/common/items/armor/shoulder/leather_iron_1.ron index 74a2099e37..b5b56728ac 100644 --- a/assets/common/items/armor/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/shoulder/leather_iron_1.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather inset with heavy iron spikes provide solid protection to the wearer.", - kind: Armor( - ( - kind: Shoulder("IronLeather1"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("IronLeather1"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(10.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_iron_2.ron b/assets/common/items/armor/shoulder/leather_iron_2.ron index 895990894d..f83d0f4e70 100644 --- a/assets/common/items/armor/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/shoulder/leather_iron_2.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather inset with heavy iron bands provide protection to the wearer.", - kind: Armor( - ( - kind: Shoulder("IronLeather2"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("IronLeather2"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(8.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_iron_3.ron b/assets/common/items/armor/shoulder/leather_iron_3.ron index 080d6b999d..23b27de3a2 100644 --- a/assets/common/items/armor/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/shoulder/leather_iron_3.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather inset with iron fragments provide protection to the wearer.", - kind: Armor( - ( - kind: Shoulder("IronLeather3"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("IronLeather3"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(5.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/leather_strips.ron b/assets/common/items/armor/shoulder/leather_strips.ron index e709b06ade..a022a00880 100644 --- a/assets/common/items/armor/shoulder/leather_strips.ron +++ b/assets/common/items/armor/shoulder/leather_strips.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leather Strips", description: "Tanned animal hide strips formed into loose shoulder pads.", - kind: Armor( - ( - kind: Shoulder("LeatherStrips"), - stats: ( - protection: Normal(4.0), - poise_protection: Normal(4.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("LeatherStrips"), + stats: ( + protection: Normal(4.0), + poise_protection: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/shoulder/plate_0.ron index 49233e3539..6557f6276f 100644 --- a/assets/common/items/armor/shoulder/plate_0.ron +++ b/assets/common/items/armor/shoulder/plate_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Iron Shoulderguards", description: "Heavy iron shoulder protection.", - kind: Armor( - ( - kind: Shoulder("Plate0"), - stats: ( - protection: Normal(12.0), - poise_protection: Normal(12.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Plate0"), + stats: ( + protection: Normal(12.0), + poise_protection: Normal(16.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/steel_0.ron b/assets/common/items/armor/shoulder/steel_0.ron index 1a42ac98db..c1e0a6269d 100644 --- a/assets/common/items/armor/shoulder/steel_0.ron +++ b/assets/common/items/armor/shoulder/steel_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Steel Shoulder Pad", description: "The metal alloy plates provide better protection and comfort.", - kind: Armor( - ( - kind: Shoulder("Steel0"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Steel0"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(20.0), + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/tarasque.ron b/assets/common/items/armor/shoulder/tarasque.ron index c36dd0d8bb..d337fe4dce 100644 --- a/assets/common/items/armor/shoulder/tarasque.ron +++ b/assets/common/items/armor/shoulder/tarasque.ron @@ -1,14 +1,12 @@ ItemDef( name: "Tarasque Shoulder Pad", description: "Spiky tarasque shell fragments formed to fit as shoulder guards.", - kind: Armor( - ( - kind: Shoulder("Tarasque"), - stats: ( - protection: Normal(15.0), - poise_protection: Normal(15.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Tarasque"), + stats: ( + protection: Normal(15.0), + poise_protection: Normal(18.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/twigs.ron b/assets/common/items/armor/shoulder/twigs.ron index 4119d695fa..43c88206b4 100644 --- a/assets/common/items/armor/shoulder/twigs.ron +++ b/assets/common/items/armor/shoulder/twigs.ron @@ -1,14 +1,12 @@ ItemDef( name: "Twiggy Shoulders", description: "Spaulders made from tightly tied twigs.", - kind: Armor( - ( - kind: Shoulder("TwiggyShoulder"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("TwiggyShoulder"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(14.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/twigsflowers.ron b/assets/common/items/armor/shoulder/twigsflowers.ron index 8c3ec79476..2f71b4d46d 100644 --- a/assets/common/items/armor/shoulder/twigsflowers.ron +++ b/assets/common/items/armor/shoulder/twigsflowers.ron @@ -1,14 +1,12 @@ ItemDef( name: "Flowery Shoulders", description: "Flowers join the tied twigs to provide protection and peace to the wearer.", - kind: Armor( - ( - kind: Shoulder("FlowerShoulder"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("FlowerShoulder"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(3.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/twigsleaves.ron b/assets/common/items/armor/shoulder/twigsleaves.ron index c710157b19..210a7edeff 100644 --- a/assets/common/items/armor/shoulder/twigsleaves.ron +++ b/assets/common/items/armor/shoulder/twigsleaves.ron @@ -1,14 +1,12 @@ ItemDef( name: "Leafy Shoulders", description: "Leaves cover over the twigs to provide better protection from the elements.", - kind: Armor( - ( - kind: Shoulder("LeafyShoulder"), - stats: ( - protection: Normal(9.0), - poise_protection: Normal(9.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("LeafyShoulder"), + stats: ( + protection: Normal(9.0), + poise_protection: Normal(2.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/velorite_mage_0.ron b/assets/common/items/armor/shoulder/velorite_mage_0.ron index a7cfbbd0ae..84b90cc5fb 100644 --- a/assets/common/items/armor/shoulder/velorite_mage_0.ron +++ b/assets/common/items/armor/shoulder/velorite_mage_0.ron @@ -1,14 +1,12 @@ ItemDef( name: "Velorite Battlemage Guards", description: "", - kind: Armor( - ( - kind: Shoulder("VeloriteMage0"), - stats: ( - protection: Normal(17.0), - poise_protection: Normal(17.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("VeloriteMage0"), + stats: ( + protection: Normal(17.0), + poise_protection: Normal(17.0), + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/warlock.ron b/assets/common/items/armor/shoulder/warlock.ron index ec4ba04684..a740b10fb0 100644 --- a/assets/common/items/armor/shoulder/warlock.ron +++ b/assets/common/items/armor/shoulder/warlock.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlock Shoulders", description: "Belong to a mighty warlock.", - kind: Armor( - ( - kind: Shoulder("Warlock"), - stats: ( - protection: Normal(22.0), - poise_protection: Normal(22.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Warlock"), + stats: ( + protection: Normal(22.0), + poise_protection: Normal(15.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/warlord.ron b/assets/common/items/armor/shoulder/warlord.ron index ac03adcd99..6253406be4 100644 --- a/assets/common/items/armor/shoulder/warlord.ron +++ b/assets/common/items/armor/shoulder/warlord.ron @@ -1,14 +1,12 @@ ItemDef( name: "Warlord Shoulderguards", description: "Belong to a mighty warlord.", - kind: Armor( - ( - kind: Shoulder("Warlord"), - stats: ( - protection: Normal(22.0), - poise_protection: Normal(22.0), - ), - ) - ), + kind: Armor(( + kind: Shoulder("Warlord"), + stats: ( + protection: Normal(22.0), + poise_protection: Normal(14.0), + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/armor/starter/lantern.ron b/assets/common/items/armor/starter/lantern.ron deleted file mode 100644 index 5f0affc265..0000000000 --- a/assets/common/items/armor/starter/lantern.ron +++ /dev/null @@ -1,13 +0,0 @@ -ItemDef( - name: "Black Lantern", - description: "Used by city guards.", - kind: Lantern( - ( - kind: "Black0", - color: (r: 255, g: 190, b: 75), - strength_thousandths: 3000, - flicker_thousandths: 300, - ), - ), - quality: Common, -) diff --git a/assets/common/items/armor/starter/rugged_chest.ron b/assets/common/items/armor/starter/rugged_chest.ron deleted file mode 100644 index 875a2eca4d..0000000000 --- a/assets/common/items/armor/starter/rugged_chest.ron +++ /dev/null @@ -1,14 +0,0 @@ -ItemDef( - name: "Rugged Shirt", - description: "Smells like Adventure.", - kind: Armor( - ( - kind: Chest("Rugged0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), - quality: Low, -) diff --git a/assets/common/items/armor/starter/rugged_pants.ron b/assets/common/items/armor/starter/rugged_pants.ron deleted file mode 100644 index 406f74ef4a..0000000000 --- a/assets/common/items/armor/starter/rugged_pants.ron +++ /dev/null @@ -1,14 +0,0 @@ -ItemDef( - name: "Rugged Commoner's Pants", - description: "They remind you of the old days.", - kind: Armor( - ( - kind: Pants("Rugged0"), - stats: ( - protection: Normal(1.0), - poise_protection: Normal(1.0), - ), - ) - ), - quality: Low, -) diff --git a/assets/common/items/armor/starter/sandals_0.ron b/assets/common/items/armor/starter/sandals_0.ron deleted file mode 100644 index e817909913..0000000000 --- a/assets/common/items/armor/starter/sandals_0.ron +++ /dev/null @@ -1,14 +0,0 @@ -ItemDef( - name: "Worn out Sandals", - description: "Loyal companions.", - kind: Armor( - ( - kind: Foot("Sandal0"), - stats: ( - protection: Normal(0.0), - poise_protection: Normal(0.0), - ), - ) - ), - quality: Low, -) diff --git a/assets/common/items/armor/tabard/admin.ron b/assets/common/items/armor/tabard/admin.ron index 6b872f3470..313e36440b 100644 --- a/assets/common/items/armor/tabard/admin.ron +++ b/assets/common/items/armor/tabard/admin.ron @@ -1,14 +1,12 @@ ItemDef( - name: "Admin's Tabard", - description: "With great power comes\ngreat responsibility.", - kind: Armor( - ( - kind: Tabard("Admin"), - stats: ( - protection: Invincible, - poise_protection: Invincible, - ), - ) - ), + name: "Admin\'s Tabard", + description: "With great power comes great responsibility.", + kind: Armor(( + kind: Tabard("Admin"), + stats: ( + protection: Invincible, + poise_protection: Invincible, + ), + )), quality: Debug, -) +) \ No newline at end of file diff --git a/assets/common/items/debug/boost.ron b/assets/common/items/debug/boost.ron index ac3ff906ed..c69b8628b7 100644 --- a/assets/common/items/debug/boost.ron +++ b/assets/common/items/debug/boost.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/debug/cultist_purp_2h_boss-0.ron b/assets/common/items/debug/cultist_purp_2h_boss-0.ron index 2417c55031..6645367246 100644 --- a/assets/common/items/debug/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/debug/cultist_purp_2h_boss-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1000.0, - poise_reduction_power: 1000.0, + poise_power: 1000.0, speed: 1.0 ), ) diff --git a/assets/common/items/debug/possess.ron b/assets/common/items/debug/possess.ron index ac3ff906ed..c69b8628b7 100644 --- a/assets/common/items/debug/possess.ron +++ b/assets/common/items/debug/possess.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 0, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/armor/starter/glider.ron b/assets/common/items/glider/glider_cloverleaf.ron similarity index 100% rename from assets/common/items/armor/starter/glider.ron rename to assets/common/items/glider/glider_cloverleaf.ron diff --git a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron index 132d684ac3..d8ea2498e8 100644 --- a/assets/common/items/npc_weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/npc_weapons/axe/malachite_axe-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, - poise_reduction_power: 0.50, + poise_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/axe/starter_axe.ron b/assets/common/items/npc_weapons/axe/starter_axe.ron index 715f5ea64e..029185ab8c 100644 --- a/assets/common/items/npc_weapons/axe/starter_axe.ron +++ b/assets/common/items/npc_weapons/axe/starter_axe.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.50, - poise_reduction_power: 0.50, + poise_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron index 1e715bd422..9ab669e16a 100644 --- a/assets/common/items/npc_weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/npc_weapons/bow/horn_longbow-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.5, - poise_reduction_power: 0.50, + poise_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 229bcc814d..8c821de25a 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/dagger/starter_dagger.ron b/assets/common/items/npc_weapons/dagger/starter_dagger.ron index 142dbe1d59..d25a94b0e8 100644 --- a/assets/common/items/npc_weapons/dagger/starter_dagger.ron +++ b/assets/common/items/npc_weapons/dagger/starter_dagger.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/empty/empty.ron b/assets/common/items/npc_weapons/empty/empty.ron index 2113948aeb..8a8dbaac8c 100644 --- a/assets/common/items/npc_weapons/empty/empty.ron +++ b/assets/common/items/npc_weapons/empty/empty.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 200, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron index 822211118c..96407e6668 100644 --- a/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/hammer/cultist_purp_2h-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.5, - poise_reduction_power: 0.5, + poise_power: 0.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 80f5900715..962fe108f1 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index c3ada55ba3..46dad7a2ee 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/starter_hammer.ron b/assets/common/items/npc_weapons/hammer/starter_hammer.ron index 7d0f184d06..f8aaa84cf3 100644 --- a/assets/common/items/npc_weapons/hammer/starter_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/starter_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.50, - poise_reduction_power: 0.50, + poise_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 586d0506b7..cc8232a594 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index 11afb36e7c..1638e3a579 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/shield/shield_1.ron b/assets/common/items/npc_weapons/shield/shield_1.ron index 2894e69d88..6ba371db37 100644 --- a/assets/common/items/npc_weapons/shield/shield_1.ron +++ b/assets/common/items/npc_weapons/shield/shield_1.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/bone_staff.ron b/assets/common/items/npc_weapons/staff/bone_staff.ron index 126389ad1c..c961ea6155 100644 --- a/assets/common/items/npc_weapons/staff/bone_staff.ron +++ b/assets/common/items/npc_weapons/staff/bone_staff.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.8, - poise_reduction_power: 0.8, + poise_power: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/cultist_staff.ron b/assets/common/items/npc_weapons/staff/cultist_staff.ron index ff89005932..d57be56690 100644 --- a/assets/common/items/npc_weapons/staff/cultist_staff.ron +++ b/assets/common/items/npc_weapons/staff/cultist_staff.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.8, - poise_reduction_power: 0.8, + poise_power: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 541bfccbb8..884a2ed6ca 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 3.0, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.5, ), ) diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 699ceb9df1..3674a800ff 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 0fc53dc6ac..b85348a829 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron index a93773b4ff..1850b0d021 100644 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.5, - poise_reduction_power: 0.5, + poise_power: 0.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron index 5c36b1c3f3..ecbc98bcbb 100644 --- a/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron +++ b/assets/common/items/npc_weapons/sword/cultist_purp_2h_boss-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.0, - poise_reduction_power: 1.0, + poise_power: 1.0, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index c0b8db9784..729a12ed4e 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 8f9ce71916..2f48b0c8ee 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/starter_sword.ron b/assets/common/items/npc_weapons/sword/starter_sword.ron index c5eaf61c21..07a6fd1a76 100644 --- a/assets/common/items/npc_weapons/sword/starter_sword.ron +++ b/assets/common/items/npc_weapons/sword/starter_sword.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 300, power: 0.50, - poise_reduction_power: 0.50, + poise_power: 0.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron index 9913ba1090..f2b12cf11d 100644 --- a/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/npc_weapons/sword/zweihander_sword_0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 0.75, - poise_reduction_power: 0.75, + poise_power: 0.75, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/broom.ron b/assets/common/items/npc_weapons/tool/broom.ron index 06fa1070c0..2e42a474ec 100644 --- a/assets/common/items/npc_weapons/tool/broom.ron +++ b/assets/common/items/npc_weapons/tool/broom.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.5, - poise_reduction_power: 1.5, + poise_power: 1.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/fishing_rod.ron b/assets/common/items/npc_weapons/tool/fishing_rod.ron index c6d6c5f118..61ec3b7755 100644 --- a/assets/common/items/npc_weapons/tool/fishing_rod.ron +++ b/assets/common/items/npc_weapons/tool/fishing_rod.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.5, - poise_reduction_power: 1.5, + poise_power: 1.5, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/hoe.ron b/assets/common/items/npc_weapons/tool/hoe.ron index f259317dd6..a57af33b8a 100644 --- a/assets/common/items/npc_weapons/tool/hoe.ron +++ b/assets/common/items/npc_weapons/tool/hoe.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, - poise_reduction_power: 1.50, + poise_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/pickaxe.ron b/assets/common/items/npc_weapons/tool/pickaxe.ron index 22b78a71f9..fede76212a 100644 --- a/assets/common/items/npc_weapons/tool/pickaxe.ron +++ b/assets/common/items/npc_weapons/tool/pickaxe.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, - poise_reduction_power: 1.50, + poise_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/pitchfork.ron b/assets/common/items/npc_weapons/tool/pitchfork.ron index 9c7dbc343b..eafbcb1df8 100644 --- a/assets/common/items/npc_weapons/tool/pitchfork.ron +++ b/assets/common/items/npc_weapons/tool/pitchfork.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, - poise_reduction_power: 1.50, + poise_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/rake.ron b/assets/common/items/npc_weapons/tool/rake.ron index cf85646fd5..f57ceb31be 100644 --- a/assets/common/items/npc_weapons/tool/rake.ron +++ b/assets/common/items/npc_weapons/tool/rake.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, - poise_reduction_power: 1.50, + poise_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/shovel-0.ron b/assets/common/items/npc_weapons/tool/shovel-0.ron index 7673e8b601..0acabb3703 100644 --- a/assets/common/items/npc_weapons/tool/shovel-0.ron +++ b/assets/common/items/npc_weapons/tool/shovel-0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, - poise_reduction_power: 1.50, + poise_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/tool/shovel-1.ron b/assets/common/items/npc_weapons/tool/shovel-1.ron index 003e6d8ffd..4e0d64bbe8 100644 --- a/assets/common/items/npc_weapons/tool/shovel-1.ron +++ b/assets/common/items/npc_weapons/tool/shovel-1.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.50, - poise_reduction_power: 1.50, + poise_power: 1.50, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index e23dd88209..6d3aadbf8c 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 195bbc3ce0..a843df7478 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index 5fc19195ba..31550c511c 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index f56c38af7d..1f66d603ac 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index 5ee67eb02c..cb3604b375 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index 804d18e497..d217e1ed2b 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 58fee593df..b177c31892 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index f305d9bbfc..32ccbd7ab4 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index 69e94727c4..48858a7df7 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index 312df80b23..b504b38fc6 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index 40cdb27875..879b0d84b4 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0, ), ) diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index b62961f1be..341b29d4e6 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index 8e3f298730..d406c450d3 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 11d3757795..cab8c9dff0 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index a1138ea25c..717fa513af 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 10, power: 1.00, - poise_reduction_power: 1.00, + poise_power: 1.00, speed: 1.00, ), ) diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index 16c297d7cf..ffab4d7923 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Bloodsteel Axe", description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.60, - poise_reduction_power: 1.60, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.6, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index e5c2ce1817..53e19b6acf 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Executioner's Axe", + name: "Executioner\'s Axe", description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.60, - poise_reduction_power: 1.60, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.6, + poise_power: 1.8, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 08a88cdca8..8fbfc4fcbf 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Tribal Axe", - description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy's veins.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.60, - poise_reduction_power: 1.60, - speed: 1.0 - ), - ) - ), + description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy\'s veins.", + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.6, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index b1d7d587d6..e03d5366f9 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Bronze Axe", description: "A fine quality metal alloy axe.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 0.9, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index 0046453587..a7f6546e7e 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Discus Axe", description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 5729a46dbc..3a68f2d6a5 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Cobalt Axe", description: "The lustrous bluish gray axe provides a certain stylish class to the weapon.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.80, - poise_reduction_power: 1.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.8, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 501f6a5a22..0736118858 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Greataxe", description: "Heavy iron hammered into rough blades, a simple tool for killing.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.7, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 4cae908183..487776ff97 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ceremonial Axe", description: "Heavy iron axe, likely created for ritual execution.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 0dc089f576..f1cc7ac580 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Cyclone Axe", description: "The iron axe head is split into two distinct curves, giving it a unique appearance.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 70abf9d717..d0f9a82232 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Battleaxe", description: "Tried and true iron armaments, mass produced for killing.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.6, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 2bca17ab71..16388920ff 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Butcher's Axe", + name: "Butcher\'s Axe", description: "This axe has a heavy iron head used to cleave nearly anything.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index 692118285e..6293397b56 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Barbarian's Axe", + name: "Barbarian\'s Axe", description: "While heavy, this iron forged axe is quite easy to swing, at least for those with the muscle backing it.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.8, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index 56b3efd107..d1b6b52254 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Axe", description: "A simple dual bitted iron forged axe.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 16facaa8b1..44c7c39f2a 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Labrys", description: "Double bitted axe head, decorated iron construction.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 1.6, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index 811965c622..c25c1bd097 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fanged Axe", description: "Several sharp axe heads forged with points to mimic animal fangs.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 0.6, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index 18fd8fe202..92a489c02f 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -1,16 +1,14 @@ ItemDef( name: "Wolfen Axe", description: "Strikes from this axe look like wolf bites in flesh.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_power: 0.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index f1b35db3b5..0ab50c0cc4 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Malachite Axe", description: "Etched axe head decorated with malachite on the blades to provide magical properties.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index f37fec6d72..b6e5c7f6ea 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Beast Cleaver", description: "A rough cut axe created by orcs to cleave beasts in two.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.6, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 715f5ea64e..dbc09ef478 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -1,16 +1,14 @@ ItemDef( name: "Notched Axe", description: "Every dent tells the story of a chopped tree.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.5, + poise_power: 2.0, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index ef90f311b8..8a7b2ebecd 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Steel Battleaxe", description: "Well crafted metal alloy axe that slices more cleanly than its iron counterparts.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.2, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index e0fd68b678..3f480f7cd8 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Steel Labrys", description: "Double bitted, well polished, and spiked axe head.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.2, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 0fe6822f19..0b4c6fdce8 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Steel Axe", description: "A simple metal alloy axe.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.2, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 8990545243..2309957d9f 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Crescent Axe", description: "The blade of this steel axe is forged in a manner to resemble a crescent moon.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 2d082fda21..3c0bb0505c 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Moon Axe", description: "The blade of this axe resembles a full moon.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.2, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index c1d967810d..b2044adb0e 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Owl Axe", description: "Druidic rituals formed this axe in the dark of night. Made to look like the wings of an owl swooping in on a kill.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index 78c6761af3..04431265d3 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -1,16 +1,14 @@ ItemDef( name: "Spade Axe", description: "This axe is designed to mimic the playing card suit, swiftly slicing through the air.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron index 03e614d274..2a57a8e9c8 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Dwarven Axe", - description: "Rough cut axe of dwarven origin, it's very old, but still usable.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + description: "Rough cut axe of dwarven origin, it\'s very old, but still usable.", + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 0.4, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron index 17ae52592f..69012922f9 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Elven Axe", description: "Light elven axe, scratched from eons of use. Still usable in some manner.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 0.4, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron index c731e62782..4ba8605ab9 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Human Axe", - description: "There's nothing too remarkable about this old axe.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + description: "There\'s nothing too remarkable about this old axe.", + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 0.7, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron index 3a3b9ce966..2cd31bc706 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Orcish Axe", description: "Rough cut iron makes it hard to tell that this axe is even used, other than how old it feels.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron index b52a5a4f9a..a50e1598b8 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Beetle Axe", description: "An axe formed with the intent of making the blade seem like a beetle. With how brittle it has gotten over the years, one would be mistaken in thinking it was made from beetle shell.", - kind: Tool( - ( - kind: Axe, - stats: ( - equip_time_millis: 400, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Axe, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/horn_longbow-0.ron index 20287d6cc5..4c858aa5c9 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/horn_longbow-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Horn Bow", - description: "You don't recognize the creature these horns belong to.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "You don\'t recognize the creature these horns belong to.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 1.5, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/iron_longbow-0.ron index da8422d6c1..c5e4d8aade 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/iron_longbow-0.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Soldier's Bow", - description: "Has an insignia on it.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 1.75, - poise_reduction_power: 1.75, - speed: 1.0 - ), - ) - ), + name: "Soldier\'s Bow", + description: "Has an insignia on it.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 1.75, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/leafy_longbow-0.ron index 09e2fbf931..4d6efcbec0 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_longbow-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Elven Longbow", - description: "There's a new leaf starting to grow.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 1.25, - poise_reduction_power: 1.25, - speed: 1.0 - ), - ) - ), + description: "There\'s a new leaf starting to grow.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 1.25, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/leafy_shortbow-0.ron index 35cedc38ba..7216107b17 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/leafy_shortbow-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Elven Shortbow", - description: "The wood still seems alive.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "The wood still seems alive.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 0.4, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron index 3fc9b38a3e..f5502da952 100644 --- a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron +++ b/assets/common/items/weapons/bow/nature_ore_longbow-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Velorite Bow", - description: "Infused with Velorite power.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + description: "Infused with Velorite power.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/rare_longbow.ron index 3ec5742715..8ccb40f232 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/rare_longbow.ron @@ -1,16 +1,14 @@ ItemDef( name: "Enchanted Longbow", - description: "You can sense power resting in the bow.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + description: "You can sense power resting in the bow.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter_bow.ron index ece1e7c964..fed446f87f 100644 --- a/assets/common/items/weapons/bow/starter_bow.ron +++ b/assets/common/items/weapons/bow/starter_bow.ron @@ -1,16 +1,14 @@ ItemDef( name: "Uneven Bow", - description: "Someone carved their initials into it.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + description: "Someone carved their initials into it.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 0.5, + poise_power: 0.3, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood_longbow-0.ron index bbc24379c7..06515d9cdf 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood_longbow-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Longbow", - description: "It's been well used.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "It\'s been well used.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 0.9, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/wood_longbow-1.ron index 06bf0f01e2..3ee0800df2 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/wood_longbow-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Recurve Bow", - description: "It's hard to pull all the way back.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "It\'s hard to pull all the way back.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.2, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron index 3dc8f472e1..7a26908786 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Hunting Bow", - description: "Strips of leather are wrapped around the handle.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 0.8, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + description: "Strips of leather are wrapped around the handle.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 0.7, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/wood_shortbow-1.ron index c906c159cd..4204d12089 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Horse Bow", - description: "Works on the ground too.", - kind: Tool( - ( - kind: Bow, - stats: ( - equip_time_millis: 400, - power: 0.75, - poise_reduction_power: 0.75, - speed: 1.0 - ), - ) - ), + description: "Works on the ground too.", + kind: Tool(( + kind: Bow, + stats: ( + equip_time_millis: 400, + power: 0.75, + poise_power: 0.4, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 86fe8f22bc..6750465a9e 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Suspicious Paper Knife", description: "Opens letters quickly.", - kind: Tool( - ( - kind: Dagger, - stats: ( - equip_time_millis: 0, - power: 1.80, - poise_reduction_power: 1.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Dagger, + stats: ( + equip_time_millis: 0, + power: 1.8, + poise_power: 2.0, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index 1b9278de66..e2f6a5fbda 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Magical Cultist Dagger", description: "This belonged to an evil Cult Leader.", - kind: Tool( - ( - kind: Dagger, - stats: ( - equip_time_millis: 0, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Dagger, + stats: ( + equip_time_millis: 0, + power: 2.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index a235e8d93d..014a662d82 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -1,16 +1,14 @@ ItemDef( name: "Rusty Dagger", description: "Easily concealed.", - kind: Tool( - ( - kind: Dagger, - stats: ( - equip_time_millis: 300, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Dagger, + stats: ( + equip_time_millis: 300, + power: 1.0, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 921310f38d..0d112b256f 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -1,16 +1,14 @@ ItemDef( name: "Empty Item", description: "This item may grant abilities, but is invisible", - kind: Tool ( - ( - kind: Empty, - stats: ( - equip_time_millis: 200, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Empty, + stats: ( + equip_time_millis: 200, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index 9c4e32aecc..0e30740740 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Bronze Hammer", description: "A heavy hammer forged from a simple metal alloy.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.0, + poise_power: 0.9, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index c9b980d189..f315243b5f 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Bronze Club", description: "The entire head of this club is forged from bronze alloy.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 701bdc8da5..0d5a5977dd 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Cobalt Hammer", description: "The bluish gray tinge to the metal of this hammer head provides a slight classiness to the weapon.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.60, - poise_reduction_power: 1.60, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.6, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index b9a5a585be..b21aa028e1 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Cobalt Mace", description: "The decorative hooked head of this mace is formed from a bluish gray metal.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.60, - poise_reduction_power: 1.60, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.6, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index 0e25cb6f33..b36613319b 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Magical Cultist Warhammer", description: "This belonged to an evil Cult Leader.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 2.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 619c0a481e..90a989a31d 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -1,16 +1,14 @@ ItemDef( name: "Flimsy Hammer", description: "The head is barely secured.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.5, + poise_power: 0.4, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 1e4f2f0c24..a2d39ef869 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Crude Mallet", description: "Breaks bones like sticks and stones.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - quality: Low, - ) - ) -) + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.5, + poise_power: 0.8, + speed: 1.0, + ), + )), + quality: Low, +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 69b51845ec..42f27ab407 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Hammer", description: "This heavy, solid chunk iron hammer head is simple and brutal in its design.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 7447a8b8ab..f60a093b05 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Battlehammer", description: "This heavy, square iron hammer is designed for squashing heads like watermelons.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 0.9, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index 681d04224a..1a3ed032c3 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Iron Mace", description: "A decorative iron mace, great for smashing.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index f888071ff1..0747b55316 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Crowned Mace", description: "The decorative iron mace has a crowning tip on top.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index e7e27d0f2e..e4cde939e0 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Forge Hammer", description: "Worn head shows that this hammer had been used for many years to make other weapons, now relegated to being a weapon in its own right.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index 28dce8b412..2d60d4e138 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Lucerne Hammer", description: "A hybrid fusion of a warhammer and a polearm.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 72ddfd7bfd..e845b20f71 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -1,16 +1,14 @@ ItemDef( name: "Spiked Maul", description: "A rough shaped iron hammer with spikes for added destruction.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index ae5894f356..e76881b4f4 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Giant's Fist", + name: "Giant\'s Fist", description: "This iron forged hammer is roughly shaped into the shape of a fist holding the hammer head.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index 281c0ae047..179c112b9e 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -1,16 +1,14 @@ ItemDef( name: "Pike Hammer", description: "This hammer has a spike on the opposite end, making it dangerous when swung either direction.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 8d825c1746..7fca785e53 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 500, power: 4.00, - poise_reduction_power: 2.00, + poise_power: 2.0, speed: 0.5 ), ) diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index ca7fb2ceae..5f6e84864f 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Ram's Head Mace", + name: "Ram\'s Head Mace", description: "You feel an evil presence in the hammer.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.80, - poise_reduction_power: 1.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.8, + poise_power: 1.7, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index 52eb5d18ee..7588304f76 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -1,16 +1,14 @@ ItemDef( name: "Runic Hammer", description: "There are strange runes inscribed into it.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.80, - poise_reduction_power: 1.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.8, + poise_power: 1.8, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 7d0f184d06..1375f15c4e 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -1,16 +1,14 @@ ItemDef( name: "Sturdy Old Hammer", - description: "'Property of...' The rest is missing.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + description: "\'Property of...\' The rest is missing.", + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.5, + poise_power: 0.9, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index 078aa6e1bc..9686bed811 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Steel Hammer", description: "While lighter and more durable than its iron counterparts, it is nonetheless just as deadly.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index bde8a287fe..82850ad26e 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Steel Greathammer", description: "The lighter attributes of the metal alloy are barely noticed when forged into such a wide hammer head.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index c68645e407..254ae2744f 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Steel Club", description: "A heavy and wide baton made of a durable metal alloy, decorated with spikes.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index f22db96d9d..10bf020eb2 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Battle Mace", description: "A heavy, spiked steel ball tip provides a great smashing weapon.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.7, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index 56d6aee2ef..9c663dfad3 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -1,16 +1,14 @@ ItemDef( - name: "Brute's Hammer", + name: "Brute\'s Hammer", description: "This destructive hammer was likely wielded by a vicious killer.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 8754e285e3..feb3228b4e 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Morning Star", description: "A spiked ball designed to resemble the stars lining the night sky.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 5b9d14ddb2..05f38ea784 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Basalt Sledgehammer", description: "Bloodied stone tied to a branch, simple but functional as a weapon.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.70, - poise_reduction_power: 0.70, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.7, + poise_power: 1.7, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index 76f92bed33..7696620b09 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Granite Sledgehammer", description: "A rough stone, crumbling on the striking surfaces. Still usable as a weapon.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.70, - poise_reduction_power: 0.70, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.7, + poise_power: 1.8, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index dba99eee94..1176122e6d 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Rocky Maul", description: "A rock tied to a stick, still good for smashing, but not very strong.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.70, - poise_reduction_power: 0.70, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.7, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index 86145ec7ad..5c62290343 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Stone Sledgehammer", description: "A heavy rock with a slot worn through to fasten it in place. Brutal in its simple design, but still functional.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.70, - poise_reduction_power: 0.70, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.7, + poise_power: 1.8, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index 78b6087a80..a9fb264fe5 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Hardwood Mallet", description: "Hardened wood, subjected to many different elements to provide a enough strength to be a weapon.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron index 9e3ce47a40..160f321965 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Dwarven Hammer", description: "While the dwarves excel at rough hewn weapons, this one has seen its fair share of battles, might still serve well enough for a few more.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.85, - poise_reduction_power: 0.85, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.85, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron index 09763942c7..208f87087f 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Elven Hammer", description: "Elven hammers are lighter than most. This one has seen its fair share of wear and tear.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.85, - poise_reduction_power: 0.85, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.85, + poise_power: 0.6, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron index 01b092c16a..850eaf4109 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Human Mace", description: "An unremarkable mace, that has seen a lot of use.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.85, - poise_reduction_power: 0.85, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.85, + poise_power: 0.7, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron index 37a48190cd..15d8cb2a82 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Worn Orcish Hammer", description: "A heavy orc crafted hammer, missing chunks from heavy use.", - kind: Tool( - ( - kind: Hammer, - stats: ( - equip_time_millis: 500, - power: 0.85, - poise_reduction_power: 0.85, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Hammer, + stats: ( + equip_time_millis: 500, + power: 0.85, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index b7b85f8013..15feee2143 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 1.2, - poise_reduction_power: 2.00, + poise_power: 1.5, speed: 1.6 ), ) diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index d7975320fc..06d2eb9231 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -7,7 +7,7 @@ ItemDef( stats: ( equip_time_millis: 400, power: 0.91, - poise_reduction_power: 1.00, + poise_power: 0.5, speed: 1.1 ), ) diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index 6bde465ac4..e5a5746a87 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -1,16 +1,14 @@ ItemDef( name: "Naturalist Walking Stick", - description: "Heals your allies with the power of nature.", - kind: Tool( - ( - kind: Sceptre, - stats: ( - equip_time_millis: 400, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + description: "Heals your allies with the power of nature.", + kind: Tool(( + kind: Sceptre, + stats: ( + equip_time_millis: 400, + power: 0.5, + poise_power: 0.1, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index c0b9087726..01cc61de72 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -1,16 +1,14 @@ ItemDef( name: "A Tattered Targe", description: "Should withstand a few more hits, hopefully...", - kind: Tool ( - ( - kind: Shield, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Shield, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index 5912838dfc..9177643c11 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -1,16 +1,14 @@ ItemDef( name: "Amethyst Staff", description: "The amethyst faintly glows.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 300, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Staff, + stats: ( + equip_time_millis: 300, + power: 1.5, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 9276494320..68b29f22c6 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -1,16 +1,14 @@ ItemDef( name: "Bone Staff", - description: "There's a red gem suspended in the bones.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 300, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "There\'s a red gem suspended in the bones.", + kind: Tool(( + kind: Staff, + stats: ( + equip_time_millis: 300, + power: 1.0, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 5394c7a959..fe36c9b102 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -1,16 +1,14 @@ ItemDef( name: "Cultist Staff", description: "The fire gives off no heat.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 300, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Staff, + stats: ( + equip_time_millis: 300, + power: 2.0, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 40ff73992d..78eb3c8aa0 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Humble Stick", description: "Walking stick with a sharpened end.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 200, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Staff, + stats: ( + equip_time_millis: 200, + power: 0.5, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index 66ecf094de..72cad3ab85 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -1,16 +1,14 @@ ItemDef( name: "Gnarled Rod", description: "Smells like resin and magic.", - kind: Tool( - ( - kind: Staff, - stats: ( - equip_time_millis: 300, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Staff, + stats: ( + equip_time_millis: 300, + power: 0.5, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron index b1f51a818b..71f1240b2c 100644 --- a/assets/common/items/weapons/sword/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/sword/cultist_purp_2h-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Magical Cultist Greatsword", description: "This belonged to an evil Cult Leader.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 2.00, - poise_reduction_power: 2.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 2.0, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron index 57cbcf88d4..0a8ce45097 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Frost Cleaver", description: "Radiates a freezing aura.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.70, - poise_reduction_power: 1.70, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.7, + poise_power: 2.0, + speed: 1.0, + ), + )), quality: High, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron index 8b24d09c91..93579a5068 100644 --- a/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron +++ b/assets/common/items/weapons/sword/frost_cleaver_2h-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Frost Saw", - description: "Forged from a single piece\nof eternal ice.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.95, - poise_reduction_power: 1.95, - speed: 1.0 - ), - ) - ), + description: "Forged from a single piece of eternal ice.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.95, + poise_power: 1.7, + speed: 1.0, + ), + )), quality: Epic, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron index 1a4d5c7ddc..8589b7eff6 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Greatsword", description: "The blade has been chipped quite a few times.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.8, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron index 1a4d5c7ddc..3106e40447 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Greatsword", description: "The blade has been chipped quite a few times.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.8, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron index 1a4d5c7ddc..9297ea3096 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_dam-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Greatsword", description: "The blade has been chipped quite a few times.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.80, - poise_reduction_power: 0.80, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.8, + poise_power: 0.9, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron index 3ebf723ef5..d4804da49f 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Greatsword", - description: "It's been polished and sharpened recently.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + description: "It\'s been polished and sharpened recently.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.6, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron index 3ebf723ef5..c366a94d30 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Greatsword", - description: "It's been polished and sharpened recently.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + description: "It\'s been polished and sharpened recently.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron index 3ebf723ef5..4d52a14d28 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_fine-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Greatsword", - description: "It's been polished and sharpened recently.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.40, - poise_reduction_power: 1.40, - speed: 1.0 - ), - ) - ), + description: "It\'s been polished and sharpened recently.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.4, + poise_power: 1.7, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron index 2094e00f42..2972003cf4 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Greatsword", - description: "The sword's almost a work of art.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.70, - poise_reduction_power: 1.70, - speed: 1.0 - ), - ) - ), + description: "The sword\'s almost a work of art.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.7, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron index 2094e00f42..2972003cf4 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Greatsword", - description: "The sword's almost a work of art.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.70, - poise_reduction_power: 1.70, - speed: 1.0 - ), - ) - ), + description: "The sword\'s almost a work of art.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.7, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron index 2094e00f42..c32b76b1a1 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_orn-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Greatsword", - description: "The sword's almost a work of art.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.70, - poise_reduction_power: 1.70, - speed: 1.0 - ), - ) - ), + description: "The sword\'s almost a work of art.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.7, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron index 1111cc66cd..a4105979d2 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Greatsword", - description: "It's been well used.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.10, - poise_reduction_power: 1.10, - speed: 1.0 - ), - ) - ), + description: "It\'s been well used.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.1, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron index 1111cc66cd..a4105979d2 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Greatsword", - description: "It's been well used.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.10, - poise_reduction_power: 1.10, - speed: 1.0 - ), - ) - ), + description: "It\'s been well used.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.1, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron index 1111cc66cd..81f846d6b3 100644 --- a/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/greatsword_2h_simple-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Greatsword", - description: "It's been well used.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.10, - poise_reduction_power: 1.10, - speed: 1.0 - ), - ) - ), + description: "It\'s been well used.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.1, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-0.ron b/assets/common/items/weapons/sword/long_2h_dam-0.ron index 17117f0fb6..17efaa501a 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-0.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Longsword", - description: "It's slightly cracked.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + description: "It\'s slightly cracked.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-1.ron b/assets/common/items/weapons/sword/long_2h_dam-1.ron index 17117f0fb6..17efaa501a 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-1.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Longsword", - description: "It's slightly cracked.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + description: "It\'s slightly cracked.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-2.ron b/assets/common/items/weapons/sword/long_2h_dam-2.ron index 17117f0fb6..17efaa501a 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-2.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Longsword", - description: "It's slightly cracked.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + description: "It\'s slightly cracked.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-3.ron b/assets/common/items/weapons/sword/long_2h_dam-3.ron index 17117f0fb6..17efaa501a 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-3.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Longsword", - description: "It's slightly cracked.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + description: "It\'s slightly cracked.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-4.ron b/assets/common/items/weapons/sword/long_2h_dam-4.ron index 17117f0fb6..17efaa501a 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-4.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Longsword", - description: "It's slightly cracked.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + description: "It\'s slightly cracked.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_dam-5.ron b/assets/common/items/weapons/sword/long_2h_dam-5.ron index 17117f0fb6..17efaa501a 100644 --- a/assets/common/items/weapons/sword/long_2h_dam-5.ron +++ b/assets/common/items/weapons/sword/long_2h_dam-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Damaged Longsword", - description: "It's slightly cracked.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.60, - poise_reduction_power: 0.60, - speed: 1.0 - ), - ) - ), + description: "It\'s slightly cracked.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.6, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-0.ron b/assets/common/items/weapons/sword/long_2h_fine-0.ron index a708dc84ac..ab5f57c316 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-0.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Longsword", description: "It shines when you hold it up to the light.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-1.ron b/assets/common/items/weapons/sword/long_2h_fine-1.ron index a708dc84ac..ab5f57c316 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-1.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Longsword", description: "It shines when you hold it up to the light.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-2.ron b/assets/common/items/weapons/sword/long_2h_fine-2.ron index a708dc84ac..ab5f57c316 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-2.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Longsword", description: "It shines when you hold it up to the light.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-3.ron b/assets/common/items/weapons/sword/long_2h_fine-3.ron index a708dc84ac..2c1e3366ed 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-3.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Longsword", description: "It shines when you hold it up to the light.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-4.ron b/assets/common/items/weapons/sword/long_2h_fine-4.ron index a708dc84ac..ab5f57c316 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-4.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Longsword", description: "It shines when you hold it up to the light.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.3, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_fine-5.ron b/assets/common/items/weapons/sword/long_2h_fine-5.ron index a708dc84ac..672fd73786 100644 --- a/assets/common/items/weapons/sword/long_2h_fine-5.ron +++ b/assets/common/items/weapons/sword/long_2h_fine-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fine Longsword", description: "It shines when you hold it up to the light.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.20, - poise_reduction_power: 1.20, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.2, + poise_power: 1.4, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-0.ron b/assets/common/items/weapons/sword/long_2h_orn-0.ron index b0eb602f57..e0b710ae28 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-0.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Longsword", - description: "It's probably the weapon of some noble.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s probably the weapon of some noble.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-1.ron b/assets/common/items/weapons/sword/long_2h_orn-1.ron index b0eb602f57..0e7d6752b2 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-1.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Longsword", - description: "It's probably the weapon of some noble.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s probably the weapon of some noble.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-2.ron b/assets/common/items/weapons/sword/long_2h_orn-2.ron index b0eb602f57..e0b710ae28 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-2.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Longsword", - description: "It's probably the weapon of some noble.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s probably the weapon of some noble.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-3.ron b/assets/common/items/weapons/sword/long_2h_orn-3.ron index b0eb602f57..e0b710ae28 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-3.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Longsword", - description: "It's probably the weapon of some noble.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s probably the weapon of some noble.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-4.ron b/assets/common/items/weapons/sword/long_2h_orn-4.ron index b0eb602f57..0e7d6752b2 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-4.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Longsword", - description: "It's probably the weapon of some noble.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s probably the weapon of some noble.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_orn-5.ron b/assets/common/items/weapons/sword/long_2h_orn-5.ron index b0eb602f57..0e7d6752b2 100644 --- a/assets/common/items/weapons/sword/long_2h_orn-5.ron +++ b/assets/common/items/weapons/sword/long_2h_orn-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Ornamented Longsword", - description: "It's probably the weapon of some noble.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s probably the weapon of some noble.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.1, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-0.ron b/assets/common/items/weapons/sword/long_2h_simple-0.ron index 09fcf6f3ee..015047d47b 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-0.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Longsword", - description: "It was well maintained by it's previous owner.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.90, - poise_reduction_power: 0.90, - speed: 1.0 - ), - ) - ), + description: "It was well maintained by it\'s previous owner.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.9, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-1.ron b/assets/common/items/weapons/sword/long_2h_simple-1.ron index 09fcf6f3ee..015047d47b 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-1.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Longsword", - description: "It was well maintained by it's previous owner.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.90, - poise_reduction_power: 0.90, - speed: 1.0 - ), - ) - ), + description: "It was well maintained by it\'s previous owner.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.9, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-2.ron b/assets/common/items/weapons/sword/long_2h_simple-2.ron index 09fcf6f3ee..a5ed1a9865 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-2.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-2.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Longsword", - description: "It was well maintained by it's previous owner.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.90, - poise_reduction_power: 0.90, - speed: 1.0 - ), - ) - ), + description: "It was well maintained by it\'s previous owner.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.9, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-3.ron b/assets/common/items/weapons/sword/long_2h_simple-3.ron index 09fcf6f3ee..015047d47b 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-3.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-3.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Longsword", - description: "It was well maintained by it's previous owner.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.90, - poise_reduction_power: 0.90, - speed: 1.0 - ), - ) - ), + description: "It was well maintained by it\'s previous owner.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.9, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-4.ron b/assets/common/items/weapons/sword/long_2h_simple-4.ron index 09fcf6f3ee..015047d47b 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-4.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-4.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Longsword", - description: "It was well maintained by it's previous owner.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.90, - poise_reduction_power: 0.90, - speed: 1.0 - ), - ) - ), + description: "It was well maintained by it\'s previous owner.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.9, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/long_2h_simple-5.ron b/assets/common/items/weapons/sword/long_2h_simple-5.ron index 09fcf6f3ee..015047d47b 100644 --- a/assets/common/items/weapons/sword/long_2h_simple-5.ron +++ b/assets/common/items/weapons/sword/long_2h_simple-5.ron @@ -1,16 +1,14 @@ ItemDef( name: "Simple Longsword", - description: "It was well maintained by it's previous owner.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 0.90, - poise_reduction_power: 0.90, - speed: 1.0 - ), - ) - ), + description: "It was well maintained by it\'s previous owner.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 0.9, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/short_sword_0.ron b/assets/common/items/weapons/sword/short_sword_0.ron index 5aa2201ed4..6ded410a1a 100644 --- a/assets/common/items/weapons/sword/short_sword_0.ron +++ b/assets/common/items/weapons/sword/short_sword_0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Vicious Gladius", - description: "There's blood encrusted on the blade.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 400, - power: 0.75, - poise_reduction_power: 0.75, - speed: 1.0 - ), - ) - ), + description: "There\'s blood encrusted on the blade.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 400, + power: 0.75, + poise_power: 0.8, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/starter_sword.ron b/assets/common/items/weapons/sword/starter_sword.ron index c5eaf61c21..15a50a2250 100644 --- a/assets/common/items/weapons/sword/starter_sword.ron +++ b/assets/common/items/weapons/sword/starter_sword.ron @@ -1,16 +1,14 @@ ItemDef( name: "Battered Sword", description: "Held together by Rust and hope.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 300, - power: 0.50, - poise_reduction_power: 0.50, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 300, + power: 0.5, + poise_power: 0.4, + speed: 1.0, + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index ea20e61b05..d0c2fd45ac 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -1,16 +1,14 @@ ItemDef( name: "Forest Spirit", description: "The resin glows.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 400, - power: 0.8, - poise_reduction_power: 0.8, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_power: 0.5, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/zweihander_sword_0.ron b/assets/common/items/weapons/sword/zweihander_sword_0.ron index a8f9f383d1..ec38a2bde8 100644 --- a/assets/common/items/weapons/sword/zweihander_sword_0.ron +++ b/assets/common/items/weapons/sword/zweihander_sword_0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Sturdy Zweihander", - description: "It's a big sword, and sharp too.", - kind: Tool( - ( - kind: Sword, - stats: ( - equip_time_millis: 500, - power: 1.50, - poise_reduction_power: 1.50, - speed: 1.0 - ), - ) - ), + description: "It\'s a big sword, and sharp too.", + kind: Tool(( + kind: Sword, + stats: ( + equip_time_millis: 500, + power: 1.5, + poise_power: 1.9, + speed: 1.0, + ), + )), quality: Moderate, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index 19610b2af0..4413ceada4 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -1,16 +1,14 @@ ItemDef( name: "Broom", - description: "It's beginning to fall apart.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "It\'s beginning to fall apart.", + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 0836f62498..5d94f428b0 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -1,16 +1,14 @@ ItemDef( name: "Fishing Rod", description: "Smells of fish.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 52a178b390..2302db2985 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -1,16 +1,14 @@ ItemDef( name: "Hoe", - description: "It's stained with dirt.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "It\'s stained with dirt.", + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.5, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 1d207fc796..0fe6acf376 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -1,16 +1,14 @@ ItemDef( name: "Pickaxe", description: "It has a chipped edge.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index c4d66eb9e0..363621ae66 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -1,16 +1,14 @@ ItemDef( name: "Pitchfork", description: "One of the prongs is broken.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 4.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 1527f03a25..6d9bf69c19 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -1,16 +1,14 @@ ItemDef( name: "Rake", description: "Held together with twine.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 1.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 9bec67a15b..b056a5d61c 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -1,16 +1,14 @@ ItemDef( name: "Shovel", - description: "It's covered in manure.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "It\'s covered in manure.", + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 2.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index aa553591f9..f030f2a216 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -1,16 +1,14 @@ ItemDef( name: "Shovel", - description: "It's been recently cleaned.", - kind: Tool ( - ( - kind: Farming, - stats: ( - equip_time_millis: 400, - power: 1.00, - poise_reduction_power: 1.00, - speed: 1.0 - ), - ) - ), + description: "It\'s been recently cleaned.", + kind: Tool(( + kind: Farming, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_power: 2.0, + speed: 1.0, + ), + )), quality: Common, -) +) \ No newline at end of file diff --git a/common/Cargo.toml b/common/Cargo.toml index eabc7906d2..fdd42a15f7 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" no-assets = [] tracy = ["tracy-client"] simd = ["vek/platform_intrinsics"] -bin_csv_export = ["csv", "structopt"] +bin_csv = ["csv", "structopt"] default = ["simd"] @@ -71,4 +71,8 @@ harness = false [[bin]] name = "csv_export" -required-features = ["bin_csv_export"] +required-features = ["bin_csv"] + +[[bin]] +name = "csv_import" +required-features = ["bin_csv"] diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index a225b1bf1d..1c98b9bdc1 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -18,22 +18,46 @@ struct Cli { fn armor_stats() -> Result<(), Box> { let mut wtr = csv::Writer::from_path("armorstats.csv")?; - wtr.write_record(&["Path", "Kind", "Name", "Protection"])?; + wtr.write_record(&[ + "Path", + "Kind", + "Name", + "Quality", + "Protection", + "Poise Protection", + "Description", + ])?; for item in comp::item::Item::new_from_asset_glob("common.items.armor.*") .expect("Failed to iterate over item folders!") { match item.kind() { comp::item::ItemKind::Armor(armor) => { + let kind = get_armor_kind(&armor.kind); + if kind == "Bag".to_string() { + continue; + } + let protection = match armor.get_protection() { Protection::Invincible => "Invincible".to_string(), Protection::Normal(value) => value.to_string(), }; - let kind = get_armor_kind(&armor.kind); + let poise_protection = match armor.get_poise_protection() { + Protection::Invincible => "Invincible".to_string(), + Protection::Normal(value) => value.to_string(), + }; - wtr.write_record(&[item.item_definition_id(), &kind, item.name(), &protection])?; + wtr.write_record(&[ + item.item_definition_id(), + &kind, + item.name(), + &format!("{:?}", item.quality()), + &protection, + &poise_protection, + item.description(), + ])?; }, - _ => println!("Skipping non-armor item: {:?}", item), + _ => println!("Skipping non-armor item: {:?}\n", item), } } @@ -47,10 +71,12 @@ fn weapon_stats() -> Result<(), Box> { "Path", "Kind", "Name", + "Quality", "Power", - "Poise Reduction Power", + "Poise Power", "Speed", "Equip Time (ms)", + "Description", ])?; for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*") @@ -59,7 +85,7 @@ fn weapon_stats() -> Result<(), Box> { match item.kind() { comp::item::ItemKind::Tool(tool) => { let power = tool.base_power().to_string(); - let poise_reduction_power = tool.base_poise_reduction_power().to_string(); + let poise_power = tool.base_poise_power().to_string(); let speed = tool.base_speed().to_string(); let equip_time = tool.equip_time().subsec_millis().to_string(); let kind = get_tool_kind(&tool.kind); @@ -68,13 +94,15 @@ fn weapon_stats() -> Result<(), Box> { item.item_definition_id(), &kind, item.name(), + &format!("{:?}", item.quality()), &power, - &poise_reduction_power, + &poise_power, &speed, &equip_time, + item.description(), ])?; }, - _ => println!("Skipping non-weapon item: {:?}", item), + _ => println!("Skipping non-weapon item: {:?}\n", item), } } @@ -157,15 +185,15 @@ fn main() { let args = Cli::from_args(); if args.function.eq_ignore_ascii_case("armor_stats") { if let Err(e) = armor_stats() { - println!("Error: {}", e) + println!("Error: {}\n", e) } } else if args.function.eq_ignore_ascii_case("weapon_stats") { if let Err(e) = weapon_stats() { - println!("Error: {}", e) + println!("Error: {}\n", e) } } else if args.function.eq_ignore_ascii_case("all_items") { if let Err(e) = all_items() { - println!("Error: {}", e) + println!("Error: {}\n", e) } } else { println!( diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs new file mode 100644 index 0000000000..b65fd882b7 --- /dev/null +++ b/common/src/bin/csv_import/main.rs @@ -0,0 +1,360 @@ +#![deny(clippy::clone_on_ref_ptr)] + +use ron::ser::{to_string_pretty, PrettyConfig}; +use serde::Serialize; +use std::{error::Error, fs::File, io::Write}; +use structopt::StructOpt; + +use comp::item::{ + armor::{ArmorKind, Protection}, + ItemKind, Quality, +}; +use veloren_common::{assets::ASSETS_PATH, comp}; + +#[derive(StructOpt)] +struct Cli { + /// Available arguments: "armor_stats", "weapon_stats" + function: String, +} + +#[derive(Serialize)] +struct FakeItemDef { + name: String, + description: String, + kind: ItemKind, + quality: Quality, +} + +impl FakeItemDef { + fn new(name: String, description: String, kind: ItemKind, quality: Quality) -> Self { + Self { + name, + description, + kind, + quality, + } + } +} + +fn armor_stats() -> Result<(), Box> { + let mut rdr = csv::Reader::from_path("armorstats.csv")?; + + for record in rdr.records() { + for item in comp::item::Item::new_from_asset_glob("common.items.armor.*") + .expect("Failed to iterate over item folders!") + { + match item.kind() { + comp::item::ItemKind::Armor(armor) => { + match armor.kind { + ArmorKind::Bag(_) => { + continue; + }, + _ => {}, + } + + if let Ok(ref record) = record { + if item.item_definition_id() == record.get(0).expect("No file path in csv?") + { + let protection = if let Some(protection_raw) = record.get(4) { + if protection_raw == "Invincible" { + Protection::Invincible + } else { + let value: f32 = protection_raw.parse().unwrap(); + Protection::Normal(value) + } + } else { + eprintln!( + "Could not unwrap protection value for {:?}", + item.item_definition_id() + ); + Protection::Normal(0.0) + }; + + let poise_protection = if let Some(poise_protection_raw) = record.get(5) + { + if poise_protection_raw == "Invincible" { + Protection::Invincible + } else { + let value: f32 = poise_protection_raw.parse().unwrap(); + Protection::Normal(value) + } + } else { + eprintln!( + "Could not unwrap poise protection value for {:?}", + item.item_definition_id() + ); + Protection::Normal(0.0) + }; + + let kind = armor.kind.clone(); + let armor = + comp::item::armor::Armor::new(kind, protection, poise_protection); + let quality = if let Some(quality_raw) = record.get(3) { + match quality_raw { + "Low" => comp::item::Quality::Low, + "Common" => comp::item::Quality::Common, + "Moderate" => comp::item::Quality::Moderate, + "High" => comp::item::Quality::High, + "Epic" => comp::item::Quality::Epic, + "Legendary" => comp::item::Quality::Legendary, + "Artifact" => comp::item::Quality::Artifact, + "Debug" => comp::item::Quality::Debug, + _ => { + eprintln!( + "Unknown quality variant for {:?}", + item.item_definition_id() + ); + comp::item::Quality::Debug + }, + } + } else { + eprintln!( + "Could not unwrap quality for {:?}", + item.item_definition_id() + ); + comp::item::Quality::Debug + }; + + let description = record.get(6).expect(&format!( + "Error unwrapping description for {:?}", + item.item_definition_id() + )); + + let fake_item = FakeItemDef::new( + item.name().to_string(), + description.to_string(), + ItemKind::Armor(armor), + quality, + ); + + let pretty_config = PrettyConfig::new() + .with_depth_limit(4) + .with_separate_tuple_members(true) + .with_decimal_floats(true) + .with_enumerate_arrays(true); + + let mut path = ASSETS_PATH.clone(); + for part in item.item_definition_id().split(".") { + path.push(part); + } + path.set_extension("ron"); + + let path_str = path.to_str().expect("File path not unicode?!"); + let mut writer = File::create(path_str)?; + write!( + writer, + "ItemDef{}", + to_string_pretty(&fake_item, pretty_config)? + )?; + } + } + }, + _ => println!("Skipping non-armor item: {:?}\n", item), + } + } + } + + Ok(()) +} + +fn weapon_stats() -> Result<(), Box> { + let mut rdr = csv::Reader::from_path("weaponstats.csv")?; + + for record in rdr.records() { + for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*") + .expect("Failed to iterate over item folders!") + { + match item.kind() { + comp::item::ItemKind::Tool(tool) => { + if let Ok(ref record) = record { + if item.item_definition_id() == record.get(0).expect("No file path in csv?") + { + let kind = tool.kind; + let equip_time_millis: u32 = record + .get(7) + .expect(&format!( + "Error unwrapping equip time for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a u32? {:?}", item.item_definition_id())); + let power: f32 = record + .get(4) + .expect(&format!( + "Error unwrapping power for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + let poise_power: f32 = record + .get(5) + .expect(&format!( + "Error unwrapping poise power for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let speed: f32 = record + .get(6) + .expect(&format!( + "Error unwrapping speed for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let tool = comp::item::tool::Tool::new( + kind, + equip_time_millis, + power, + poise_power, + speed, + ); + + let quality = if let Some(quality_raw) = record.get(3) { + match quality_raw { + "Low" => comp::item::Quality::Low, + "Common" => comp::item::Quality::Common, + "Moderate" => comp::item::Quality::Moderate, + "High" => comp::item::Quality::High, + "Epic" => comp::item::Quality::Epic, + "Legendary" => comp::item::Quality::Legendary, + "Artifact" => comp::item::Quality::Artifact, + "Debug" => comp::item::Quality::Debug, + _ => { + eprintln!( + "Unknown quality variant for {:?}", + item.item_definition_id() + ); + comp::item::Quality::Debug + }, + } + } else { + eprintln!( + "Could not unwrap quality for {:?}", + item.item_definition_id() + ); + comp::item::Quality::Debug + }; + + let description = record.get(8).expect(&format!( + "Error unwrapping description for {:?}", + item.item_definition_id() + )); + + let fake_item = FakeItemDef::new( + item.name().to_string(), + description.to_string(), + ItemKind::Tool(tool), + quality, + ); + + let pretty_config = PrettyConfig::new() + .with_depth_limit(4) + .with_separate_tuple_members(true) + .with_decimal_floats(true) + .with_enumerate_arrays(true); + + let mut path = ASSETS_PATH.clone(); + for part in item.item_definition_id().split(".") { + path.push(part); + } + path.set_extension("ron"); + + let path_str = path.to_str().expect("File path not unicode?!"); + let mut writer = File::create(path_str)?; + write!( + writer, + "ItemDef{}", + to_string_pretty(&fake_item, pretty_config)? + )?; + } + } + }, + _ => println!("Skipping non-weapon item: {:?}\n", item), + } + } + } + + Ok(()) +} + +fn main() { + let args = Cli::from_args(); + if args.function.eq_ignore_ascii_case("armor_stats") { + if get_input( + " +------------------------------------------------------------------------------- +| DISCLAIMER | +------------------------------------------------------------------------------- +| | +| This script will wreck the RON files for armor if it messes up. | +| You might want to save a back up of the weapon files or be prepared to | +| use `git checkout HEAD -- ../assets/common/items/armor/*` if needed. | +| If this script does mess up your files, please fix it. Otherwise your | +| files will be yeeted away and you will get a bonk on the head. | +| | +------------------------------------------------------------------------------- + +In order for this script to work, you need to have first run the csv exporter. +Once you have armorstats.csv you can make changes to stats, quality, and +description in your preferred editor. Save the csv file and then run this +script to import your changes back to RON. + +Would you like to continue? (y/n) +> ", + ) + .to_lowercase() + == "y".to_string() + { + if let Err(e) = armor_stats() { + println!("Error: {}\n", e) + } + } + } else if args.function.eq_ignore_ascii_case("weapon_stats") { + if get_input( + " +------------------------------------------------------------------------------- +| DISCLAIMER | +------------------------------------------------------------------------------- +| | +| This script will wreck the RON files for weapons if it messes up. | +| You might want to save a back up of the weapon files or be prepared to | +| use `git checkout HEAD -- ../assets/common/items/weapons/*` if needed. | +| If this script does mess up your files, please fix it. Otherwise your | +| files will be yeeted away and you will get a bonk on the head. | +| | +------------------------------------------------------------------------------- + +In order for this script to work, you need to have first run the csv exporter. +Once you have weaponstats.csv you can make changes to stats, quality, and +description in your preferred editor. Save the csv file and then run this +script to import your changes back to RON. + +Would you like to continue? (y/n) +> ", + ) + .to_lowercase() + == "y".to_string() + { + if let Err(e) = weapon_stats() { + println!("Error: {}\n", e) + } + } + } else { + println!("Invalid argument, available arguments:\n\"armor_stats\"\n\"weapon_stats\"\n\"") + } +} + +pub fn get_input(prompt: &str) -> String { + // Function to get input from the user with a prompt + let mut input = String::new(); + print!("{}", prompt); + std::io::stdout().flush().unwrap(); + std::io::stdin() + .read_line(&mut input) + .expect("Error reading input"); + + String::from(input.trim()) +} diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index b2cdc9e17f..f1ace67cf8 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -324,7 +324,7 @@ impl CharacterAbility { } } - pub fn adjusted_by_stats(mut self, power: f32, poise_reduction_power: f32, speed: f32) -> Self { + pub fn adjusted_by_stats(mut self, power: f32, poise_power: f32, speed: f32) -> Self { use CharacterAbility::*; match self { BasicMelee { @@ -339,7 +339,7 @@ impl CharacterAbility { *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *base_damage = (*base_damage as f32 * power) as u32; - *base_poise_damage = (*base_poise_damage as f32 * poise_reduction_power) as u32; + *base_poise_damage = (*base_poise_damage as f32 * poise_power) as u32; }, BasicRanged { ref mut buildup_duration, @@ -383,8 +383,8 @@ impl CharacterAbility { } => { *base_damage = (*base_damage as f32 * power) as u32; *scaled_damage = (*scaled_damage as f32 * power) as u32; - *base_poise_damage = (*base_damage as f32 * poise_reduction_power) as u32; - *scaled_poise_damage = (*scaled_poise_damage as f32 * poise_reduction_power) as u32; + *base_poise_damage = (*base_damage as f32 * poise_power) as u32; + *scaled_poise_damage = (*scaled_poise_damage as f32 * poise_power) as u32; *buildup_duration = (*buildup_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; @@ -405,7 +405,7 @@ impl CharacterAbility { } => { *stage_data = stage_data .iter_mut() - .map(|s| s.adjusted_by_stats(power, poise_reduction_power, speed)) + .map(|s| s.adjusted_by_stats(power, poise_power, speed)) .collect(); }, LeapMelee { @@ -422,7 +422,7 @@ impl CharacterAbility { *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *base_damage = (*base_damage as f32 * power) as u32; - *base_poise_damage = (*base_poise_damage as f32 * poise_reduction_power) as u32; + *base_poise_damage = (*base_poise_damage as f32 * poise_power) as u32; }, SpinMelee { ref mut buildup_duration, @@ -436,7 +436,7 @@ impl CharacterAbility { *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *base_damage = (*base_damage as f32 * power) as u32; - *base_poise_damage = (*base_poise_damage as f32 * poise_reduction_power) as u32; + *base_poise_damage = (*base_poise_damage as f32 * poise_power) as u32; }, ChargedMelee { ref mut initial_damage, @@ -451,9 +451,8 @@ impl CharacterAbility { } => { *initial_damage = (*initial_damage as f32 * power) as u32; *scaled_damage = (*scaled_damage as f32 * power) as u32; - *initial_poise_damage = - (*initial_poise_damage as f32 * poise_reduction_power) as u32; - *scaled_poise_damage = (*scaled_poise_damage as f32 * poise_reduction_power) as u32; + *initial_poise_damage = (*initial_poise_damage as f32 * poise_power) as u32; + *scaled_poise_damage = (*scaled_poise_damage as f32 * poise_power) as u32; *ability_speed *= speed; *charge_duration = (*charge_duration as f32 / speed) as u64; *swing_duration = (*swing_duration as f32 / speed) as u64; @@ -488,7 +487,7 @@ impl CharacterAbility { *swing_duration = (*swing_duration as f32 / speed) as u64; *recover_duration = (*recover_duration as f32 / speed) as u64; *damage = (*damage as f32 * power) as u32; - *poise_damage = (*poise_damage as f32 * poise_reduction_power) as u32; + *poise_damage = (*poise_damage as f32 * poise_power) as u32; }, BasicBeam { ref mut buildup_duration, diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index 398d436174..8ca4e5a75c 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -31,6 +31,15 @@ pub struct Stats { poise_protection: Protection, } +impl Stats { + pub fn new(protection: Protection, poise_protection: Protection) -> Self { + Self { + protection, + poise_protection, + } + } +} + #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub enum Protection { Invincible, @@ -44,6 +53,16 @@ pub struct Armor { } impl Armor { + pub fn new(kind: ArmorKind, protection: Protection, poise_protection: Protection) -> Self { + Self { + kind, + stats: Stats { + protection, + poise_protection, + }, + } + } + pub fn get_protection(&self) -> Protection { self.stats.protection } pub fn get_poise_protection(&self) -> Protection { self.stats.poise_protection } diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 0681327295..1db48c8b6c 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -352,6 +352,7 @@ impl Item { swing_duration: 100, recover_duration: 100, base_damage: body.base_dmg(), + base_poise_damage: body.base_poise_dmg(), knockback: 0.0, range: body.base_range(), max_angle: 20.0, diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index af6583d618..55f0b277aa 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -55,7 +55,7 @@ pub enum Hands { pub struct Stats { equip_time_millis: u32, power: f32, - poise_reduction_power: f32, + poise_power: f32, speed: f32, } @@ -67,14 +67,32 @@ pub struct Tool { } impl Tool { + pub fn new( + kind: ToolKind, + equip_time_millis: u32, + power: f32, + poise_power: f32, + speed: f32, + ) -> Self { + Self { + kind, + stats: Stats { + equip_time_millis, + power, + poise_power, + speed, + }, + } + } + pub fn empty() -> Self { Self { kind: ToolKind::Empty, stats: Stats { equip_time_millis: 0, power: 1.00, + poise_power: 1.00, speed: 1.00, - poise_reduction_power: 1.00, }, } } @@ -82,7 +100,7 @@ impl Tool { // Keep power between 0.5 and 2.00 pub fn base_power(&self) -> f32 { self.stats.power } - pub fn base_poise_reduction_power(&self) -> f32 { self.stats.poise_reduction_power } + pub fn base_poise_power(&self) -> f32 { self.stats.poise_power } pub fn base_speed(&self) -> f32 { self.stats.speed } @@ -115,7 +133,7 @@ impl AbilitySet { self.map(|a| { a.adjusted_by_stats( tool.base_power(), - tool.base_poise_reduction_power(), + tool.base_poise_power(), tool.base_speed(), ) }) diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index e6385be4f1..5f7353fc86 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -51,19 +51,19 @@ impl LoadoutBuilder { /// updates, but should be safe defaults for a new character. pub fn defaults(self) -> Self { self.chest(Some(Item::new_from_asset_expect( - "common.items.armor.starter.rugged_chest", + "common.items.armor.chest.rugged_chest", ))) .pants(Some(Item::new_from_asset_expect( - "common.items.armor.starter.rugged_pants", + "common.items.armor.pants.rugged_pants", ))) .feet(Some(Item::new_from_asset_expect( "common.items.armor.starter.sandals_0", ))) .lantern(Some(Item::new_from_asset_expect( - "common.items.armor.starter.lantern", + "common.items.lantern.black_0", ))) .glider(Some(Item::new_from_asset_expect( - "common.items.armor.starter.glider", + "common.items.glider.glider_cloverleaf", ))) } @@ -479,7 +479,7 @@ impl LoadoutBuilder { .feet(Some(Item::new_from_asset_expect( match rand::thread_rng().gen_range(0..2) { 0 => "common.items.armor.foot.leather_0", - _ => "common.items.armor.starter.sandals_0", + _ => "common.items.armor.foot.sandals_0", }, ))) .build(), diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index e7ffb62096..fe513c4210 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -1,4 +1,7 @@ -use crate::comp::{Body, Loadout}; +use crate::comp::{ + inventory::item::{armor::Protection, ItemKind}, + Body, Inventory, +}; use serde::{Deserialize, Serialize}; use specs::{Component, FlaggedStorage}; use specs_idvs::IdvStorage; @@ -17,13 +20,13 @@ pub struct PoiseChange { impl PoiseChange { /// Alters poise damage as a result of armor poise damage reduction - pub fn modify_poise_damage(self, loadout: Option<&Loadout>) -> PoiseChange { + pub fn modify_poise_damage(self, inventory: Option<&Inventory>) -> PoiseChange { let mut poise_damage = self.amount as f32; + let poise_damage_reduction = + inventory.map_or(0.0, |inv| Poise::compute_poise_damage_reduction(inv)); match self.source { PoiseSource::Melee => { // Armor - let poise_damage_reduction = - loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); poise_damage *= 1.0 - poise_damage_reduction; PoiseChange { amount: poise_damage as i32, @@ -32,8 +35,7 @@ impl PoiseChange { }, PoiseSource::Projectile => { // Armor - let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); - poise_damage *= 1.0 - damage_reduction; + poise_damage *= 1.0 - poise_damage_reduction; PoiseChange { amount: poise_damage as i32, source: PoiseSource::Projectile, @@ -41,8 +43,7 @@ impl PoiseChange { }, PoiseSource::Shockwave => { // Armor - let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); - poise_damage *= 1.0 - damage_reduction; + poise_damage *= 1.0 - poise_damage_reduction; PoiseChange { amount: poise_damage as i32, source: PoiseSource::Shockwave, @@ -50,17 +51,14 @@ impl PoiseChange { }, PoiseSource::Explosion => { // Armor - let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); - poise_damage *= 1.0 - damage_reduction; + poise_damage *= 1.0 - poise_damage_reduction; PoiseChange { amount: poise_damage as i32, source: PoiseSource::Explosion, } }, PoiseSource::Falling => { - // Armor - let damage_reduction = loadout.map_or(0.0, |l| l.get_poise_damage_reduction()); - if (damage_reduction - 1.0).abs() < f32::EPSILON { + if (poise_damage_reduction - 1.0).abs() < f32::EPSILON { poise_damage = 0.0; } PoiseChange { @@ -224,6 +222,28 @@ impl Poise { self.set_base_max(body.base_poise()); } } + + /// Returns the total poise damage reduction provided by all equipped items + pub fn compute_poise_damage_reduction(inventory: &Inventory) -> f32 { + let protection = inventory + .equipped_items() + .filter_map(|item| { + if let ItemKind::Armor(armor) = &item.kind() { + Some(armor.get_poise_protection()) + } else { + None + } + }) + .map(|protection| match protection { + Protection::Normal(protection) => Some(protection), + Protection::Invincible => None, + }) + .sum::>(); + match protection { + Some(dr) => dr / (60.0 + dr.abs()), + None => 1.0, + } + } } impl Component for Poise { diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index 275c038525..5af102ceac 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -59,12 +59,11 @@ impl Stage { } } - pub fn adjusted_by_stats(mut self, power: f32, poise_reduction_power: f32, speed: f32) -> Self { + pub fn adjusted_by_stats(mut self, power: f32, poise_power: f32, speed: f32) -> Self { self.base_damage = (self.base_damage as f32 * power) as u32; self.damage_increase = (self.damage_increase as f32 * power) as u32; - self.base_poise_damage = (self.base_poise_damage as f32 * poise_reduction_power) as u32; - self.poise_damage_increase = - (self.poise_damage_increase as f32 * poise_reduction_power) as u32; + self.base_poise_damage = (self.base_poise_damage as f32 * poise_power) as u32; + self.poise_damage_increase = (self.poise_damage_increase as f32 * poise_power) as u32; self.base_buildup_duration = (self.base_buildup_duration as f32 / speed) as u64; self.base_swing_duration = (self.base_swing_duration as f32 / speed) as u64; self.base_recover_duration = (self.base_recover_duration as f32 / speed) as u64; diff --git a/common/sys/src/beam.rs b/common/sys/src/beam.rs index 8b98380e9c..54900d5461 100644 --- a/common/sys/src/beam.rs +++ b/common/sys/src/beam.rs @@ -1,7 +1,7 @@ use common::{ comp::{ group, Beam, BeamSegment, Body, Energy, EnergyChange, EnergySource, Health, HealthChange, - HealthSource, Inventory, Last, Ori, PoiseChange, PoiseSource, Pos, Scale, + HealthSource, Inventory, Last, Ori, Pos, Scale, }, event::{EventBus, ServerEvent}, resources::{DeltaTime, Time}, diff --git a/common/sys/src/melee.rs b/common/sys/src/melee.rs index fd9a31a63c..2b939cbfdb 100644 --- a/common/sys/src/melee.rs +++ b/common/sys/src/melee.rs @@ -1,7 +1,5 @@ use common::{ - comp::{ - buff, group, Attacking, Body, CharacterState, Health, Inventory, Ori, Poise, Pos, Scale, - }, + comp::{buff, group, Attacking, Body, CharacterState, Health, Inventory, Ori, Pos, Scale}, event::{EventBus, LocalEvent, ServerEvent}, metrics::SysMetrics, span, @@ -129,7 +127,7 @@ impl<'a> System<'a> for Sys { } } - let change = damage.modify_damage(loadouts.get(b), Some(*uid)); + let change = damage.modify_damage(inventories.get(b), Some(*uid)); let poise_change = poise_change.modify_poise_damage(inventories.get(b)); server_emitter.emit(ServerEvent::Damage { entity: b, change }); diff --git a/common/sys/src/projectile.rs b/common/sys/src/projectile.rs index 7d1b150795..291f4a3dc7 100644 --- a/common/sys/src/projectile.rs +++ b/common/sys/src/projectile.rs @@ -119,8 +119,6 @@ impl<'a> System<'a> for Sys { let other_entity_inventory = inventories.get(other_entity); let change = damage.modify_damage(other_entity_inventory, projectile.owner); - let poise_change = poise_damage - .modify_poise_damage(other_entity_inventory, projectile.owner); server_emitter.emit(ServerEvent::Damage { entity: other_entity, change, @@ -141,9 +139,9 @@ impl<'a> System<'a> for Sys { if let Some(other_entity) = uid_allocator.retrieve_entity_internal(other.into()) { - let other_entity_loadout = loadouts.get(other_entity); + let other_entity_inventory = inventories.get(other_entity); let poise_change = - poise_damage.modify_poise_damage(other_entity_loadout); + poise_damage.modify_poise_damage(other_entity_inventory); server_emitter.emit(ServerEvent::PoiseChange { entity: other_entity, change: poise_change, diff --git a/common/sys/src/shockwave.rs b/common/sys/src/shockwave.rs index 56f5f91159..8c7d72e9c3 100644 --- a/common/sys/src/shockwave.rs +++ b/common/sys/src/shockwave.rs @@ -200,8 +200,7 @@ impl<'a> System<'a> for Sys { let owner_uid = shockwave.owner.unwrap_or(*uid); let change = damage.modify_damage(inventories.get(b), Some(owner_uid)); - let poise_change = - poise_damage.modify_poise_damage(inventories.get(b), Some(owner_uid)); + let poise_change = poise_damage.modify_poise_damage(inventories.get(b)); server_emitter.emit(ServerEvent::Damage { entity: b, change }); shockwave_hit_list.hit_entities.push(*uid_b); diff --git a/common/sys/src/stats.rs b/common/sys/src/stats.rs index 1e6aeaaa1e..b06e34bf59 100644 --- a/common/sys/src/stats.rs +++ b/common/sys/src/stats.rs @@ -64,7 +64,7 @@ impl<'a> System<'a> for Sys { // Increment last change timer healths.set_event_emission(false); // avoid unnecessary syncing poises.set_event_emission(false); // avoid unnecessary syncing - for health in (&mut healths).join() { + for mut health in (&mut healths).join() { health.last_change.0 += f64::from(dt.0); } for poise in (&mut poises).join() { diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 151548b7fd..b073126de6 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -53,7 +53,7 @@ pub fn handle_poise( pub fn handle_damage(server: &Server, entity: EcsEntity, change: HealthChange) { let ecs = &server.state.ecs(); - if let Some(health) = ecs.write_storage::().get_mut(entity) { + if let Some(mut health) = ecs.write_storage::().get_mut(entity) { health.change_by(change); } } @@ -521,9 +521,9 @@ pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3) }; let inventories = state.ecs().read_storage::(); let change = damage.modify_damage(inventories.get(entity), None); - let poise_change = poise_damage.modify_poise_damage(inventories.get(entity), None); + let poise_change = poise_damage.modify_poise_damage(inventories.get(entity)); health.change_by(change); - poise.change_by(poise_change, Vec3::zero()); + poise.change_by(poise_change, Vec3::unit_z()); } } } @@ -728,7 +728,7 @@ pub fn handle_explosion( server.state().apply_effect(entity_b, effect.clone(), owner); // Apply energy change if let Some(owner) = owner_entity { - if let Some(energy) = + if let Some(mut energy) = ecs.write_storage::().get_mut(owner) { energy.change_by(EnergyChange { diff --git a/server/src/state_ext.rs b/server/src/state_ext.rs index 7b1b047e4f..96fadc0209 100644 --- a/server/src/state_ext.rs +++ b/server/src/state_ext.rs @@ -35,8 +35,8 @@ pub trait StateExt { pos: comp::Pos, stats: comp::Stats, health: comp::Health, - inventory: comp::Inventory, poise: comp::Poise, + inventory: comp::Inventory, body: comp::Body, ) -> EcsEntityBuilder; /// Build a static object entity @@ -97,8 +97,8 @@ impl StateExt for State { .map(|mut health| health.change_by(change)); }, Effect::PoiseChange(poise_damage) => { - let loadouts = self.ecs().read_storage::(); - let change = poise_damage.modify_poise_damage(loadouts.get(entity)); + let inventories = self.ecs().read_storage::(); + let change = poise_damage.modify_poise_damage(inventories.get(entity)); // Check to make sure the entity is not already stunned if let Some(character_state) = self .ecs() @@ -134,8 +134,8 @@ impl StateExt for State { pos: comp::Pos, stats: comp::Stats, health: comp::Health, - inventory: comp::Inventory, poise: comp::Poise, + inventory: comp::Inventory, body: comp::Body, ) -> EcsEntityBuilder { self.ecs_mut() diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 3a0f3c1dd8..c78f85ea96 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -74,6 +74,7 @@ fn maps_basic_melee() { swing_duration: Duration::default(), recover_duration: Duration::default(), base_damage: 10, + base_poise_damage: 10, knockback: 0.0, range: 1.0, max_angle: 1.0, @@ -113,7 +114,9 @@ fn matches_ability_stage() { stage_data: vec![states::combo_melee::Stage { stage: 1, base_damage: 100, + base_poise_damage: 100, damage_increase: 10, + poise_damage_increase: 10, knockback: 10.0, range: 4.0, angle: 30.0, @@ -170,7 +173,9 @@ fn ignores_different_ability_stage() { stage_data: vec![states::combo_melee::Stage { stage: 1, base_damage: 100, + base_poise_damage: 100, damage_increase: 10, + poise_damage_increase: 10, knockback: 10.0, range: 4.0, angle: 30.0, diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 292b4c86db..6f1740a16c 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -69,13 +69,19 @@ fn armor_desc(armor: &Armor, desc: &str, slots: u16) -> String { ArmorKind::Tabard(_) => "Tabard", ArmorKind::Bag(_) => "Bag", }; - - let protection = match armor.get_protection() { + let armor_protection = match armor.get_protection() { + Protection::Normal(a) => a.to_string(), + Protection::Invincible => "Inf".to_string(), + }; + let armor_poise_protection = match armor.get_poise_protection() { Protection::Normal(a) => a.to_string(), Protection::Invincible => "Inf".to_string(), }; - let mut description = format!("{}\n\nArmor: {}", kind, protection); + let mut description = format!( + "{}\n\nArmor: {}\n\nPoise Protection: {}", + kind, armor_protection, armor_poise_protection + ); if !desc.is_empty() { write!(&mut description, "\n\n{}", desc).unwrap(); @@ -104,24 +110,31 @@ fn tool_desc(tool: &Tool, desc: &str) -> String { ToolKind::Farming => "Farming Tool", ToolKind::Empty => "Empty", }; + + // Get tool stats let power = tool.base_power(); + let poise_power = tool.base_poise_power(); let speed = tool.base_speed(); if !desc.is_empty() { format!( - "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n", + "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \ + {:0.1}\n\n{}\n\n", kind, speed * power * 10.0, // Damage per second power * 10.0, + poise_power * 10.0, speed, desc ) } else { format!( - "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n", + "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Power: {:0.1}\n\nSpeed: \ + {:0.1}\n\n", kind, speed * power * 10.0, // Damage per second power * 10.0, + poise_power * 10.0, speed ) }