From 53fddba3efc9b2d5d1b4471e49cd9e06c81a6be8 Mon Sep 17 00:00:00 2001 From: danielkenji83 Date: Sat, 17 Feb 2024 01:50:00 -0300 Subject: [PATCH] Remove block_strength stat --- assets/common/items/debug/admin_stick.ron | 1 - assets/common/items/debug/admin_sword.ron | 1 - .../common/items/debug/velorite_bow_debug.ron | 1 - .../items/modular/weapon/primary/axe/axe.ron | 1 - .../modular/weapon/primary/axe/battleaxe.ron | 1 - .../modular/weapon/primary/axe/greataxe.ron | 1 - .../modular/weapon/primary/axe/jagged.ron | 1 - .../modular/weapon/primary/axe/labrys.ron | 1 - .../modular/weapon/primary/axe/ornate.ron | 1 - .../modular/weapon/primary/axe/poleaxe.ron | 1 - .../items/modular/weapon/primary/bow/bow.ron | 1 - .../modular/weapon/primary/bow/composite.ron | 1 - .../modular/weapon/primary/bow/greatbow.ron | 1 - .../modular/weapon/primary/bow/longbow.ron | 1 - .../modular/weapon/primary/bow/ornate.ron | 1 - .../modular/weapon/primary/bow/shortbow.ron | 1 - .../modular/weapon/primary/bow/warbow.ron | 1 - .../weapon/primary/hammer/greathammer.ron | 1 - .../weapon/primary/hammer/greatmace.ron | 1 - .../modular/weapon/primary/hammer/hammer.ron | 1 - .../modular/weapon/primary/hammer/maul.ron | 1 - .../modular/weapon/primary/hammer/ornate.ron | 1 - .../weapon/primary/hammer/spikedmace.ron | 1 - .../weapon/primary/hammer/warhammer.ron | 1 - .../modular/weapon/primary/sceptre/arbor.ron | 1 - .../modular/weapon/primary/sceptre/cane.ron | 1 - .../modular/weapon/primary/sceptre/crook.ron | 1 - .../weapon/primary/sceptre/crozier.ron | 1 - .../weapon/primary/sceptre/grandsceptre.ron | 1 - .../modular/weapon/primary/sceptre/ornate.ron | 1 - .../weapon/primary/sceptre/sceptre.ron | 1 - .../modular/weapon/primary/staff/brand.ron | 1 - .../weapon/primary/staff/grandstaff.ron | 1 - .../modular/weapon/primary/staff/longpole.ron | 1 - .../modular/weapon/primary/staff/ornate.ron | 1 - .../modular/weapon/primary/staff/pole.ron | 1 - .../modular/weapon/primary/staff/rod.ron | 1 - .../modular/weapon/primary/staff/staff.ron | 1 - .../weapon/primary/sword/greatsword.ron | 1 - .../modular/weapon/primary/sword/katana.ron | 1 - .../weapon/primary/sword/longsword.ron | 1 - .../modular/weapon/primary/sword/ornate.ron | 1 - .../modular/weapon/primary/sword/sabre.ron | 1 - .../modular/weapon/primary/sword/sawblade.ron | 1 - .../weapon/primary/sword/zweihander.ron | 1 - .../modular/weapon/secondary/axe/long.ron | 1 - .../modular/weapon/secondary/axe/medium.ron | 1 - .../modular/weapon/secondary/axe/short.ron | 1 - .../modular/weapon/secondary/bow/long.ron | 1 - .../modular/weapon/secondary/bow/medium.ron | 1 - .../modular/weapon/secondary/bow/short.ron | 1 - .../modular/weapon/secondary/hammer/long.ron | 1 - .../weapon/secondary/hammer/medium.ron | 1 - .../modular/weapon/secondary/hammer/short.ron | 1 - .../weapon/secondary/sceptre/heavy.ron | 1 - .../weapon/secondary/sceptre/light.ron | 1 - .../weapon/secondary/sceptre/medium.ron | 1 - .../modular/weapon/secondary/staff/heavy.ron | 1 - .../modular/weapon/secondary/staff/light.ron | 1 - .../modular/weapon/secondary/staff/medium.ron | 1 - .../modular/weapon/secondary/sword/long.ron | 1 - .../modular/weapon/secondary/sword/medium.ron | 1 - .../modular/weapon/secondary/sword/short.ron | 1 - .../items/npc_weapons/axe/gigas_frost_axe.ron | 1 - .../items/npc_weapons/axe/minotaur_axe.ron | 1 - .../items/npc_weapons/axe/oni_blue_axe.ron | 1 - .../npc_weapons/biped_small/adlet/hunter.ron | 1 - .../biped_small/adlet/icepicker.ron | 1 - .../npc_weapons/biped_small/adlet/tracker.ron | 1 - .../npc_weapons/biped_small/boreal/bow.ron | 1 - .../npc_weapons/biped_small/boreal/hammer.ron | 1 - .../biped_small/gnarling/chieftain.ron | 1 - .../biped_small/gnarling/greentotem.ron | 1 - .../biped_small/gnarling/logger.ron | 1 - .../biped_small/gnarling/mugger.ron | 1 - .../biped_small/gnarling/redtotem.ron | 1 - .../biped_small/gnarling/stalker.ron | 1 - .../biped_small/gnarling/whitetotem.ron | 1 - .../npc_weapons/biped_small/haniwa/archer.ron | 1 - .../npc_weapons/biped_small/haniwa/guard.ron | 1 - .../biped_small/haniwa/soldier.ron | 1 - .../npc_weapons/biped_small/mandragora.ron | 1 - .../biped_small/myrmidon/hoplite.ron | 1 - .../biped_small/myrmidon/marksman.ron | 1 - .../biped_small/myrmidon/strategian.ron | 1 - .../biped_small/sahagin/sniper.ron | 1 - .../biped_small/sahagin/sorcerer.ron | 1 - .../biped_small/sahagin/spearman.ron | 1 - .../npc_weapons/bow/bipedlarge-velorite.ron | 1 - .../items/npc_weapons/bow/saurok_bow.ron | 1 - .../npc_weapons/hammer/bipedlarge-cultist.ron | 1 - .../npc_weapons/hammer/cyclops_hammer.ron | 1 - .../npc_weapons/hammer/harvester_scythe.ron | 1 - .../items/npc_weapons/hammer/ogre_hammer.ron | 1 - .../npc_weapons/hammer/oni_red_hammer.ron | 1 - .../items/npc_weapons/hammer/troll_hammer.ron | 1 - .../npc_weapons/hammer/wendigo_hammer.ron | 1 - .../items/npc_weapons/hammer/yeti_hammer.ron | 1 - .../npc_weapons/staff/bipedlarge-cultist.ron | 1 - .../npc_weapons/staff/mindflayer_staff.ron | 1 - .../items/npc_weapons/staff/ogre_staff.ron | 1 - .../items/npc_weapons/staff/saurok_staff.ron | 1 - .../npc_weapons/sword/adlet_elder_sword.ron | 1 - .../npc_weapons/sword/bipedlarge-cultist.ron | 1 - .../npc_weapons/sword/dullahan_sword.ron | 1 - .../sword/haniwa_general_sword.ron | 1 - .../sword/pickaxe_velorite_sword.ron | 1 - .../items/npc_weapons/sword/saurok_sword.ron | 1 - .../items/npc_weapons/unique/akhlut.ron | 1 - .../unique/ancient_effigy_eyes.ron | 1 - .../npc_weapons/unique/arthropods/antlion.ron | 1 - .../unique/arthropods/blackwidow.ron | 1 - .../unique/arthropods/cavespider.ron | 1 - .../unique/arthropods/dagonite.ron | 1 - .../unique/arthropods/hornbeetle.ron | 1 - .../unique/arthropods/tarantula.ron | 1 - .../npc_weapons/unique/arthropods/weevil.ron | 1 - .../items/npc_weapons/unique/beast_claws.ron | 1 - .../npc_weapons/unique/birdlargebasic.ron | 1 - .../npc_weapons/unique/birdlargebreathe.ron | 1 - .../npc_weapons/unique/birdlargefire.ron | 1 - .../npc_weapons/unique/birdmediumbasic.ron | 1 - .../items/npc_weapons/unique/bushly.ron | 1 - .../items/npc_weapons/unique/cardinal.ron | 1 - .../npc_weapons/unique/clay_golem_fist.ron | 1 - .../items/npc_weapons/unique/claysteed.ron | 1 - .../items/npc_weapons/unique/clockwork.ron | 1 - .../items/npc_weapons/unique/cloudwyvern.ron | 1 - .../npc_weapons/unique/coral_golem_fist.ron | 1 - .../items/npc_weapons/unique/crab_pincer.ron | 1 - .../common/items/npc_weapons/unique/dagon.ron | 1 - .../items/npc_weapons/unique/driggle.ron | 1 - .../items/npc_weapons/unique/emberfly.ron | 1 - .../npc_weapons/unique/fiery_tornado.ron | 1 - .../npc_weapons/unique/flamekeeper_staff.ron | 1 - .../items/npc_weapons/unique/flamethrower.ron | 1 - .../items/npc_weapons/unique/flamewyvern.ron | 1 - .../items/npc_weapons/unique/frostfang.ron | 1 - .../items/npc_weapons/unique/frostwyvern.ron | 1 - .../npc_weapons/unique/gravewarden_fist.ron | 1 - .../npc_weapons/unique/haniwa_sentry.ron | 1 - .../npc_weapons/unique/hermit_alligator.ron | 1 - .../common/items/npc_weapons/unique/husk.ron | 1 - .../items/npc_weapons/unique/husk_brute.ron | 1 - .../items/npc_weapons/unique/irrwurz.ron | 1 - .../items/npc_weapons/unique/mossysnail.ron | 1 - .../common/items/npc_weapons/unique/organ.ron | 1 - .../items/npc_weapons/unique/quadlowbasic.ron | 1 - .../items/npc_weapons/unique/quadlowbeam.ron | 1 - .../items/npc_weapons/unique/quadlowquick.ron | 1 - .../items/npc_weapons/unique/quadlowtail.ron | 1 - .../items/npc_weapons/unique/quadmedbasic.ron | 1 - .../npc_weapons/unique/quadmedbasicgentle.ron | 1 - .../npc_weapons/unique/quadmedcharge.ron | 1 - .../items/npc_weapons/unique/quadmedjump.ron | 1 - .../items/npc_weapons/unique/quadmedquick.ron | 1 - .../npc_weapons/unique/quadruped_low/asp.ron | 1 - .../unique/quadruped_low/basilisk.ron | 1 - .../unique/quadruped_low/deadwood.ron | 1 - .../unique/quadruped_low/icedrake.ron | 1 - .../unique/quadruped_low/lavadrake.ron | 1 - .../unique/quadruped_low/maneater.ron | 1 - .../unique/quadruped_medium/horse.ron | 1 - .../npc_weapons/unique/quadsmallbasic.ron | 1 - .../items/npc_weapons/unique/roshwalr.ron | 1 - .../npc_weapons/unique/sea_bishop_sceptre.ron | 1 - .../items/npc_weapons/unique/seawyvern.ron | 1 - .../npc_weapons/unique/simpleflyingbasic.ron | 1 - .../npc_weapons/unique/stone_golems_fist.ron | 1 - .../npc_weapons/unique/theropodbasic.ron | 1 - .../items/npc_weapons/unique/theropodbird.ron | 1 - .../npc_weapons/unique/theropodcharge.ron | 1 - .../npc_weapons/unique/theropodsmall.ron | 1 - .../items/npc_weapons/unique/tidal_claws.ron | 1 - .../items/npc_weapons/unique/tidal_totem.ron | 1 - .../items/npc_weapons/unique/tornado.ron | 1 - .../npc_weapons/unique/treantsapling.ron | 1 - .../items/npc_weapons/unique/turret.ron | 1 - .../items/npc_weapons/unique/tursus_claws.ron | 1 - .../items/npc_weapons/unique/wealdwyvern.ron | 1 - .../npc_weapons/unique/wendigo_magic.ron | 1 - .../npc_weapons/unique/wood_golem_fist.ron | 1 - assets/common/items/tool/craftsman_hammer.ron | 1 - .../items/tool/instruments/double_bass.ron | 1 - .../common/items/tool/instruments/flute.ron | 1 - .../items/tool/instruments/glass_flute.ron | 1 - .../common/items/tool/instruments/guitar.ron | 1 - .../items/tool/instruments/guitar_dark.ron | 1 - .../items/tool/instruments/icy_talharpa.ron | 1 - .../common/items/tool/instruments/kalimba.ron | 1 - assets/common/items/tool/instruments/lute.ron | 1 - assets/common/items/tool/instruments/lyre.ron | 1 - .../items/tool/instruments/melodica.ron | 1 - .../items/tool/instruments/shamisen.ron | 1 - .../common/items/tool/instruments/sitar.ron | 1 - .../tool/instruments/steeltonguedrum.ron | 1 - .../items/tool/instruments/washboard.ron | 1 - .../items/tool/instruments/wildskin_drum.ron | 1 - assets/common/items/tool/pickaxe_steel.ron | 1 - assets/common/items/tool/pickaxe_stone.ron | 1 - assets/common/items/tool/pickaxe_velorite.ron | 1 - .../items/weapons/axe/malachite_axe-0.ron | 1 - assets/common/items/weapons/axe/parashu.ron | 1 - .../common/items/weapons/axe/starter_axe.ron | 1 - assets/common/items/weapons/bow/sagitta.ron | 1 - assets/common/items/weapons/bow/starter.ron | 1 - assets/common/items/weapons/bow/velorite.ron | 1 - .../common/items/weapons/dagger/basic_0.ron | 1 - .../common/items/weapons/dagger/cultist_0.ron | 1 - .../items/weapons/dagger/starter_dagger.ron | 1 - assets/common/items/weapons/empty/empty.ron | 1 - .../items/weapons/hammer/burnt_drumstick.ron | 1 - .../weapons/hammer/cultist_purp_2h-0.ron | 1 - .../items/weapons/hammer/flimsy_hammer.ron | 1 - .../common/items/weapons/hammer/hammer_1.ron | 1 - .../common/items/weapons/hammer/mjolnir.ron | 1 - .../items/weapons/hammer/starter_hammer.ron | 1 - .../common/items/weapons/sceptre/amethyst.ron | 1 - .../items/weapons/sceptre/belzeshrub.ron | 1 - .../common/items/weapons/sceptre/caduceus.ron | 1 - .../items/weapons/sceptre/root_evil.ron | 1 - .../weapons/sceptre/sceptre_velorite_0.ron | 1 - .../items/weapons/sceptre/starter_sceptre.ron | 1 - .../common/items/weapons/shield/shield_1.ron | 3 +- .../items/weapons/shield/starter_shield.ron | 1 - .../items/weapons/staff/cultist_staff.ron | 1 - .../common/items/weapons/staff/laevateinn.ron | 1 - assets/common/items/weapons/staff/staff_1.ron | 1 - .../items/weapons/staff/starter_staff.ron | 1 - .../common/items/weapons/sword/caladbolg.ron | 1 - assets/common/items/weapons/sword/cultist.ron | 1 - assets/common/items/weapons/sword/frost-0.ron | 1 - assets/common/items/weapons/sword/frost-1.ron | 1 - assets/common/items/weapons/sword/starter.ron | 1 - .../common/items/weapons/sword_1h/starter.ron | 1 - assets/common/items/weapons/tool/broom.ron | 1 - .../common/items/weapons/tool/fishing_rod.ron | 1 - .../common/items/weapons/tool/golf_club.ron | 1 - assets/common/items/weapons/tool/hoe.ron | 1 - assets/common/items/weapons/tool/pickaxe.ron | 1 - .../common/items/weapons/tool/pitchfork.ron | 1 - assets/common/items/weapons/tool/rake.ron | 1 - assets/common/items/weapons/tool/shovel-0.ron | 1 - assets/common/items/weapons/tool/shovel-1.ron | 1 - assets/common/material_stats_manifest.ron | 16 +------ assets/voxygen/i18n/en/common.ftl | 1 - common/src/combat.rs | 11 +---- common/src/comp/inventory/item/tool.rs | 9 ---- voxygen/src/hud/diary.rs | 16 +------ voxygen/src/hud/util.rs | 4 +- voxygen/src/ui/widgets/item_tooltip.rs | 47 +------------------ 251 files changed, 10 insertions(+), 340 deletions(-) diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron index 3fef273440..24f81c6c65 100644 --- a/assets/common/items/debug/admin_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Debug, diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index c15c214fb1..0a947db683 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 999.9 ), )), quality: Debug, diff --git a/assets/common/items/debug/velorite_bow_debug.ron b/assets/common/items/debug/velorite_bow_debug.ron index 927bb685e5..3ff3836782 100644 --- a/assets/common/items/debug/velorite_bow_debug.ron +++ b/assets/common/items/debug/velorite_bow_debug.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Debug, diff --git a/assets/common/items/modular/weapon/primary/axe/axe.ron b/assets/common/items/modular/weapon/primary/axe/axe.ron index 31f6d35c32..ad2c654260 100644 --- a/assets/common/items/modular/weapon/primary/axe/axe.ron +++ b/assets/common/items/modular/weapon/primary/axe/axe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.9, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/battleaxe.ron b/assets/common/items/modular/weapon/primary/axe/battleaxe.ron index e341ba03dc..c970a82e30 100644 --- a/assets/common/items/modular/weapon/primary/axe/battleaxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/battleaxe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, - block_strength: 0.6, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/greataxe.ron b/assets/common/items/modular/weapon/primary/axe/greataxe.ron index 1e0811882a..3ec1edbfa6 100644 --- a/assets/common/items/modular/weapon/primary/axe/greataxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/greataxe.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 0.9, buff_strength: 1.2, - block_strength: 1.2, ), hand_restriction: Some(Two), weapon_name: Universal("Greataxe"), diff --git a/assets/common/items/modular/weapon/primary/axe/jagged.ron b/assets/common/items/modular/weapon/primary/axe/jagged.ron index 4e361fd9d6..97b0f7cdd8 100644 --- a/assets/common/items/modular/weapon/primary/axe/jagged.ron +++ b/assets/common/items/modular/weapon/primary/axe/jagged.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.4, - block_strength: 0.8, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/labrys.ron b/assets/common/items/modular/weapon/primary/axe/labrys.ron index 35fd0d80ce..dc26377570 100644 --- a/assets/common/items/modular/weapon/primary/axe/labrys.ron +++ b/assets/common/items/modular/weapon/primary/axe/labrys.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.9, buff_strength: 0.8, - block_strength: 1.0, ), hand_restriction: Some(Two), weapon_name: Universal("Labrys"), diff --git a/assets/common/items/modular/weapon/primary/axe/ornate.ron b/assets/common/items/modular/weapon/primary/axe/ornate.ron index 2869ea3b39..10f33de489 100644 --- a/assets/common/items/modular/weapon/primary/axe/ornate.ron +++ b/assets/common/items/modular/weapon/primary/axe/ornate.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.1, energy_efficiency: 1.3, buff_strength: 1.0, - block_strength: 0.7, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/poleaxe.ron b/assets/common/items/modular/weapon/primary/axe/poleaxe.ron index 4e75b2c53c..d3807f6f66 100644 --- a/assets/common/items/modular/weapon/primary/axe/poleaxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/poleaxe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.3, energy_efficiency: 0.9, buff_strength: 0.9, - block_strength: 1.1, ), hand_restriction: Some(Two), weapon_name: Universal("Poleaxe"), diff --git a/assets/common/items/modular/weapon/primary/bow/bow.ron b/assets/common/items/modular/weapon/primary/bow/bow.ron index dc88c26fd3..e63e3c9bb4 100644 --- a/assets/common/items/modular/weapon/primary/bow/bow.ron +++ b/assets/common/items/modular/weapon/primary/bow/bow.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Bow"), diff --git a/assets/common/items/modular/weapon/primary/bow/composite.ron b/assets/common/items/modular/weapon/primary/bow/composite.ron index e94aed7498..f3d4c92ef3 100644 --- a/assets/common/items/modular/weapon/primary/bow/composite.ron +++ b/assets/common/items/modular/weapon/primary/bow/composite.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Composite Bow"), diff --git a/assets/common/items/modular/weapon/primary/bow/greatbow.ron b/assets/common/items/modular/weapon/primary/bow/greatbow.ron index e898961fa7..0145f90b60 100644 --- a/assets/common/items/modular/weapon/primary/bow/greatbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/greatbow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Greatbow"), diff --git a/assets/common/items/modular/weapon/primary/bow/longbow.ron b/assets/common/items/modular/weapon/primary/bow/longbow.ron index 80694558a8..16938cd0e9 100644 --- a/assets/common/items/modular/weapon/primary/bow/longbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/longbow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Longbow"), diff --git a/assets/common/items/modular/weapon/primary/bow/ornate.ron b/assets/common/items/modular/weapon/primary/bow/ornate.ron index 6f51d03605..03ea5a0031 100644 --- a/assets/common/items/modular/weapon/primary/bow/ornate.ron +++ b/assets/common/items/modular/weapon/primary/bow/ornate.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Ornate Bow"), diff --git a/assets/common/items/modular/weapon/primary/bow/shortbow.ron b/assets/common/items/modular/weapon/primary/bow/shortbow.ron index a7d8deb5a9..1dac9623c5 100644 --- a/assets/common/items/modular/weapon/primary/bow/shortbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/shortbow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Shortbow"), diff --git a/assets/common/items/modular/weapon/primary/bow/warbow.ron b/assets/common/items/modular/weapon/primary/bow/warbow.ron index 865cf422fe..339b9b721f 100644 --- a/assets/common/items/modular/weapon/primary/bow/warbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/warbow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Warbow"), diff --git a/assets/common/items/modular/weapon/primary/hammer/greathammer.ron b/assets/common/items/modular/weapon/primary/hammer/greathammer.ron index 116b56a5de..bc1c01d523 100644 --- a/assets/common/items/modular/weapon/primary/hammer/greathammer.ron +++ b/assets/common/items/modular/weapon/primary/hammer/greathammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 1.3, ), hand_restriction: Some(Two), weapon_name: Universal("Greathammer"), diff --git a/assets/common/items/modular/weapon/primary/hammer/greatmace.ron b/assets/common/items/modular/weapon/primary/hammer/greatmace.ron index ca995c6128..2d2c626337 100644 --- a/assets/common/items/modular/weapon/primary/hammer/greatmace.ron +++ b/assets/common/items/modular/weapon/primary/hammer/greatmace.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 1.1, ), hand_restriction: Some(Two), weapon_name: Universal("Greatmace"), diff --git a/assets/common/items/modular/weapon/primary/hammer/hammer.ron b/assets/common/items/modular/weapon/primary/hammer/hammer.ron index 8f8f06df96..36565a5335 100644 --- a/assets/common/items/modular/weapon/primary/hammer/hammer.ron +++ b/assets/common/items/modular/weapon/primary/hammer/hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, - block_strength: 1.0, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/hammer/maul.ron b/assets/common/items/modular/weapon/primary/hammer/maul.ron index 56c12a7a35..ade4001ff2 100644 --- a/assets/common/items/modular/weapon/primary/hammer/maul.ron +++ b/assets/common/items/modular/weapon/primary/hammer/maul.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 1.2, ), hand_restriction: Some(Two), weapon_name: Universal("Maul"), diff --git a/assets/common/items/modular/weapon/primary/hammer/ornate.ron b/assets/common/items/modular/weapon/primary/hammer/ornate.ron index 2ad91f3863..64c98e3e69 100644 --- a/assets/common/items/modular/weapon/primary/hammer/ornate.ron +++ b/assets/common/items/modular/weapon/primary/hammer/ornate.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, - block_strength: 0.8, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron b/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron index ed1cc4975a..431968edcc 100644 --- a/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron +++ b/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, - block_strength: 0.9, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/hammer/warhammer.ron b/assets/common/items/modular/weapon/primary/hammer/warhammer.ron index 58510d1770..7844e84f55 100644 --- a/assets/common/items/modular/weapon/primary/hammer/warhammer.ron +++ b/assets/common/items/modular/weapon/primary/hammer/warhammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.7, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/sceptre/arbor.ron b/assets/common/items/modular/weapon/primary/sceptre/arbor.ron index 4b258ec1e2..5d7e76f43b 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/arbor.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/arbor.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Arbor"), diff --git a/assets/common/items/modular/weapon/primary/sceptre/cane.ron b/assets/common/items/modular/weapon/primary/sceptre/cane.ron index 04d5539e34..cbd2001002 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/cane.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/cane.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Cane"), diff --git a/assets/common/items/modular/weapon/primary/sceptre/crook.ron b/assets/common/items/modular/weapon/primary/sceptre/crook.ron index f650f8fd5e..7e15ed35c8 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/crook.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/crook.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Crook"), diff --git a/assets/common/items/modular/weapon/primary/sceptre/crozier.ron b/assets/common/items/modular/weapon/primary/sceptre/crozier.ron index 1750c2cc05..37f6c7f342 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/crozier.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/crozier.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Crozier"), diff --git a/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron b/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron index 8d31b5a8e7..47f159cac6 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Grandsceptre"), diff --git a/assets/common/items/modular/weapon/primary/sceptre/ornate.ron b/assets/common/items/modular/weapon/primary/sceptre/ornate.ron index 4b5bb5622f..17d1af8705 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/ornate.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/ornate.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Ornate Sceptre"), diff --git a/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron b/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron index a10f940ab6..afa34e414e 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Sceptre"), diff --git a/assets/common/items/modular/weapon/primary/staff/brand.ron b/assets/common/items/modular/weapon/primary/staff/brand.ron index 8a6f45b789..c25245769f 100644 --- a/assets/common/items/modular/weapon/primary/staff/brand.ron +++ b/assets/common/items/modular/weapon/primary/staff/brand.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Brand"), diff --git a/assets/common/items/modular/weapon/primary/staff/grandstaff.ron b/assets/common/items/modular/weapon/primary/staff/grandstaff.ron index 41193fb131..d8079424c8 100644 --- a/assets/common/items/modular/weapon/primary/staff/grandstaff.ron +++ b/assets/common/items/modular/weapon/primary/staff/grandstaff.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Grandstaff"), diff --git a/assets/common/items/modular/weapon/primary/staff/longpole.ron b/assets/common/items/modular/weapon/primary/staff/longpole.ron index 32354ddf0b..d29da84303 100644 --- a/assets/common/items/modular/weapon/primary/staff/longpole.ron +++ b/assets/common/items/modular/weapon/primary/staff/longpole.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Longpole"), diff --git a/assets/common/items/modular/weapon/primary/staff/ornate.ron b/assets/common/items/modular/weapon/primary/staff/ornate.ron index 0bff8fe14a..0d76468a67 100644 --- a/assets/common/items/modular/weapon/primary/staff/ornate.ron +++ b/assets/common/items/modular/weapon/primary/staff/ornate.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Ornate Staff"), diff --git a/assets/common/items/modular/weapon/primary/staff/pole.ron b/assets/common/items/modular/weapon/primary/staff/pole.ron index f143b2618b..45fd89e1eb 100644 --- a/assets/common/items/modular/weapon/primary/staff/pole.ron +++ b/assets/common/items/modular/weapon/primary/staff/pole.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Pole"), diff --git a/assets/common/items/modular/weapon/primary/staff/rod.ron b/assets/common/items/modular/weapon/primary/staff/rod.ron index 4f1464945f..085ec02063 100644 --- a/assets/common/items/modular/weapon/primary/staff/rod.ron +++ b/assets/common/items/modular/weapon/primary/staff/rod.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Rod"), diff --git a/assets/common/items/modular/weapon/primary/staff/staff.ron b/assets/common/items/modular/weapon/primary/staff/staff.ron index 836f45513d..a11cfaeb7a 100644 --- a/assets/common/items/modular/weapon/primary/staff/staff.ron +++ b/assets/common/items/modular/weapon/primary/staff/staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, - block_strength: 0.0, ), hand_restriction: Some(Two), weapon_name: Universal("Staff"), diff --git a/assets/common/items/modular/weapon/primary/sword/greatsword.ron b/assets/common/items/modular/weapon/primary/sword/greatsword.ron index 4ffde88493..5f9144e2f1 100644 --- a/assets/common/items/modular/weapon/primary/sword/greatsword.ron +++ b/assets/common/items/modular/weapon/primary/sword/greatsword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.7, buff_strength: 1.0, - block_strength: 1.3, ), hand_restriction: Some(Two), weapon_name: Universal("Greatsword"), diff --git a/assets/common/items/modular/weapon/primary/sword/katana.ron b/assets/common/items/modular/weapon/primary/sword/katana.ron index 9d6ff532ef..8ed874dab7 100644 --- a/assets/common/items/modular/weapon/primary/sword/katana.ron +++ b/assets/common/items/modular/weapon/primary/sword/katana.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.3, buff_strength: 0.9, - block_strength: 0.7, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/sword/longsword.ron b/assets/common/items/modular/weapon/primary/sword/longsword.ron index defe33d149..e8ec39b07c 100644 --- a/assets/common/items/modular/weapon/primary/sword/longsword.ron +++ b/assets/common/items/modular/weapon/primary/sword/longsword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/sword/ornate.ron b/assets/common/items/modular/weapon/primary/sword/ornate.ron index 9ebb00afa2..f97feed8ce 100644 --- a/assets/common/items/modular/weapon/primary/sword/ornate.ron +++ b/assets/common/items/modular/weapon/primary/sword/ornate.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, - block_strength: 0.8, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/sword/sabre.ron b/assets/common/items/modular/weapon/primary/sword/sabre.ron index 0d5bab12ba..19a4f38ab6 100644 --- a/assets/common/items/modular/weapon/primary/sword/sabre.ron +++ b/assets/common/items/modular/weapon/primary/sword/sabre.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.1, buff_strength: 0.8, - block_strength: 1.1, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/sword/sawblade.ron b/assets/common/items/modular/weapon/primary/sword/sawblade.ron index c10d5845f9..0937b54237 100644 --- a/assets/common/items/modular/weapon/primary/sword/sawblade.ron +++ b/assets/common/items/modular/weapon/primary/sword/sawblade.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 0.8, buff_strength: 1.4, - block_strength: 0.9, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/sword/zweihander.ron b/assets/common/items/modular/weapon/primary/sword/zweihander.ron index 544d86be68..87323a2df6 100644 --- a/assets/common/items/modular/weapon/primary/sword/zweihander.ron +++ b/assets/common/items/modular/weapon/primary/sword/zweihander.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.3, energy_efficiency: 0.9, buff_strength: 0.8, - block_strength: 1.2, ), hand_restriction: Some(Two), weapon_name: Universal("Zweihander"), diff --git a/assets/common/items/modular/weapon/secondary/axe/long.ron b/assets/common/items/modular/weapon/secondary/axe/long.ron index 69e4a777ca..e3fdb6e641 100644 --- a/assets/common/items/modular/weapon/secondary/axe/long.ron +++ b/assets/common/items/modular/weapon/secondary/axe/long.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.1, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 1.2, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/axe/medium.ron b/assets/common/items/modular/weapon/secondary/axe/medium.ron index 587aa54fac..74fdd285cc 100644 --- a/assets/common/items/modular/weapon/secondary/axe/medium.ron +++ b/assets/common/items/modular/weapon/secondary/axe/medium.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.9, buff_strength: 1.0, - block_strength: 1.0, ), hand_restriction: None, ) diff --git a/assets/common/items/modular/weapon/secondary/axe/short.ron b/assets/common/items/modular/weapon/secondary/axe/short.ron index 4f858dc79f..68dbbb9a81 100644 --- a/assets/common/items/modular/weapon/secondary/axe/short.ron +++ b/assets/common/items/modular/weapon/secondary/axe/short.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 0.8, ), hand_restriction: Some(One), ) diff --git a/assets/common/items/modular/weapon/secondary/bow/long.ron b/assets/common/items/modular/weapon/secondary/bow/long.ron index d2acac9903..2b79a72cd3 100644 --- a/assets/common/items/modular/weapon/secondary/bow/long.ron +++ b/assets/common/items/modular/weapon/secondary/bow/long.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/bow/medium.ron b/assets/common/items/modular/weapon/secondary/bow/medium.ron index e1f79a16f0..57658a038a 100644 --- a/assets/common/items/modular/weapon/secondary/bow/medium.ron +++ b/assets/common/items/modular/weapon/secondary/bow/medium.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/bow/short.ron b/assets/common/items/modular/weapon/secondary/bow/short.ron index 2242475ef1..43b0016a82 100644 --- a/assets/common/items/modular/weapon/secondary/bow/short.ron +++ b/assets/common/items/modular/weapon/secondary/bow/short.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/hammer/long.ron b/assets/common/items/modular/weapon/secondary/hammer/long.ron index beacd1248f..217f9d930a 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/long.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/long.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 1.2, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/hammer/medium.ron b/assets/common/items/modular/weapon/secondary/hammer/medium.ron index e5888b6168..45f6f855db 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/medium.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/medium.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.9, buff_strength: 1.0, - block_strength: 1.0, ), hand_restriction: None, ) diff --git a/assets/common/items/modular/weapon/secondary/hammer/short.ron b/assets/common/items/modular/weapon/secondary/hammer/short.ron index 1f705dc43f..45ed7e8fa8 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/short.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/short.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 0.8, ), hand_restriction: Some(One), ) diff --git a/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron b/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron index a449e0dd25..14f77c137d 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/sceptre/light.ron b/assets/common/items/modular/weapon/secondary/sceptre/light.ron index 3fac34d6b8..b1b4f15f68 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/light.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/light.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/sceptre/medium.ron b/assets/common/items/modular/weapon/secondary/sceptre/medium.ron index 123f947193..a51767f3a4 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/medium.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/medium.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/staff/heavy.ron b/assets/common/items/modular/weapon/secondary/staff/heavy.ron index e2a254bd4e..afe5f86f3a 100644 --- a/assets/common/items/modular/weapon/secondary/staff/heavy.ron +++ b/assets/common/items/modular/weapon/secondary/staff/heavy.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/staff/light.ron b/assets/common/items/modular/weapon/secondary/staff/light.ron index 4beeb760f7..5a7bc5eb0a 100644 --- a/assets/common/items/modular/weapon/secondary/staff/light.ron +++ b/assets/common/items/modular/weapon/secondary/staff/light.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 0.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/staff/medium.ron b/assets/common/items/modular/weapon/secondary/staff/medium.ron index 5dfdbc9fb9..5c6f49e20c 100644 --- a/assets/common/items/modular/weapon/secondary/staff/medium.ron +++ b/assets/common/items/modular/weapon/secondary/staff/medium.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/sword/long.ron b/assets/common/items/modular/weapon/secondary/sword/long.ron index a47a51c6ca..071baf2263 100644 --- a/assets/common/items/modular/weapon/secondary/sword/long.ron +++ b/assets/common/items/modular/weapon/secondary/sword/long.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.1, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 1.2, ), hand_restriction: Some(Two), ) diff --git a/assets/common/items/modular/weapon/secondary/sword/medium.ron b/assets/common/items/modular/weapon/secondary/sword/medium.ron index 862311a99e..30f1d98537 100644 --- a/assets/common/items/modular/weapon/secondary/sword/medium.ron +++ b/assets/common/items/modular/weapon/secondary/sword/medium.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.2, ), hand_restriction: None, ) diff --git a/assets/common/items/modular/weapon/secondary/sword/short.ron b/assets/common/items/modular/weapon/secondary/sword/short.ron index 9cfba09ad7..6711a6d7af 100644 --- a/assets/common/items/modular/weapon/secondary/sword/short.ron +++ b/assets/common/items/modular/weapon/secondary/sword/short.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 1.2, ), hand_restriction: Some(One), ) diff --git a/assets/common/items/npc_weapons/axe/gigas_frost_axe.ron b/assets/common/items/npc_weapons/axe/gigas_frost_axe.ron index 6dcd3453f5..06479f69de 100644 --- a/assets/common/items/npc_weapons/axe/gigas_frost_axe.ron +++ b/assets/common/items/npc_weapons/axe/gigas_frost_axe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index f8917bc3f8..252048fa43 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron index 83d466106a..25972c3adc 100644 --- a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron +++ b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.8, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron index 2a17c74d11..f22a5c732f 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron index 40895ea0fa..3d6b697c74 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron index f415326e85..6cc065d475 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/boreal/bow.ron b/assets/common/items/npc_weapons/biped_small/boreal/bow.ron index ba04df3ea0..b0972a4a45 100644 --- a/assets/common/items/npc_weapons/biped_small/boreal/bow.ron +++ b/assets/common/items/npc_weapons/biped_small/boreal/bow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/biped_small/boreal/hammer.ron b/assets/common/items/npc_weapons/biped_small/boreal/hammer.ron index 8648da8507..f276cb6090 100644 --- a/assets/common/items/npc_weapons/biped_small/boreal/hammer.ron +++ b/assets/common/items/npc_weapons/biped_small/boreal/hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron index 7b469acc28..5d3e931f67 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/greentotem.ron b/assets/common/items/npc_weapons/biped_small/gnarling/greentotem.ron index a65e9a7d1f..a7f45afa12 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/greentotem.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/greentotem.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron b/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron index 31fb26acbb..80df7d474a 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron b/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron index 3ac0c804ba..0b83e2d846 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.5, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/redtotem.ron b/assets/common/items/npc_weapons/biped_small/gnarling/redtotem.ron index e15f0fd010..cdfe703bf0 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/redtotem.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/redtotem.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron b/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron index f3293d00ad..87962c4b77 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/whitetotem.ron b/assets/common/items/npc_weapons/biped_small/gnarling/whitetotem.ron index 7e093f97b9..e05ef5d599 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/whitetotem.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/whitetotem.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron index 1e61e23447..6c5b178d32 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron index 763b4991e1..2bb16ff326 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron index aa785f7b09..6994a1c999 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/mandragora.ron b/assets/common/items/npc_weapons/biped_small/mandragora.ron index e378abde66..3221aa12e7 100644 --- a/assets/common/items/npc_weapons/biped_small/mandragora.ron +++ b/assets/common/items/npc_weapons/biped_small/mandragora.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron index 94555240e0..f97f48fc8a 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 3.2, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron index 3e2b488e13..e383ece9ff 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron index 5d780af37e..ada61fae67 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 3.2, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron index f3bc33408c..22850de9b1 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron index 62ebcdfdf1..aa8ba23754 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron index 4e413170d1..eccfa36326 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron index 6ba8b5d276..428a2dd7d6 100644 --- a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron +++ b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 9b1ded7c24..c0dec88fee 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron index d82c033368..68145757f8 100644 --- a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 2.6, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 4128899075..3db8cdc22d 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index 3997042815..bc6ad15763 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index a4caac44f2..4c3da32f55 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron index 085b8ae106..3281a8733e 100644 --- a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index e19e6d6be0..f4acc68f9b 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index 68cc41a764..6663a32f6e 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index 14743d534e..4538a60927 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron index 8bb5ca0944..1f8d6aefff 100644 --- a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 09e45e150f..d01f54172c 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 042753e634..5049d03eeb 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 0609a18294..b3e82a8480 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/adlet_elder_sword.ron b/assets/common/items/npc_weapons/sword/adlet_elder_sword.ron index 931d8b91b3..fc24a48650 100644 --- a/assets/common/items/npc_weapons/sword/adlet_elder_sword.ron +++ b/assets/common/items/npc_weapons/sword/adlet_elder_sword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.7, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron index 930f9d0da6..87e1183979 100644 --- a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 3.8, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index c61dd8e847..c2e84d28f0 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/haniwa_general_sword.ron b/assets/common/items/npc_weapons/sword/haniwa_general_sword.ron index 2550b3621a..a677728338 100644 --- a/assets/common/items/npc_weapons/sword/haniwa_general_sword.ron +++ b/assets/common/items/npc_weapons/sword/haniwa_general_sword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.7, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/sword/pickaxe_velorite_sword.ron b/assets/common/items/npc_weapons/sword/pickaxe_velorite_sword.ron index 554d94eed3..8b18130bfc 100644 --- a/assets/common/items/npc_weapons/sword/pickaxe_velorite_sword.ron +++ b/assets/common/items/npc_weapons/sword/pickaxe_velorite_sword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, - block_strength: 2.2, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index c498c8bffc..0137729b8d 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.7, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/akhlut.ron b/assets/common/items/npc_weapons/unique/akhlut.ron index 59e6293952..497a15edf0 100644 --- a/assets/common/items/npc_weapons/unique/akhlut.ron +++ b/assets/common/items/npc_weapons/unique/akhlut.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/ancient_effigy_eyes.ron b/assets/common/items/npc_weapons/unique/ancient_effigy_eyes.ron index 924dad4eb4..0135b1fb2d 100644 --- a/assets/common/items/npc_weapons/unique/ancient_effigy_eyes.ron +++ b/assets/common/items/npc_weapons/unique/ancient_effigy_eyes.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/arthropods/antlion.ron b/assets/common/items/npc_weapons/unique/arthropods/antlion.ron index af99cd4b60..82323ad711 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/antlion.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/antlion.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron b/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron index 4cb2c56f4c..2d87b289a7 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron b/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron index f74235d2bc..2fed3acdbc 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.9, energy_efficiency: 1.0, buff_strength: 0.9, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron b/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron index be6c6d7200..1d8bfe04b6 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron b/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron index 675d96cff3..a40c89dcd1 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron b/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron index 1ce7bd899f..07ed8e17aa 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/unique/arthropods/weevil.ron b/assets/common/items/npc_weapons/unique/arthropods/weevil.ron index 071395bd19..04e4b99845 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/weevil.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/weevil.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index 0eaaa25756..fd0a6f646f 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargebasic.ron b/assets/common/items/npc_weapons/unique/birdlargebasic.ron index 37eed5f4a2..e94d48df75 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebasic.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron index bdef0a198d..8a5fabe2de 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/birdlargefire.ron b/assets/common/items/npc_weapons/unique/birdlargefire.ron index 2f0e13d81e..db3ee75dd4 100644 --- a/assets/common/items/npc_weapons/unique/birdlargefire.ron +++ b/assets/common/items/npc_weapons/unique/birdlargefire.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/unique/birdmediumbasic.ron b/assets/common/items/npc_weapons/unique/birdmediumbasic.ron index d26307b2f7..b5b487bf4c 100644 --- a/assets/common/items/npc_weapons/unique/birdmediumbasic.ron +++ b/assets/common/items/npc_weapons/unique/birdmediumbasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/bushly.ron b/assets/common/items/npc_weapons/unique/bushly.ron index 31f5e5b033..ed847558b1 100644 --- a/assets/common/items/npc_weapons/unique/bushly.ron +++ b/assets/common/items/npc_weapons/unique/bushly.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/cardinal.ron b/assets/common/items/npc_weapons/unique/cardinal.ron index 5191ed7811..2c0dfa6e45 100644 --- a/assets/common/items/npc_weapons/unique/cardinal.ron +++ b/assets/common/items/npc_weapons/unique/cardinal.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron index c69cd4ca4e..2497ccdc36 100644 --- a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/claysteed.ron b/assets/common/items/npc_weapons/unique/claysteed.ron index 9f7d47d6bd..8e8e3c0b79 100644 --- a/assets/common/items/npc_weapons/unique/claysteed.ron +++ b/assets/common/items/npc_weapons/unique/claysteed.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/clockwork.ron b/assets/common/items/npc_weapons/unique/clockwork.ron index 0df7a01d1c..a8c18ef05f 100644 --- a/assets/common/items/npc_weapons/unique/clockwork.ron +++ b/assets/common/items/npc_weapons/unique/clockwork.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/cloudwyvern.ron b/assets/common/items/npc_weapons/unique/cloudwyvern.ron index 47ee58d5f8..04c0c72f23 100644 --- a/assets/common/items/npc_weapons/unique/cloudwyvern.ron +++ b/assets/common/items/npc_weapons/unique/cloudwyvern.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/coral_golem_fist.ron b/assets/common/items/npc_weapons/unique/coral_golem_fist.ron index 804527dbc6..d457ab0de1 100644 --- a/assets/common/items/npc_weapons/unique/coral_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/coral_golem_fist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/crab_pincer.ron b/assets/common/items/npc_weapons/unique/crab_pincer.ron index b17647a839..160b75ef83 100644 --- a/assets/common/items/npc_weapons/unique/crab_pincer.ron +++ b/assets/common/items/npc_weapons/unique/crab_pincer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/dagon.ron b/assets/common/items/npc_weapons/unique/dagon.ron index 09aace09f0..8c53c43697 100644 --- a/assets/common/items/npc_weapons/unique/dagon.ron +++ b/assets/common/items/npc_weapons/unique/dagon.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/driggle.ron b/assets/common/items/npc_weapons/unique/driggle.ron index 539a21f3e2..9d07bc34f1 100644 --- a/assets/common/items/npc_weapons/unique/driggle.ron +++ b/assets/common/items/npc_weapons/unique/driggle.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/emberfly.ron b/assets/common/items/npc_weapons/unique/emberfly.ron index 918962f7db..6547384de4 100644 --- a/assets/common/items/npc_weapons/unique/emberfly.ron +++ b/assets/common/items/npc_weapons/unique/emberfly.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/fiery_tornado.ron b/assets/common/items/npc_weapons/unique/fiery_tornado.ron index 8eb186a7c8..15fc3fc4e7 100644 --- a/assets/common/items/npc_weapons/unique/fiery_tornado.ron +++ b/assets/common/items/npc_weapons/unique/fiery_tornado.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron b/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron index 7e9ae79ce6..1108077005 100644 --- a/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron +++ b/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/unique/flamethrower.ron b/assets/common/items/npc_weapons/unique/flamethrower.ron index 250ef77cde..e38b6f9ca6 100644 --- a/assets/common/items/npc_weapons/unique/flamethrower.ron +++ b/assets/common/items/npc_weapons/unique/flamethrower.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.5, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/flamewyvern.ron b/assets/common/items/npc_weapons/unique/flamewyvern.ron index 4940f0ced0..121805e4a4 100644 --- a/assets/common/items/npc_weapons/unique/flamewyvern.ron +++ b/assets/common/items/npc_weapons/unique/flamewyvern.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/frostfang.ron b/assets/common/items/npc_weapons/unique/frostfang.ron index cca9e54e26..fab3c9bc89 100644 --- a/assets/common/items/npc_weapons/unique/frostfang.ron +++ b/assets/common/items/npc_weapons/unique/frostfang.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/frostwyvern.ron b/assets/common/items/npc_weapons/unique/frostwyvern.ron index fc2bea3921..fb6ddc3d2f 100644 --- a/assets/common/items/npc_weapons/unique/frostwyvern.ron +++ b/assets/common/items/npc_weapons/unique/frostwyvern.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/gravewarden_fist.ron b/assets/common/items/npc_weapons/unique/gravewarden_fist.ron index 2d8d7aa01b..c60fe9a9a8 100644 --- a/assets/common/items/npc_weapons/unique/gravewarden_fist.ron +++ b/assets/common/items/npc_weapons/unique/gravewarden_fist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron index 62087476eb..69955ec568 100644 --- a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron +++ b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/hermit_alligator.ron b/assets/common/items/npc_weapons/unique/hermit_alligator.ron index cf5adac7c4..584d5f9085 100644 --- a/assets/common/items/npc_weapons/unique/hermit_alligator.ron +++ b/assets/common/items/npc_weapons/unique/hermit_alligator.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/husk.ron b/assets/common/items/npc_weapons/unique/husk.ron index e3cf79afe0..8de3d046f4 100644 --- a/assets/common/items/npc_weapons/unique/husk.ron +++ b/assets/common/items/npc_weapons/unique/husk.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/husk_brute.ron b/assets/common/items/npc_weapons/unique/husk_brute.ron index 736d27f0b4..7ed05973b8 100644 --- a/assets/common/items/npc_weapons/unique/husk_brute.ron +++ b/assets/common/items/npc_weapons/unique/husk_brute.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/irrwurz.ron b/assets/common/items/npc_weapons/unique/irrwurz.ron index eb776be3f3..147b965660 100644 --- a/assets/common/items/npc_weapons/unique/irrwurz.ron +++ b/assets/common/items/npc_weapons/unique/irrwurz.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/mossysnail.ron b/assets/common/items/npc_weapons/unique/mossysnail.ron index f273dec2a0..6980dad168 100644 --- a/assets/common/items/npc_weapons/unique/mossysnail.ron +++ b/assets/common/items/npc_weapons/unique/mossysnail.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/organ.ron b/assets/common/items/npc_weapons/unique/organ.ron index f42a351906..62526c081d 100644 --- a/assets/common/items/npc_weapons/unique/organ.ron +++ b/assets/common/items/npc_weapons/unique/organ.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 1ff21e74d9..881ddea4c9 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index 2aa42d77d3..7de891448f 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index a75f95eab3..58a3c95752 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index e7b5a8dded..bbe2642eea 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 8960f1f5a1..56f3cf3c8a 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron index 9b517df009..fa889c4b51 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 6af526f455..108125ec39 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index cc24b5e6d7..8d44003988 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index c1aecc7de2..37e25021f8 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/asp.ron b/assets/common/items/npc_weapons/unique/quadruped_low/asp.ron index 0e2c55c43b..f4cd75a79a 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_low/asp.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/asp.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron b/assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron index bf4a1759f8..2667a87168 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron b/assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron index acd8d87773..dfa8e2b49c 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron b/assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron index 62114a0943..b8eba04a58 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron b/assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron index 07f9f8a46d..dd16c913ab 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron b/assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron index a9406744c7..2013cf9e2b 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: High, diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron index eb074d3566..7c2df36d76 100644 --- a/assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 53bb558840..c77ee05d1c 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/npc_weapons/unique/roshwalr.ron b/assets/common/items/npc_weapons/unique/roshwalr.ron index 6431991b89..e1e57309e3 100644 --- a/assets/common/items/npc_weapons/unique/roshwalr.ron +++ b/assets/common/items/npc_weapons/unique/roshwalr.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron b/assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron index 7e0a725c3b..0cd96a85a5 100644 --- a/assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron +++ b/assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/npc_weapons/unique/seawyvern.ron b/assets/common/items/npc_weapons/unique/seawyvern.ron index c4d6564a5c..ac87d9227f 100644 --- a/assets/common/items/npc_weapons/unique/seawyvern.ron +++ b/assets/common/items/npc_weapons/unique/seawyvern.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron b/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron index f33b35903c..ddf9042336 100644 --- a/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron +++ b/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, 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 b2d47f42b9..1834a3b4d5 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 6f47d1ba00..7061742e10 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index f9abd21bc5..82ffcd4abc 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodcharge.ron b/assets/common/items/npc_weapons/unique/theropodcharge.ron index 43759c51d1..dd53e92c0e 100644 --- a/assets/common/items/npc_weapons/unique/theropodcharge.ron +++ b/assets/common/items/npc_weapons/unique/theropodcharge.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/theropodsmall.ron b/assets/common/items/npc_weapons/unique/theropodsmall.ron index 37317144ad..ee7cad2faf 100644 --- a/assets/common/items/npc_weapons/unique/theropodsmall.ron +++ b/assets/common/items/npc_weapons/unique/theropodsmall.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index 4aa138fbd7..ecba1a2ec0 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tidal_totem.ron b/assets/common/items/npc_weapons/unique/tidal_totem.ron index 6780c81a23..032b829c7b 100644 --- a/assets/common/items/npc_weapons/unique/tidal_totem.ron +++ b/assets/common/items/npc_weapons/unique/tidal_totem.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tornado.ron b/assets/common/items/npc_weapons/unique/tornado.ron index fe9feec51e..1d3c97eafe 100644 --- a/assets/common/items/npc_weapons/unique/tornado.ron +++ b/assets/common/items/npc_weapons/unique/tornado.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/treantsapling.ron b/assets/common/items/npc_weapons/unique/treantsapling.ron index e809e265fa..9accfd6096 100644 --- a/assets/common/items/npc_weapons/unique/treantsapling.ron +++ b/assets/common/items/npc_weapons/unique/treantsapling.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index cb42bf4855..02abe1edb5 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/tursus_claws.ron b/assets/common/items/npc_weapons/unique/tursus_claws.ron index f9eb458074..c5798669f4 100644 --- a/assets/common/items/npc_weapons/unique/tursus_claws.ron +++ b/assets/common/items/npc_weapons/unique/tursus_claws.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/wealdwyvern.ron b/assets/common/items/npc_weapons/unique/wealdwyvern.ron index d910af3a0d..c95badbce4 100644 --- a/assets/common/items/npc_weapons/unique/wealdwyvern.ron +++ b/assets/common/items/npc_weapons/unique/wealdwyvern.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index dd769cab05..753242d4e0 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/npc_weapons/unique/wood_golem_fist.ron b/assets/common/items/npc_weapons/unique/wood_golem_fist.ron index 843ab92f7b..198143e5cf 100644 --- a/assets/common/items/npc_weapons/unique/wood_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/wood_golem_fist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/tool/craftsman_hammer.ron b/assets/common/items/tool/craftsman_hammer.ron index 627982a810..609eeb9434 100644 --- a/assets/common/items/tool/craftsman_hammer.ron +++ b/assets/common/items/tool/craftsman_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.4, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/double_bass.ron b/assets/common/items/tool/instruments/double_bass.ron index 2b6a8cac9c..dad0a27100 100644 --- a/assets/common/items/tool/instruments/double_bass.ron +++ b/assets/common/items/tool/instruments/double_bass.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/flute.ron b/assets/common/items/tool/instruments/flute.ron index dd04b0647d..8bc58532f1 100644 --- a/assets/common/items/tool/instruments/flute.ron +++ b/assets/common/items/tool/instruments/flute.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/glass_flute.ron b/assets/common/items/tool/instruments/glass_flute.ron index 6f7cc347b5..9eaefed1c8 100644 --- a/assets/common/items/tool/instruments/glass_flute.ron +++ b/assets/common/items/tool/instruments/glass_flute.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/tool/instruments/guitar.ron b/assets/common/items/tool/instruments/guitar.ron index 1246233b8c..a51eecaf6a 100644 --- a/assets/common/items/tool/instruments/guitar.ron +++ b/assets/common/items/tool/instruments/guitar.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/guitar_dark.ron b/assets/common/items/tool/instruments/guitar_dark.ron index a4bfd09009..e0a35a2f47 100644 --- a/assets/common/items/tool/instruments/guitar_dark.ron +++ b/assets/common/items/tool/instruments/guitar_dark.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/tool/instruments/icy_talharpa.ron b/assets/common/items/tool/instruments/icy_talharpa.ron index b34189f114..ba6c01a092 100644 --- a/assets/common/items/tool/instruments/icy_talharpa.ron +++ b/assets/common/items/tool/instruments/icy_talharpa.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/tool/instruments/kalimba.ron b/assets/common/items/tool/instruments/kalimba.ron index 5e9e41d5f4..29f66061bf 100644 --- a/assets/common/items/tool/instruments/kalimba.ron +++ b/assets/common/items/tool/instruments/kalimba.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/lute.ron b/assets/common/items/tool/instruments/lute.ron index 7d5a54ef39..9de216cbbc 100644 --- a/assets/common/items/tool/instruments/lute.ron +++ b/assets/common/items/tool/instruments/lute.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/lyre.ron b/assets/common/items/tool/instruments/lyre.ron index e91311a251..c9cc7a14f7 100644 --- a/assets/common/items/tool/instruments/lyre.ron +++ b/assets/common/items/tool/instruments/lyre.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/melodica.ron b/assets/common/items/tool/instruments/melodica.ron index 5b71b5c6eb..84cf081475 100644 --- a/assets/common/items/tool/instruments/melodica.ron +++ b/assets/common/items/tool/instruments/melodica.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/shamisen.ron b/assets/common/items/tool/instruments/shamisen.ron index fd7e613884..05f2c42366 100644 --- a/assets/common/items/tool/instruments/shamisen.ron +++ b/assets/common/items/tool/instruments/shamisen.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/tool/instruments/sitar.ron b/assets/common/items/tool/instruments/sitar.ron index dacf7ade2a..338a6c7889 100644 --- a/assets/common/items/tool/instruments/sitar.ron +++ b/assets/common/items/tool/instruments/sitar.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/steeltonguedrum.ron b/assets/common/items/tool/instruments/steeltonguedrum.ron index f9e30a27b5..2fd5bfd5c6 100644 --- a/assets/common/items/tool/instruments/steeltonguedrum.ron +++ b/assets/common/items/tool/instruments/steeltonguedrum.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/tool/instruments/washboard.ron b/assets/common/items/tool/instruments/washboard.ron index dbfb1a713e..1607cdc7e8 100644 --- a/assets/common/items/tool/instruments/washboard.ron +++ b/assets/common/items/tool/instruments/washboard.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/tool/instruments/wildskin_drum.ron b/assets/common/items/tool/instruments/wildskin_drum.ron index 40fe1b32bc..5418b5c9a8 100644 --- a/assets/common/items/tool/instruments/wildskin_drum.ron +++ b/assets/common/items/tool/instruments/wildskin_drum.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/tool/pickaxe_steel.ron b/assets/common/items/tool/pickaxe_steel.ron index f2c869150a..ce027ff25f 100644 --- a/assets/common/items/tool/pickaxe_steel.ron +++ b/assets/common/items/tool/pickaxe_steel.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/tool/pickaxe_stone.ron b/assets/common/items/tool/pickaxe_stone.ron index 03c2f75fa1..f80d70a039 100644 --- a/assets/common/items/tool/pickaxe_stone.ron +++ b/assets/common/items/tool/pickaxe_stone.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/tool/pickaxe_velorite.ron b/assets/common/items/tool/pickaxe_velorite.ron index e9c27d8e4a..303f2d2fca 100644 --- a/assets/common/items/tool/pickaxe_velorite.ron +++ b/assets/common/items/tool/pickaxe_velorite.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index f3f363de9b..c6817414ba 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.3, buff_strength: 1.2, - block_strength: 1.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index b64f84dc4f..d7a72fddfd 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, - block_strength: 1.0, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index e06a39aeed..7bb1665639 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 90f718a403..9f82f8588f 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index 9dedf1616d..1f8d3dee6a 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 0.9, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index f53492f291..1f244104fa 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 7dcfaf98ba..2a5b0f7cb3 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: High, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index e6dbc7a9bf..3cf353373b 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 5a2038db7e..031bf7b1a0 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Moderate, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 06d0b61718..104aadc3cb 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/burnt_drumstick.ron b/assets/common/items/weapons/hammer/burnt_drumstick.ron index b8aca30884..cd58f31881 100644 --- a/assets/common/items/weapons/hammer/burnt_drumstick.ron +++ b/assets/common/items/weapons/hammer/burnt_drumstick.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.6, ), )), quality: Low, 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 897c7dffd2..8676ced138 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.9, ), )), quality: Epic, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index cac2bd10ff..f074fa3ba9 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.7, ), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 734ff3af53..dbf8e866a3 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.7, ), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index b453bfdeca..32dfac09aa 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 3.2, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index f6d6932008..55e89008ed 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.95, energy_efficiency: 1.0, buff_strength: 0.9, - block_strength: 0.6, ), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/amethyst.ron b/assets/common/items/weapons/sceptre/amethyst.ron index 0d4078abe9..c3132e5d81 100644 --- a/assets/common/items/weapons/sceptre/amethyst.ron +++ b/assets/common/items/weapons/sceptre/amethyst.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/belzeshrub.ron b/assets/common/items/weapons/sceptre/belzeshrub.ron index 0eaf6dacae..44c19f5191 100644 --- a/assets/common/items/weapons/sceptre/belzeshrub.ron +++ b/assets/common/items/weapons/sceptre/belzeshrub.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Artifact, diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron index ed43aaab10..17c6a767e3 100644 --- a/assets/common/items/weapons/sceptre/caduceus.ron +++ b/assets/common/items/weapons/sceptre/caduceus.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index fa544af57e..9e8d651b7f 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 86a9b5d584..b3ae7ff9cf 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index aa56e3cd83..f8d9f3a4ba 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.95, energy_efficiency: 1.0, buff_strength: 0.9, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index 7e0454771f..414ce995cc 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -8,11 +8,10 @@ ItemDef( equip_time_secs: 0.4, power: 1.0, effect_power: 1.0, - speed: 0.8, + speed: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.5, ), )), quality: Common, diff --git a/assets/common/items/weapons/shield/starter_shield.ron b/assets/common/items/weapons/shield/starter_shield.ron index 9e600c9a8c..43d4f9ca02 100644 --- a/assets/common/items/weapons/shield/starter_shield.ron +++ b/assets/common/items/weapons/shield/starter_shield.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.2, ), )), quality: Common, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 3c1f0cd808..ca70a427c1 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Epic, diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron index b35759fb3d..a7fdb45803 100644 --- a/assets/common/items/weapons/staff/laevateinn.ron +++ b/assets/common/items/weapons/staff/laevateinn.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index 6c9fab0372..7ef8188d6f 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index e818eda937..32782cbec4 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -12,7 +12,6 @@ ItemDef( range: 0.95, energy_efficiency: 1.0, buff_strength: 0.95, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 15054f00bf..3f2c0f2e4f 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, - block_strength: 3.2, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index e94a95377e..6d872b4466 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.3, buff_strength: 1.2, - block_strength: 1.9, ), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index ed96ee5b3d..b63bcb0416 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.9, ), )), quality: High, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index 0ba8f959a0..4a5e0bfe8c 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 2.2, ), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index fe2eb035f3..23bda7b705 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 0.9, buff_strength: 1.1, - block_strength: 0.8, ), )), quality: Low, diff --git a/assets/common/items/weapons/sword_1h/starter.ron b/assets/common/items/weapons/sword_1h/starter.ron index c88304975b..0970886c6d 100644 --- a/assets/common/items/weapons/sword_1h/starter.ron +++ b/assets/common/items/weapons/sword_1h/starter.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.1, buff_strength: 0.9, - block_strength: 0.6, ), )), quality: Low, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index 8daf391593..d8ed48f70f 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index cd913d9d08..b3fc0f7175 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/weapons/tool/golf_club.ron b/assets/common/items/weapons/tool/golf_club.ron index ed955f283a..59a0ae0c1e 100644 --- a/assets/common/items/weapons/tool/golf_club.ron +++ b/assets/common/items/weapons/tool/golf_club.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Low, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 6858ef6c59..c70fcdf0d7 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index aec03c98d5..4756a5a3a9 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index beffaef506..08629a7d11 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index 1e5ac613e1..4f9e23d777 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index e8ad1025cf..19cb7556dc 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Moderate, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 38e1ef1ac2..efeaaf0201 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -12,7 +12,6 @@ ItemDef( range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), )), quality: Common, diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 67c7c51bb2..fe750b4074 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -9,9 +9,8 @@ speed: 1.0, range: 1.0, energy_efficiency: 1.0, - buff_strength: 0.75, - block_strength: 1.0, - ), + buff_strength: 1.0, + ), "common.items.mineral.ingot.iron": ( equip_time_secs: 1.0, power: 1.0, @@ -20,7 +19,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, ), "common.items.mineral.ingot.steel": ( equip_time_secs: 1.0, @@ -30,7 +28,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.25, ), "common.items.mineral.ingot.cobalt": ( equip_time_secs: 1.0, @@ -40,7 +37,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.5, ), "common.items.mineral.ingot.bloodsteel": ( equip_time_secs: 1.0, @@ -50,7 +46,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.75, ), "common.items.mineral.ingot.orichalcum": ( equip_time_secs: 1.0, @@ -60,7 +55,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 2.0, ), // Woods "common.items.log.wood": ( @@ -71,7 +65,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), "common.items.log.bamboo": ( equip_time_secs: 1.0, @@ -81,7 +74,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), "common.items.log.hardwood": ( equip_time_secs: 1.0, @@ -91,7 +83,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), "common.items.log.ironwood": ( equip_time_secs: 1.0, @@ -101,7 +92,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), "common.items.log.frostwood": ( equip_time_secs: 1.0, @@ -111,7 +101,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), "common.items.log.eldwood": ( equip_time_secs: 1.0, @@ -121,7 +110,6 @@ range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, ), }, armor_stats: { diff --git a/assets/voxygen/i18n/en/common.ftl b/assets/voxygen/i18n/en/common.ftl index 0d7b5cc61d..f2ef0f7350 100644 --- a/assets/voxygen/i18n/en/common.ftl +++ b/assets/voxygen/i18n/en/common.ftl @@ -97,7 +97,6 @@ common-stats-effect-power = Effect Power common-stats-range = Range common-stats-energy_efficiency = Energy Efficiency common-stats-buff_strength = Buff/Debuff Strength -common-stats-block_strength = Block Strength common-stats-precision_mult = Crit Mult common-stats-armor = Armor common-stats-poise_res = Stun Res diff --git a/common/src/combat.rs b/common/src/combat.rs index 798a805565..03b4d15f96 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -218,7 +218,7 @@ impl Attack { time, }, }); - damage.value.min(block_strength) + damage.value.min(final_block_strength) } else { 0.0 } @@ -1309,7 +1309,6 @@ fn weapon_rating(item: &T, _msm: &MaterialStatManifest) -> f32 { const EQUIP_TIME_WEIGHT: f32 = 0.0; const ENERGY_EFFICIENCY_WEIGHT: f32 = 1.5; const BUFF_STRENGTH_WEIGHT: f32 = 1.5; - const BLOCK_STRENGTH_WEIGHT: f32 = 0.0; let rating = if let ItemKind::Tool(tool) = &*item.kind() { let stats = tool.stats(item.stats_durability_multiplier()); @@ -1325,7 +1324,6 @@ fn weapon_rating(item: &T, _msm: &MaterialStatManifest) -> f32 { let equip_time_rating = 0.5 - stats.equip_time_secs; let energy_efficiency_rating = stats.energy_efficiency - 1.0; let buff_strength_rating = stats.buff_strength - 1.0; - let block_strength_rating = stats.block_strength; power_rating * POWER_WEIGHT + speed_rating * SPEED_WEIGHT @@ -1334,7 +1332,6 @@ fn weapon_rating(item: &T, _msm: &MaterialStatManifest) -> f32 { + equip_time_rating * EQUIP_TIME_WEIGHT + energy_efficiency_rating * ENERGY_EFFICIENCY_WEIGHT + buff_strength_rating * BUFF_STRENGTH_WEIGHT - + block_strength_rating * BLOCK_STRENGTH_WEIGHT } else { 0.0 }; @@ -1580,11 +1577,7 @@ pub fn block_strength(inventory: &Inventory, char_state: &CharacterState) -> f32 inventory .equipped(equip_slot) .map(|item| match &*item.kind() { - ItemKind::Tool(tool) => { - tool.stats(item.stats_durability_multiplier()) - .block_strength - * 10.0 - }, + ItemKind::Tool(tool) => tool.stats(item.stats_durability_multiplier()).power * 10.0, _ => 0.0, }) .map_or(0.0, |weapon_block_strength| match char_state { diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 8bc2f95a8f..744192f56a 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -136,7 +136,6 @@ pub struct Stats { pub range: f32, pub energy_efficiency: f32, pub buff_strength: f32, - pub block_strength: f32, } impl Stats { @@ -149,7 +148,6 @@ impl Stats { range: 0.0, energy_efficiency: 0.0, buff_strength: 0.0, - block_strength: 0.0, } } @@ -162,7 +160,6 @@ impl Stats { range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 1.0, } } @@ -188,7 +185,6 @@ impl Stats { range: self.range * less_scaled, energy_efficiency: self.energy_efficiency * less_scaled, buff_strength: self.buff_strength * dur_mult.0, - block_strength: self.block_strength * dur_mult.0, } } } @@ -211,7 +207,6 @@ impl Add for Stats { range: self.range + other.range, energy_efficiency: self.energy_efficiency + other.energy_efficiency, buff_strength: self.buff_strength + other.buff_strength, - block_strength: self.block_strength + other.block_strength, } } } @@ -232,7 +227,6 @@ impl Sub for Stats { range: self.range - other.range, energy_efficiency: self.energy_efficiency - other.energy_efficiency, buff_strength: self.buff_strength - other.buff_strength, - block_strength: self.block_strength - other.block_strength, } } } @@ -249,7 +243,6 @@ impl Mul for Stats { range: self.range * other.range, energy_efficiency: self.energy_efficiency * other.energy_efficiency, buff_strength: self.buff_strength * other.buff_strength, - block_strength: self.block_strength * other.block_strength, } } } @@ -270,7 +263,6 @@ impl Div for Stats { range: self.range / scalar, energy_efficiency: self.energy_efficiency / scalar, buff_strength: self.buff_strength / scalar, - block_strength: self.block_strength / scalar, } } } @@ -306,7 +298,6 @@ impl Tool { range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, - block_strength: 0.0, }, } } diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index e7158d453e..54d981003f 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -1145,7 +1145,7 @@ impl<'a> Widget for Diary<'a> { events }, DiarySection::Stats => { - const STATS: [&str; 13] = [ + const STATS: [&str; 12] = [ "Hitpoints", "Energy", "Poise", @@ -1158,7 +1158,6 @@ impl<'a> Widget for Diary<'a> { "Weapon Power", "Weapon Speed", "Weapon Effect Power", - "Weapon Block Strength", ]; // Background Art @@ -1303,19 +1302,6 @@ impl<'a> Widget for Diary<'a> { }, (None, None) => String::new(), }, - "Weapon Block Strength" => match (main_weap_stats, off_weap_stats) { - (Some(m_stats), Some(o_stats)) => { - format!( - "{} {}", - m_stats.block_strength * 10.0, - o_stats.block_strength * 10.0 - ) - }, - (Some(stats), None) | (None, Some(stats)) => { - format!("{}", stats.block_strength * 10.0) - }, - (None, None) => String::new(), - }, unknown => unreachable!("{}", unknown), }; diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 149d76bf92..761321a50b 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -138,12 +138,12 @@ pub fn stats_count(item: &dyn ItemDesc, msm: &MaterialStatManifest) -> usize { + armor_stats.protection.is_some() as usize + (item.num_slots() > 0) as usize }, - ItemKind::Tool(_) => 7, + ItemKind::Tool(_) => 6, ItemKind::Consumable { effects, .. } => match effects { Effects::Any(_) | Effects::One(_) => 1, Effects::All(effects) => effects.len(), }, - ItemKind::ModularComponent { .. } => 7, + ItemKind::ModularComponent { .. } => 6, _ => 0, }; if item.has_durability() { diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index 9686d6078b..ac640d3553 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -682,15 +682,6 @@ impl<'a> Widget for ItemTooltip<'a> { 5, ); - // Block Strength - stat_text( - format!( - "{} : {:.1}", - i18n.get_msg("common-stats-block_strength"), - stats.block_strength * 10.0 - ), - 6, - ); if item.has_durability() { let durability = Item::MAX_DURABILITY - item.durability_lost().unwrap_or(0); stat_text( @@ -700,7 +691,7 @@ impl<'a> Widget for ItemTooltip<'a> { durability, Item::MAX_DURABILITY ), - 7, + 6, ) } @@ -728,10 +719,6 @@ impl<'a> Widget for ItemTooltip<'a> { tool_stats.buff_strength, equipped_tool_stats.buff_strength, ); - let block_strength_diff = util::comparison( - tool_stats.block_strength, - equipped_tool_stats.block_strength, - ); let tool_durability = util::item_durability(item).unwrap_or(Item::MAX_DURABILITY); @@ -787,21 +774,13 @@ impl<'a> Widget for ItemTooltip<'a> { ); diff_text(text, buff_strength_diff.1, 5) } - if diff.block_strength.abs() > f32::EPSILON { - let text = format!( - "{} {:.1}", - &block_strength_diff.0, - &diff.block_strength * 10.0 - ); - diff_text(text, block_strength_diff.1, 6) - } if tool_durability != equipped_durability && item.has_durability() { let text = format!( "{} {}", &durability_diff.0, tool_durability as i32 - equipped_durability as i32 ); - diff_text(text, durability_diff.1, 7) + diff_text(text, durability_diff.1, 6) } } } @@ -1211,28 +1190,6 @@ impl<'a> Widget for ItemTooltip<'a> { .color(text_color) .down_from(state.ids.stats[4], V_PAD_STATS) .set(state.ids.stats[5], ui); - - // Block Strength - let block_str_text = if is_primary { - format!( - "{} : {:.1}", - i18n.get_msg("common-stats-block_strength"), - stats.block_strength * 10.0 - ) - } else { - format!( - "{} : {:.2}", - i18n.get_msg("common-stats-block_strength"), - stats.block_strength - ) - }; - widget::Text::new(&block_str_text) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(text_color) - .down_from(state.ids.stats[5], V_PAD_STATS) - .set(state.ids.stats[6], ui); } }, _ => (),