From 62464dbe111ef8ab2555765d7848d6290bbc5645 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 21 Oct 2023 01:37:40 -0400 Subject: [PATCH 01/10] Removed crit chance 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/pickaxe_velorite_sword.ron | 1 - .../items/npc_weapons/sword/saurok_sword.ron | 1 - .../items/npc_weapons/unique/akhlut.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/leafbeetle.ron | 1 - .../unique/arthropods/mosscrawler.ron | 1 - .../unique/arthropods/tarantula.ron | 1 - .../npc_weapons/unique/arthropods/weevil.ron | 1 - .../common/items/npc_weapons/unique/asp.ron | 1 - .../items/npc_weapons/unique/basilisk.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/clockwork.ron | 1 - .../items/npc_weapons/unique/cloudwyvern.ron | 1 - .../npc_weapons/unique/coral_golem_fist.ron | 1 - .../common/items/npc_weapons/unique/dagon.ron | 1 - .../items/npc_weapons/unique/deadwood.ron | 1 - .../items/npc_weapons/unique/driggle.ron | 1 - .../items/npc_weapons/unique/emberfly.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/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/icedrake.ron | 1 - .../items/npc_weapons/unique/irrwurz.ron | 1 - .../items/npc_weapons/unique/maneater.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 - .../npc_weapons/unique/quadlowbreathe.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/quadmedhoof.ron | 1 - .../items/npc_weapons/unique/quadmedjump.ron | 1 - .../items/npc_weapons/unique/quadmedquick.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 - .../common/items/tool/instruments/sitar.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 | 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 | 12 ----- common/src/bin/csv_export/main.rs | 3 -- common/src/bin/csv_import/main.rs | 10 ---- common/src/combat.rs | 17 +----- common/src/comp/inventory/item/tool.rs | 9 ---- common/src/comp/melee.rs | 14 ++--- common/src/comp/projectile.rs | 39 ++++++-------- common/src/states/basic_beam.rs | 9 ++-- common/src/states/basic_melee.rs | 5 +- common/src/states/basic_ranged.rs | 6 +-- common/src/states/charged_melee.rs | 10 ++-- common/src/states/charged_ranged.rs | 6 +-- common/src/states/combo_melee.rs | 7 ++- common/src/states/combo_melee2.rs | 5 +- common/src/states/dash_melee.rs | 11 ++-- common/src/states/dive_melee.rs | 5 +- common/src/states/finisher_melee.rs | 6 +-- common/src/states/leap_melee.rs | 6 +-- common/src/states/leap_shockwave.rs | 9 ++-- common/src/states/rapid_melee.rs | 5 +- common/src/states/repeater_ranged.rs | 6 +-- common/src/states/riposte_melee.rs | 5 +- common/src/states/shockwave.rs | 9 ++-- common/src/states/spin_melee.rs | 5 +- common/src/states/utils.rs | 27 ---------- server/src/wiring.rs | 1 - voxygen/src/hud/diary.rs | 17 +----- voxygen/src/hud/util.rs | 2 +- voxygen/src/ui/widgets/item_tooltip.rs | 52 ++----------------- 266 files changed, 87 insertions(+), 468 deletions(-) diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron index 4774894bf7..6fcb3629fc 100644 --- a/assets/common/items/debug/admin_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index b19b586479..08627b6699 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -9,7 +9,6 @@ ItemDef( power: 999.9, effect_power: 999.9, speed: 1.0, - crit_chance: 0.5, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/debug/velorite_bow_debug.ron b/assets/common/items/debug/velorite_bow_debug.ron index 3d3a04a7b1..35ebb99465 100644 --- a/assets/common/items/debug/velorite_bow_debug.ron +++ b/assets/common/items/debug/velorite_bow_debug.ron @@ -9,7 +9,6 @@ ItemDef( power: 999.9, effect_power: 999.9, speed: 100.0, - crit_chance: 0.5, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/primary/axe/axe.ron b/assets/common/items/modular/weapon/primary/axe/axe.ron index cb2c05f4c9..01f4d07563 100644 --- a/assets/common/items/modular/weapon/primary/axe/axe.ron +++ b/assets/common/items/modular/weapon/primary/axe/axe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/primary/axe/battleaxe.ron b/assets/common/items/modular/weapon/primary/axe/battleaxe.ron index 5157db01ac..9c17ffe023 100644 --- a/assets/common/items/modular/weapon/primary/axe/battleaxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/battleaxe.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 1.2, speed: 1.3, - crit_chance: 0.06, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, diff --git a/assets/common/items/modular/weapon/primary/axe/greataxe.ron b/assets/common/items/modular/weapon/primary/axe/greataxe.ron index c6770b24d0..b3778b17e4 100644 --- a/assets/common/items/modular/weapon/primary/axe/greataxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/greataxe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.1, effect_power: 1.4, speed: 0.8, - crit_chance: 0.08, range: 0.9, energy_efficiency: 0.9, buff_strength: 1.2, diff --git a/assets/common/items/modular/weapon/primary/axe/jagged.ron b/assets/common/items/modular/weapon/primary/axe/jagged.ron index 8cfc832d23..badf9eaaf5 100644 --- a/assets/common/items/modular/weapon/primary/axe/jagged.ron +++ b/assets/common/items/modular/weapon/primary/axe/jagged.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.8, speed: 1.2, - crit_chance: 0.12, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.4, diff --git a/assets/common/items/modular/weapon/primary/axe/labrys.ron b/assets/common/items/modular/weapon/primary/axe/labrys.ron index cddea9ef05..54df037d9c 100644 --- a/assets/common/items/modular/weapon/primary/axe/labrys.ron +++ b/assets/common/items/modular/weapon/primary/axe/labrys.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.5, effect_power: 1.2, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 0.9, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/axe/ornate.ron b/assets/common/items/modular/weapon/primary/axe/ornate.ron index b3b3431ce8..217e3f4367 100644 --- a/assets/common/items/modular/weapon/primary/axe/ornate.ron +++ b/assets/common/items/modular/weapon/primary/axe/ornate.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.7, effect_power: 0.8, speed: 1.1, - crit_chance: 0.14, range: 1.1, energy_efficiency: 1.3, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/primary/axe/poleaxe.ron b/assets/common/items/modular/weapon/primary/axe/poleaxe.ron index 5fd7571313..6304d62e91 100644 --- a/assets/common/items/modular/weapon/primary/axe/poleaxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/poleaxe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.1, effect_power: 0.8, speed: 0.9, - crit_chance: 0.16, range: 1.3, energy_efficiency: 0.9, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/primary/bow/bow.ron b/assets/common/items/modular/weapon/primary/bow/bow.ron index 0b690fe3fc..78812df86f 100644 --- a/assets/common/items/modular/weapon/primary/bow/bow.ron +++ b/assets/common/items/modular/weapon/primary/bow/bow.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.9, speed: 0.9, - crit_chance: 0.09, range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/primary/bow/composite.ron b/assets/common/items/modular/weapon/primary/bow/composite.ron index 15674f6374..4ef1e84c0f 100644 --- a/assets/common/items/modular/weapon/primary/bow/composite.ron +++ b/assets/common/items/modular/weapon/primary/bow/composite.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 0.8, speed: 0.7, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, diff --git a/assets/common/items/modular/weapon/primary/bow/greatbow.ron b/assets/common/items/modular/weapon/primary/bow/greatbow.ron index cee7a0e02f..9406679565 100644 --- a/assets/common/items/modular/weapon/primary/bow/greatbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/greatbow.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 1.5, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/bow/longbow.ron b/assets/common/items/modular/weapon/primary/bow/longbow.ron index a57470b5d6..d74b476725 100644 --- a/assets/common/items/modular/weapon/primary/bow/longbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/longbow.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.2, range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/bow/ornate.ron b/assets/common/items/modular/weapon/primary/bow/ornate.ron index 7c94ce8c13..89718b7dfc 100644 --- a/assets/common/items/modular/weapon/primary/bow/ornate.ron +++ b/assets/common/items/modular/weapon/primary/bow/ornate.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/bow/shortbow.ron b/assets/common/items/modular/weapon/primary/bow/shortbow.ron index 05a2bc50d2..5c1ba7acdb 100644 --- a/assets/common/items/modular/weapon/primary/bow/shortbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/shortbow.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 1.25, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/bow/warbow.ron b/assets/common/items/modular/weapon/primary/bow/warbow.ron index 78364dde54..5ea1d68056 100644 --- a/assets/common/items/modular/weapon/primary/bow/warbow.ron +++ b/assets/common/items/modular/weapon/primary/bow/warbow.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 0.8, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/hammer/greathammer.ron b/assets/common/items/modular/weapon/primary/hammer/greathammer.ron index f61ada9a30..287a018175 100644 --- a/assets/common/items/modular/weapon/primary/hammer/greathammer.ron +++ b/assets/common/items/modular/weapon/primary/hammer/greathammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 1.5, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/hammer/greatmace.ron b/assets/common/items/modular/weapon/primary/hammer/greatmace.ron index 77d9cdb6e1..992a776e10 100644 --- a/assets/common/items/modular/weapon/primary/hammer/greatmace.ron +++ b/assets/common/items/modular/weapon/primary/hammer/greatmace.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 0.8, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/hammer/hammer.ron b/assets/common/items/modular/weapon/primary/hammer/hammer.ron index adf7a5b138..1326dc34d3 100644 --- a/assets/common/items/modular/weapon/primary/hammer/hammer.ron +++ b/assets/common/items/modular/weapon/primary/hammer/hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.9, speed: 0.9, - crit_chance: 0.09, range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/primary/hammer/maul.ron b/assets/common/items/modular/weapon/primary/hammer/maul.ron index 7aa9264a81..b1730407f1 100644 --- a/assets/common/items/modular/weapon/primary/hammer/maul.ron +++ b/assets/common/items/modular/weapon/primary/hammer/maul.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.2, range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/hammer/ornate.ron b/assets/common/items/modular/weapon/primary/hammer/ornate.ron index eaf1f366ec..55ce87d7c2 100644 --- a/assets/common/items/modular/weapon/primary/hammer/ornate.ron +++ b/assets/common/items/modular/weapon/primary/hammer/ornate.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron b/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron index 2eb0cea006..f3d1831e5f 100644 --- a/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron +++ b/assets/common/items/modular/weapon/primary/hammer/spikedmace.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 0.8, speed: 0.7, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, diff --git a/assets/common/items/modular/weapon/primary/hammer/warhammer.ron b/assets/common/items/modular/weapon/primary/hammer/warhammer.ron index 096c5c2301..14fc03241e 100644 --- a/assets/common/items/modular/weapon/primary/hammer/warhammer.ron +++ b/assets/common/items/modular/weapon/primary/hammer/warhammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 1.25, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sceptre/arbor.ron b/assets/common/items/modular/weapon/primary/sceptre/arbor.ron index e3c8a97c6d..23e4aee9c3 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/arbor.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/arbor.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.2, range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sceptre/cane.ron b/assets/common/items/modular/weapon/primary/sceptre/cane.ron index 7e742ca44a..f6a2efbd37 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/cane.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/cane.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 0.8, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sceptre/crook.ron b/assets/common/items/modular/weapon/primary/sceptre/crook.ron index 7cb2465cbe..e5077374f0 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/crook.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/crook.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 0.8, speed: 0.7, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, diff --git a/assets/common/items/modular/weapon/primary/sceptre/crozier.ron b/assets/common/items/modular/weapon/primary/sceptre/crozier.ron index 361f2541cd..478af3264c 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/crozier.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/crozier.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 1.25, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron b/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron index 8148d992ad..f22d5892a5 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 1.5, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sceptre/ornate.ron b/assets/common/items/modular/weapon/primary/sceptre/ornate.ron index 03b2957a0e..fa13409059 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/ornate.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/ornate.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron b/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron index 4a2a1d0a39..5e76f663ad 100644 --- a/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron +++ b/assets/common/items/modular/weapon/primary/sceptre/sceptre.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.9, speed: 0.9, - crit_chance: 0.09, range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/primary/staff/brand.ron b/assets/common/items/modular/weapon/primary/staff/brand.ron index fd46199e98..501e2359ae 100644 --- a/assets/common/items/modular/weapon/primary/staff/brand.ron +++ b/assets/common/items/modular/weapon/primary/staff/brand.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 1.25, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/staff/grandstaff.ron b/assets/common/items/modular/weapon/primary/staff/grandstaff.ron index 0fe90b72a9..608f1c3556 100644 --- a/assets/common/items/modular/weapon/primary/staff/grandstaff.ron +++ b/assets/common/items/modular/weapon/primary/staff/grandstaff.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 1.5, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/staff/longpole.ron b/assets/common/items/modular/weapon/primary/staff/longpole.ron index 6cc9c8fc42..eeb27ef834 100644 --- a/assets/common/items/modular/weapon/primary/staff/longpole.ron +++ b/assets/common/items/modular/weapon/primary/staff/longpole.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.2, range: 1.3, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/staff/ornate.ron b/assets/common/items/modular/weapon/primary/staff/ornate.ron index 2368aacbf0..b32e4b1d4d 100644 --- a/assets/common/items/modular/weapon/primary/staff/ornate.ron +++ b/assets/common/items/modular/weapon/primary/staff/ornate.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/staff/pole.ron b/assets/common/items/modular/weapon/primary/staff/pole.ron index 7c5dd7322f..dd56b1ba3f 100644 --- a/assets/common/items/modular/weapon/primary/staff/pole.ron +++ b/assets/common/items/modular/weapon/primary/staff/pole.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 0.8, speed: 0.7, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.5, diff --git a/assets/common/items/modular/weapon/primary/staff/rod.ron b/assets/common/items/modular/weapon/primary/staff/rod.ron index 16c6e5935c..c124b53e62 100644 --- a/assets/common/items/modular/weapon/primary/staff/rod.ron +++ b/assets/common/items/modular/weapon/primary/staff/rod.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 0.8, speed: 0.8, - crit_chance: 0.075, range: 1.0, energy_efficiency: 0.8, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/staff/staff.ron b/assets/common/items/modular/weapon/primary/staff/staff.ron index de418cc49f..342223e5a6 100644 --- a/assets/common/items/modular/weapon/primary/staff/staff.ron +++ b/assets/common/items/modular/weapon/primary/staff/staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.9, speed: 0.9, - crit_chance: 0.09, range: 0.9, energy_efficiency: 0.9, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/primary/sword/greatsword.ron b/assets/common/items/modular/weapon/primary/sword/greatsword.ron index b5683c2e89..cf8bdc9e8e 100644 --- a/assets/common/items/modular/weapon/primary/sword/greatsword.ron +++ b/assets/common/items/modular/weapon/primary/sword/greatsword.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.2, effect_power: 1.5, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 0.7, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/primary/sword/katana.ron b/assets/common/items/modular/weapon/primary/sword/katana.ron index 529bc046fb..7b66f26480 100644 --- a/assets/common/items/modular/weapon/primary/sword/katana.ron +++ b/assets/common/items/modular/weapon/primary/sword/katana.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.8, speed: 1.4, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.3, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/primary/sword/longsword.ron b/assets/common/items/modular/weapon/primary/sword/longsword.ron index 74b047541c..c25457b642 100644 --- a/assets/common/items/modular/weapon/primary/sword/longsword.ron +++ b/assets/common/items/modular/weapon/primary/sword/longsword.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/primary/sword/ornate.ron b/assets/common/items/modular/weapon/primary/sword/ornate.ron index bd9b292ed4..4d0fb8999f 100644 --- a/assets/common/items/modular/weapon/primary/sword/ornate.ron +++ b/assets/common/items/modular/weapon/primary/sword/ornate.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.8, speed: 1.1, - crit_chance: 0.12, range: 1.0, energy_efficiency: 1.5, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sword/sabre.ron b/assets/common/items/modular/weapon/primary/sword/sabre.ron index 366b86f7db..b77835c677 100644 --- a/assets/common/items/modular/weapon/primary/sword/sabre.ron +++ b/assets/common/items/modular/weapon/primary/sword/sabre.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.4, effect_power: 0.8, speed: 0.9, - crit_chance: 0.14, range: 1.0, energy_efficiency: 1.1, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/primary/sword/sawblade.ron b/assets/common/items/modular/weapon/primary/sword/sawblade.ron index 0d76cd46cf..df1dcfb878 100644 --- a/assets/common/items/modular/weapon/primary/sword/sawblade.ron +++ b/assets/common/items/modular/weapon/primary/sword/sawblade.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.3, effect_power: 0.8, speed: 1.0, - crit_chance: 0.10, range: 0.9, energy_efficiency: 0.8, buff_strength: 1.4, diff --git a/assets/common/items/modular/weapon/primary/sword/zweihander.ron b/assets/common/items/modular/weapon/primary/sword/zweihander.ron index 8a112e950a..df241657b4 100644 --- a/assets/common/items/modular/weapon/primary/sword/zweihander.ron +++ b/assets/common/items/modular/weapon/primary/sword/zweihander.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.2, effect_power: 1.0, speed: 0.8, - crit_chance: 0.14, range: 1.3, energy_efficiency: 0.9, buff_strength: 0.8, diff --git a/assets/common/items/modular/weapon/secondary/axe/long.ron b/assets/common/items/modular/weapon/secondary/axe/long.ron index bced66624b..45ad406972 100644 --- a/assets/common/items/modular/weapon/secondary/axe/long.ron +++ b/assets/common/items/modular/weapon/secondary/axe/long.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.1, effect_power: 1.1, speed: 0.9, - crit_chance: 0.9, range: 1.1, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/modular/weapon/secondary/axe/medium.ron b/assets/common/items/modular/weapon/secondary/axe/medium.ron index a228055c9c..7de73fcc3c 100644 --- a/assets/common/items/modular/weapon/secondary/axe/medium.ron +++ b/assets/common/items/modular/weapon/secondary/axe/medium.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 0.9, - crit_chance: 0.9, range: 1.0, energy_efficiency: 0.9, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/secondary/axe/short.ron b/assets/common/items/modular/weapon/secondary/axe/short.ron index 911635a51a..6b5036f6e3 100644 --- a/assets/common/items/modular/weapon/secondary/axe/short.ron +++ b/assets/common/items/modular/weapon/secondary/axe/short.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.9, speed: 1.1, - crit_chance: 1.1, range: 0.9, energy_efficiency: 1.1, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/secondary/bow/long.ron b/assets/common/items/modular/weapon/secondary/bow/long.ron index d93ba75bc9..2b937c518e 100644 --- a/assets/common/items/modular/weapon/secondary/bow/long.ron +++ b/assets/common/items/modular/weapon/secondary/bow/long.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 1.1, speed: 0.8, - crit_chance: 0.9, range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/modular/weapon/secondary/bow/medium.ron b/assets/common/items/modular/weapon/secondary/bow/medium.ron index 638bafe17e..ac9e495a33 100644 --- a/assets/common/items/modular/weapon/secondary/bow/medium.ron +++ b/assets/common/items/modular/weapon/secondary/bow/medium.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/secondary/bow/short.ron b/assets/common/items/modular/weapon/secondary/bow/short.ron index 6ead96ddf2..370385789d 100644 --- a/assets/common/items/modular/weapon/secondary/bow/short.ron +++ b/assets/common/items/modular/weapon/secondary/bow/short.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.9, speed: 1.2, - crit_chance: 1.1, range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/secondary/hammer/long.ron b/assets/common/items/modular/weapon/secondary/hammer/long.ron index 0a8d192f4b..a00706d0d3 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/long.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/long.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 1.1, speed: 0.8, - crit_chance: 0.9, range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/modular/weapon/secondary/hammer/medium.ron b/assets/common/items/modular/weapon/secondary/hammer/medium.ron index 00bb159eed..445714d07b 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/medium.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/medium.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 0.9, - crit_chance: 0.9, range: 1.0, energy_efficiency: 0.9, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/secondary/hammer/short.ron b/assets/common/items/modular/weapon/secondary/hammer/short.ron index 1f4b3a0fd7..1ddb4126ba 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/short.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/short.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.9, speed: 1.2, - crit_chance: 1.1, range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron b/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron index d299f5ec22..1428e9d4b8 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 1.1, speed: 0.8, - crit_chance: 0.9, range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/modular/weapon/secondary/sceptre/light.ron b/assets/common/items/modular/weapon/secondary/sceptre/light.ron index 47a3b13f56..78f06cdab7 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/light.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/light.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.9, speed: 1.2, - crit_chance: 1.1, range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/secondary/sceptre/medium.ron b/assets/common/items/modular/weapon/secondary/sceptre/medium.ron index 103a5a971b..c89da0484d 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/medium.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/medium.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/secondary/staff/heavy.ron b/assets/common/items/modular/weapon/secondary/staff/heavy.ron index 30bba2a38d..43ab20c7e6 100644 --- a/assets/common/items/modular/weapon/secondary/staff/heavy.ron +++ b/assets/common/items/modular/weapon/secondary/staff/heavy.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 1.1, speed: 0.8, - crit_chance: 0.9, range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/modular/weapon/secondary/staff/light.ron b/assets/common/items/modular/weapon/secondary/staff/light.ron index 89a0c27cce..11e3570153 100644 --- a/assets/common/items/modular/weapon/secondary/staff/light.ron +++ b/assets/common/items/modular/weapon/secondary/staff/light.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.8, effect_power: 0.9, speed: 1.2, - crit_chance: 1.1, range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, diff --git a/assets/common/items/modular/weapon/secondary/staff/medium.ron b/assets/common/items/modular/weapon/secondary/staff/medium.ron index c66f8e8ec0..0d27d29ee1 100644 --- a/assets/common/items/modular/weapon/secondary/staff/medium.ron +++ b/assets/common/items/modular/weapon/secondary/staff/medium.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/secondary/sword/long.ron b/assets/common/items/modular/weapon/secondary/sword/long.ron index 7c028a330c..52312c925c 100644 --- a/assets/common/items/modular/weapon/secondary/sword/long.ron +++ b/assets/common/items/modular/weapon/secondary/sword/long.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.1, effect_power: 1.1, speed: 0.9, - crit_chance: 0.9, range: 1.1, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/modular/weapon/secondary/sword/medium.ron b/assets/common/items/modular/weapon/secondary/sword/medium.ron index 5c61b1a53d..4ab1e30d4d 100644 --- a/assets/common/items/modular/weapon/secondary/sword/medium.ron +++ b/assets/common/items/modular/weapon/secondary/sword/medium.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/modular/weapon/secondary/sword/short.ron b/assets/common/items/modular/weapon/secondary/sword/short.ron index b1bf7c79d6..e1d8e011da 100644 --- a/assets/common/items/modular/weapon/secondary/sword/short.ron +++ b/assets/common/items/modular/weapon/secondary/sword/short.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.9, effect_power: 0.9, speed: 1.1, - crit_chance: 1.1, range: 0.9, energy_efficiency: 1.1, buff_strength: 0.9, 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 c49e0d7cea..998b7fade9 100644 --- a/assets/common/items/npc_weapons/axe/gigas_frost_axe.ron +++ b/assets/common/items/npc_weapons/axe/gigas_frost_axe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index 418fc96f62..d899336546 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 0ba8b56e3b..9c0aff1290 100644 --- a/assets/common/items/npc_weapons/axe/oni_blue_axe.ron +++ b/assets/common/items/npc_weapons/axe/oni_blue_axe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.6, effect_power: 1.0, speed: 1.1, - crit_chance: 0.18, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 201ecef4be..0e2c95b7c0 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 ce4731aae5..1a1180c542 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 189ff272e3..8a2365a014 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 d7181fff8b..58d2c845fa 100644 --- a/assets/common/items/npc_weapons/biped_small/boreal/bow.ron +++ b/assets/common/items/npc_weapons/biped_small/boreal/bow.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.12, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 4ccc0bac79..ea9bc97a52 100644 --- a/assets/common/items/npc_weapons/biped_small/boreal/hammer.ron +++ b/assets/common/items/npc_weapons/biped_small/boreal/hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.12, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 2bbbd53196..22ee5855dd 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/chieftain.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 895ea2e194..374719de4f 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/greentotem.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/greentotem.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 5aacaa0c4f..637395e17a 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/logger.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 cf410afb52..d28b4cc28b 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/mugger.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.3, effect_power: 1.0, speed: 1.0, - crit_chance: 0.12037037, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 73c651984c..9e1b08499d 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/redtotem.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/redtotem.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 69672a1ec3..50bf05f0c9 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/stalker.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.3, effect_power: 0.8, speed: 0.6, - crit_chance: 0.26764706, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 cbffc80e2b..9ccf350383 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/whitetotem.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/whitetotem.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 0aa770c32f..5dfda27d4c 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/archer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.6, effect_power: 0.8, speed: 0.7, - crit_chance: 0.043827, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 a332113364..7889656c53 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/guard.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.6, effect_power: 1.0, speed: 1.0, - crit_chance: 0.05357143, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 06a93d2181..4f1f22f088 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.6, effect_power: 0.8, speed: 0.8, - crit_chance: 0.043827, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/mandragora.ron b/assets/common/items/npc_weapons/biped_small/mandragora.ron index 67946c9772..642fea9e10 100644 --- a/assets/common/items/npc_weapons/biped_small/mandragora.ron +++ b/assets/common/items/npc_weapons/biped_small/mandragora.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.5, effect_power: 1.0, speed: 0.75, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 33d940b0b3..86a30ba049 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.0, speed: 0.75, - crit_chance: 0.04963235, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 c8ef00a0b3..021eb8e6a9 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 0.8, speed: 0.6, - crit_chance: 0.095454544, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 d23b085ac4..469837d423 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 0.8, speed: 0.6, - crit_chance: 0.040873703, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 9654a74a12..3ca7e66ae0 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.8, effect_power: 0.8, speed: 1.05, - crit_chance: 0.05965909, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 92e3a8bd38..868d844faa 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.8, effect_power: 0.8, speed: 0.6, - crit_chance: 0.066083916, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 a8ac1478d0..e97fc78e73 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.8, effect_power: 1.0, speed: 0.75, - crit_chance: 0.053030305, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron index 1808febcc4..4887d23adc 100644 --- a/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron +++ b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.6, effect_power: 1.1, speed: 0.8, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index fb2181fe46..ec871e33e3 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.5, effect_power: 1.0, speed: 0.75, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron index 87f26c4200..d5165d0cf7 100644 --- a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron @@ -9,7 +9,6 @@ ItemDef( power: 2.4, effect_power: 1.0, speed: 0.6, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index abf78a8bd9..225c804031 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index a400dc82c2..fe0f943dd4 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.05078125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index bc1bf18f06..10a6ebef76 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 de5103e59f..e70d51185a 100644 --- a/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/oni_red_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index ee2b861eec..0e9b322a64 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index b5a0e1d5ac..ef8cf4759d 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index 7901c9174e..f7df89fbf7 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.046875, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron index 0b33c49418..8420f007c6 100644 --- a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron @@ -9,7 +9,6 @@ ItemDef( power: 2.4, effect_power: 1.0, speed: 0.6, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 38a0505620..677a3b2d0e 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index c35853075d..1c569d8f75 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 98406a251a..9210b2190d 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.5, effect_power: 1.0, speed: 0.75, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 5828d6e723..799bcca960 100644 --- a/assets/common/items/npc_weapons/sword/adlet_elder_sword.ron +++ b/assets/common/items/npc_weapons/sword/adlet_elder_sword.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.5, effect_power: 1.0, speed: 0.75, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron index 76d5147127..2031618e27 100644 --- a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.6, effect_power: 1.0, speed: 0.6, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index bd9b05a051..6aa0350119 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0645, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 eca57bfa33..45463d5d82 100644 --- a/assets/common/items/npc_weapons/sword/pickaxe_velorite_sword.ron +++ b/assets/common/items/npc_weapons/sword/pickaxe_velorite_sword.ron @@ -9,7 +9,6 @@ ItemDef( power: 2.0, effect_power: 1.2, speed: 0.7, - crit_chance: 0.2, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index d80de6a38e..14b426fccf 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.5, effect_power: 1.0, speed: 0.75, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/akhlut.ron b/assets/common/items/npc_weapons/unique/akhlut.ron index f40170652a..852729098a 100644 --- a/assets/common/items/npc_weapons/unique/akhlut.ron +++ b/assets/common/items/npc_weapons/unique/akhlut.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.25, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/arthropods/antlion.ron b/assets/common/items/npc_weapons/unique/arthropods/antlion.ron index 8e6a4b3975..d0045a9852 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/antlion.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/antlion.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron b/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron index aaf2f1678f..ae97ca4183 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron b/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron index 88409656e0..46daae9959 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.6, effect_power: 1.0, speed: 0.6, - crit_chance: 0.1, range: 0.8, energy_efficiency: 1.0, buff_strength: 0.9, diff --git a/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron b/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron index c3dc0d2148..730f35b2e6 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/dagonite.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron b/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron index 28371f3727..e89bd53ca4 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/hornbeetle.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron b/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron index 38466b1ce7..d5406414ab 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.86, effect_power: 1.0, speed: 0.86, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 0.875, diff --git a/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron b/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron index 1f539497c6..0aa064be81 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.72, effect_power: 1.0, speed: 0.72, - crit_chance: 0.1, range: 0.8, energy_efficiency: 1.0, buff_strength: 0.6, diff --git a/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron b/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron index 629b957af4..c01c86b3fa 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/arthropods/weevil.ron b/assets/common/items/npc_weapons/unique/arthropods/weevil.ron index 0c407cf69c..50d64e6c36 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/weevil.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/weevil.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/asp.ron b/assets/common/items/npc_weapons/unique/asp.ron index 784c9cbe13..e95f170f64 100644 --- a/assets/common/items/npc_weapons/unique/asp.ron +++ b/assets/common/items/npc_weapons/unique/asp.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/basilisk.ron b/assets/common/items/npc_weapons/unique/basilisk.ron index 1d27fc7d51..aa61b5b3e5 100644 --- a/assets/common/items/npc_weapons/unique/basilisk.ron +++ b/assets/common/items/npc_weapons/unique/basilisk.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index f6d69763f5..719f66fe92 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdlargebasic.ron b/assets/common/items/npc_weapons/unique/birdlargebasic.ron index 23e0df38b0..4544108723 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebasic.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron index 0079a86219..2e9090f65d 100644 --- a/assets/common/items/npc_weapons/unique/birdlargebreathe.ron +++ b/assets/common/items/npc_weapons/unique/birdlargebreathe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdlargefire.ron b/assets/common/items/npc_weapons/unique/birdlargefire.ron index ad09d926a5..ab776eb043 100644 --- a/assets/common/items/npc_weapons/unique/birdlargefire.ron +++ b/assets/common/items/npc_weapons/unique/birdlargefire.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/birdmediumbasic.ron b/assets/common/items/npc_weapons/unique/birdmediumbasic.ron index 52746772e2..042f09df36 100644 --- a/assets/common/items/npc_weapons/unique/birdmediumbasic.ron +++ b/assets/common/items/npc_weapons/unique/birdmediumbasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/bushly.ron b/assets/common/items/npc_weapons/unique/bushly.ron index eec1dffd34..c1e3be7a52 100644 --- a/assets/common/items/npc_weapons/unique/bushly.ron +++ b/assets/common/items/npc_weapons/unique/bushly.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/cardinal.ron b/assets/common/items/npc_weapons/unique/cardinal.ron index 25fb54df95..1f11252f8d 100644 --- a/assets/common/items/npc_weapons/unique/cardinal.ron +++ b/assets/common/items/npc_weapons/unique/cardinal.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.2, effect_power: 0.8, speed: 1.2, - crit_chance: 0.4, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 eea12d3334..3afe9d4898 100644 --- a/assets/common/items/npc_weapons/unique/clay_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/clay_golem_fist.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/clockwork.ron b/assets/common/items/npc_weapons/unique/clockwork.ron index c5db60f947..bd8eb227d1 100644 --- a/assets/common/items/npc_weapons/unique/clockwork.ron +++ b/assets/common/items/npc_weapons/unique/clockwork.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/cloudwyvern.ron b/assets/common/items/npc_weapons/unique/cloudwyvern.ron index 85f3d1de4a..44e9712421 100644 --- a/assets/common/items/npc_weapons/unique/cloudwyvern.ron +++ b/assets/common/items/npc_weapons/unique/cloudwyvern.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 61ba2a2274..e35e86395b 100644 --- a/assets/common/items/npc_weapons/unique/coral_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/coral_golem_fist.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/dagon.ron b/assets/common/items/npc_weapons/unique/dagon.ron index 2aab4298e3..232a24d81e 100644 --- a/assets/common/items/npc_weapons/unique/dagon.ron +++ b/assets/common/items/npc_weapons/unique/dagon.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.05078125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/deadwood.ron b/assets/common/items/npc_weapons/unique/deadwood.ron index 27aabe839e..38682b24db 100644 --- a/assets/common/items/npc_weapons/unique/deadwood.ron +++ b/assets/common/items/npc_weapons/unique/deadwood.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/driggle.ron b/assets/common/items/npc_weapons/unique/driggle.ron index 34c0f1cda2..6602684414 100644 --- a/assets/common/items/npc_weapons/unique/driggle.ron +++ b/assets/common/items/npc_weapons/unique/driggle.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/emberfly.ron b/assets/common/items/npc_weapons/unique/emberfly.ron index 54ee6dd126..1bbcf9ccd2 100644 --- a/assets/common/items/npc_weapons/unique/emberfly.ron +++ b/assets/common/items/npc_weapons/unique/emberfly.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron b/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron index a94deca3a4..666fe99673 100644 --- a/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron +++ b/assets/common/items/npc_weapons/unique/flamekeeper_staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/flamethrower.ron b/assets/common/items/npc_weapons/unique/flamethrower.ron index 87d243bef5..a6a0daca1f 100644 --- a/assets/common/items/npc_weapons/unique/flamethrower.ron +++ b/assets/common/items/npc_weapons/unique/flamethrower.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 2.0, - crit_chance: 0.0, range: 1.5, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/flamewyvern.ron b/assets/common/items/npc_weapons/unique/flamewyvern.ron index eca80b777e..a7484c425d 100644 --- a/assets/common/items/npc_weapons/unique/flamewyvern.ron +++ b/assets/common/items/npc_weapons/unique/flamewyvern.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/frostfang.ron b/assets/common/items/npc_weapons/unique/frostfang.ron index 2b77c4e198..5cdb52e006 100644 --- a/assets/common/items/npc_weapons/unique/frostfang.ron +++ b/assets/common/items/npc_weapons/unique/frostfang.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/frostwyvern.ron b/assets/common/items/npc_weapons/unique/frostwyvern.ron index 05f2f3af94..803bd66998 100644 --- a/assets/common/items/npc_weapons/unique/frostwyvern.ron +++ b/assets/common/items/npc_weapons/unique/frostwyvern.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron index 416b5b4b28..36c72bf0ec 100644 --- a/assets/common/items/npc_weapons/unique/haniwa_sentry.ron +++ b/assets/common/items/npc_weapons/unique/haniwa_sentry.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/hermit_alligator.ron b/assets/common/items/npc_weapons/unique/hermit_alligator.ron index e9fb2a9681..911c49fed6 100644 --- a/assets/common/items/npc_weapons/unique/hermit_alligator.ron +++ b/assets/common/items/npc_weapons/unique/hermit_alligator.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.05078125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/husk.ron b/assets/common/items/npc_weapons/unique/husk.ron index 781c6972e7..25d71565d4 100644 --- a/assets/common/items/npc_weapons/unique/husk.ron +++ b/assets/common/items/npc_weapons/unique/husk.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/husk_brute.ron b/assets/common/items/npc_weapons/unique/husk_brute.ron index 68c10c625d..79065777c3 100644 --- a/assets/common/items/npc_weapons/unique/husk_brute.ron +++ b/assets/common/items/npc_weapons/unique/husk_brute.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/icedrake.ron b/assets/common/items/npc_weapons/unique/icedrake.ron index 7073c5f42b..b42af159fa 100644 --- a/assets/common/items/npc_weapons/unique/icedrake.ron +++ b/assets/common/items/npc_weapons/unique/icedrake.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/irrwurz.ron b/assets/common/items/npc_weapons/unique/irrwurz.ron index 11cd51327f..71cae78fd3 100644 --- a/assets/common/items/npc_weapons/unique/irrwurz.ron +++ b/assets/common/items/npc_weapons/unique/irrwurz.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/maneater.ron b/assets/common/items/npc_weapons/unique/maneater.ron index f0d9d8f341..78a318ea69 100644 --- a/assets/common/items/npc_weapons/unique/maneater.ron +++ b/assets/common/items/npc_weapons/unique/maneater.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/mossysnail.ron b/assets/common/items/npc_weapons/unique/mossysnail.ron index f503a5734f..15e83d65b6 100644 --- a/assets/common/items/npc_weapons/unique/mossysnail.ron +++ b/assets/common/items/npc_weapons/unique/mossysnail.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/organ.ron b/assets/common/items/npc_weapons/unique/organ.ron index 33163f6c29..457d5f6b5d 100644 --- a/assets/common/items/npc_weapons/unique/organ.ron +++ b/assets/common/items/npc_weapons/unique/organ.ron @@ -9,7 +9,6 @@ ItemDef( power: 2.5, effect_power: 1.0, speed: 0.8, - crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 868bf5e504..08c3565d9d 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index 913bb9f0dd..4cbd700a87 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index 71f4df5ab2..d0e2e3b46a 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index b58eb9835e..778904d8b8 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index c28bfaa066..2058ea0db5 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index 1d1277305e..1fd771db46 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron index fe54b3eed5..caea8d0e56 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 7695602a19..5136da4e74 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index 850b22c534..90155be699 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index bdb80821a4..df90e38b28 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index 51fbf63ed1..0c06f30c7c 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 1d4acc2350..a6250a0273 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/roshwalr.ron b/assets/common/items/npc_weapons/unique/roshwalr.ron index ab45b58b5f..b92a636498 100644 --- a/assets/common/items/npc_weapons/unique/roshwalr.ron +++ b/assets/common/items/npc_weapons/unique/roshwalr.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 ecef1d76ea..70b0fc93e5 100644 --- a/assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron +++ b/assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.2, effect_power: 0.8, speed: 1.2, - crit_chance: 0.4, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/seawyvern.ron b/assets/common/items/npc_weapons/unique/seawyvern.ron index de8af7f9e5..19f01547b3 100644 --- a/assets/common/items/npc_weapons/unique/seawyvern.ron +++ b/assets/common/items/npc_weapons/unique/seawyvern.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron b/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron index 50ccd3585b..0504795ceb 100644 --- a/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron +++ b/assets/common/items/npc_weapons/unique/simpleflyingbasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 927940d2cb..2583c19866 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 4ebde7ee69..dcb354cc77 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index b27bcb1638..84f51ad72d 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodcharge.ron b/assets/common/items/npc_weapons/unique/theropodcharge.ron index 91492f081b..0f7eaf348c 100644 --- a/assets/common/items/npc_weapons/unique/theropodcharge.ron +++ b/assets/common/items/npc_weapons/unique/theropodcharge.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/theropodsmall.ron b/assets/common/items/npc_weapons/unique/theropodsmall.ron index 62123ad329..7fd355bec9 100644 --- a/assets/common/items/npc_weapons/unique/theropodsmall.ron +++ b/assets/common/items/npc_weapons/unique/theropodsmall.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index ec80f48a91..9ca5e5ec18 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tidal_totem.ron b/assets/common/items/npc_weapons/unique/tidal_totem.ron index 2a650ada26..796c6fb52d 100644 --- a/assets/common/items/npc_weapons/unique/tidal_totem.ron +++ b/assets/common/items/npc_weapons/unique/tidal_totem.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tornado.ron b/assets/common/items/npc_weapons/unique/tornado.ron index f2634f85e9..0e80ce2071 100644 --- a/assets/common/items/npc_weapons/unique/tornado.ron +++ b/assets/common/items/npc_weapons/unique/tornado.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 0.0, speed: 1.0, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/treantsapling.ron b/assets/common/items/npc_weapons/unique/treantsapling.ron index 87686f8bf4..7f2cfa9482 100644 --- a/assets/common/items/npc_weapons/unique/treantsapling.ron +++ b/assets/common/items/npc_weapons/unique/treantsapling.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index 9e556423d6..ba14895e67 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/tursus_claws.ron b/assets/common/items/npc_weapons/unique/tursus_claws.ron index d804964d53..d77443a3b0 100644 --- a/assets/common/items/npc_weapons/unique/tursus_claws.ron +++ b/assets/common/items/npc_weapons/unique/tursus_claws.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/wealdwyvern.ron b/assets/common/items/npc_weapons/unique/wealdwyvern.ron index dbcacfa28b..b8a63cb345 100644 --- a/assets/common/items/npc_weapons/unique/wealdwyvern.ron +++ b/assets/common/items/npc_weapons/unique/wealdwyvern.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index f8ccd249bb..9ad5427922 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 38b5f4c73a..111766d4ab 100644 --- a/assets/common/items/npc_weapons/unique/wood_golem_fist.ron +++ b/assets/common/items/npc_weapons/unique/wood_golem_fist.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/craftsman_hammer.ron b/assets/common/items/tool/craftsman_hammer.ron index a444ad7341..9d6ff1c9bd 100644 --- a/assets/common/items/tool/craftsman_hammer.ron +++ b/assets/common/items/tool/craftsman_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.2, effect_power: 0.25, speed: 1.5, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/double_bass.ron b/assets/common/items/tool/instruments/double_bass.ron index 746a7b73f2..b758ae49e5 100644 --- a/assets/common/items/tool/instruments/double_bass.ron +++ b/assets/common/items/tool/instruments/double_bass.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/flute.ron b/assets/common/items/tool/instruments/flute.ron index ea53877979..63ce004b50 100644 --- a/assets/common/items/tool/instruments/flute.ron +++ b/assets/common/items/tool/instruments/flute.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/glass_flute.ron b/assets/common/items/tool/instruments/glass_flute.ron index 6744861925..e7f805ccc2 100644 --- a/assets/common/items/tool/instruments/glass_flute.ron +++ b/assets/common/items/tool/instruments/glass_flute.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/guitar.ron b/assets/common/items/tool/instruments/guitar.ron index da2b2a351e..de0ea6a228 100644 --- a/assets/common/items/tool/instruments/guitar.ron +++ b/assets/common/items/tool/instruments/guitar.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/guitar_dark.ron b/assets/common/items/tool/instruments/guitar_dark.ron index d76811a867..2d17889bcd 100644 --- a/assets/common/items/tool/instruments/guitar_dark.ron +++ b/assets/common/items/tool/instruments/guitar_dark.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/icy_talharpa.ron b/assets/common/items/tool/instruments/icy_talharpa.ron index c25d658270..3d76b880f6 100644 --- a/assets/common/items/tool/instruments/icy_talharpa.ron +++ b/assets/common/items/tool/instruments/icy_talharpa.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/kalimba.ron b/assets/common/items/tool/instruments/kalimba.ron index 430d676bd1..6a45dd77d2 100644 --- a/assets/common/items/tool/instruments/kalimba.ron +++ b/assets/common/items/tool/instruments/kalimba.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/lute.ron b/assets/common/items/tool/instruments/lute.ron index f389d3ae8e..f5564228b9 100644 --- a/assets/common/items/tool/instruments/lute.ron +++ b/assets/common/items/tool/instruments/lute.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/lyre.ron b/assets/common/items/tool/instruments/lyre.ron index d9754ad75e..1da28fd894 100644 --- a/assets/common/items/tool/instruments/lyre.ron +++ b/assets/common/items/tool/instruments/lyre.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/melodica.ron b/assets/common/items/tool/instruments/melodica.ron index 5b2721f62d..94fbbdbda3 100644 --- a/assets/common/items/tool/instruments/melodica.ron +++ b/assets/common/items/tool/instruments/melodica.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/sitar.ron b/assets/common/items/tool/instruments/sitar.ron index 21f251487a..28f4bdccf7 100644 --- a/assets/common/items/tool/instruments/sitar.ron +++ b/assets/common/items/tool/instruments/sitar.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/washboard.ron b/assets/common/items/tool/instruments/washboard.ron index eae2ea5830..cbb14d8cec 100644 --- a/assets/common/items/tool/instruments/washboard.ron +++ b/assets/common/items/tool/instruments/washboard.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/wildskin_drum.ron b/assets/common/items/tool/instruments/wildskin_drum.ron index 4bd3dfbcc2..b897288577 100644 --- a/assets/common/items/tool/instruments/wildskin_drum.ron +++ b/assets/common/items/tool/instruments/wildskin_drum.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/pickaxe_steel.ron b/assets/common/items/tool/pickaxe_steel.ron index a95f8af8d2..1009f643ee 100644 --- a/assets/common/items/tool/pickaxe_steel.ron +++ b/assets/common/items/tool/pickaxe_steel.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.75, effect_power: 0.25, speed: 1.3, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/pickaxe_stone.ron b/assets/common/items/tool/pickaxe_stone.ron index 5ba2733ab2..ae27c3cffc 100644 --- a/assets/common/items/tool/pickaxe_stone.ron +++ b/assets/common/items/tool/pickaxe_stone.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.75, effect_power: 0.25, speed: 0.5, - crit_chance: 0.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/pickaxe_velorite.ron b/assets/common/items/tool/pickaxe_velorite.ron index c1a2c631f1..6ab7ce9bf7 100644 --- a/assets/common/items/tool/pickaxe_velorite.ron +++ b/assets/common/items/tool/pickaxe_velorite.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 0.25, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index d709351399..33a24c0e2a 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 1.3, speed: 0.8, - crit_chance: 0.04, range: 1.0, energy_efficiency: 1.3, buff_strength: 1.2, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 0e056cd71c..f9b792a225 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.2, speed: 0.7, - crit_chance: 0.2, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 7622a73716..af5a537418 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 9146c0142b..8cda674730 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.0, speed: 0.6, - crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index dbb1d71a2c..a9d33d0cad 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.45, effect_power: 0.3, speed: 0.95, - crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, buff_strength: 0.9, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index e3acdf7676..cf689b954e 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 1.0, speed: 0.65, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 339bf7b13f..71ebc25539 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.8, effect_power: 2.0, speed: 1.0, - crit_chance: 0.13611111, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index e76c516f39..9b9eefbcd1 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -9,7 +9,6 @@ ItemDef( power: 2.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index c3cb757e55..a7a451b19f 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 0.5, speed: 1.0, - crit_chance: 0.15, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 4eb425ced4..3732232a55 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/hammer/burnt_drumstick.ron b/assets/common/items/weapons/hammer/burnt_drumstick.ron index 6a0d48a020..a093659d7e 100644 --- a/assets/common/items/weapons/hammer/burnt_drumstick.ron +++ b/assets/common/items/weapons/hammer/burnt_drumstick.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, 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 8e305f8095..c846a25df0 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 1.0, speed: 0.65, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index 80ef43698c..f93b3e527d 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index b358feefae..3cf77969a0 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 54a62d3d0d..5d661d7a10 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.0, speed: 0.6, - crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 0c6b34643c..3c465223a4 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.45, effect_power: 1.0, speed: 0.95, - crit_chance: 0.09375, range: 0.95, energy_efficiency: 1.0, buff_strength: 0.9, diff --git a/assets/common/items/weapons/sceptre/amethyst.ron b/assets/common/items/weapons/sceptre/amethyst.ron index 4a22027d68..0bd5dc0287 100644 --- a/assets/common/items/weapons/sceptre/amethyst.ron +++ b/assets/common/items/weapons/sceptre/amethyst.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.8, effect_power: 1.5, speed: 1.2, - crit_chance: 0.088125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sceptre/belzeshrub.ron b/assets/common/items/weapons/sceptre/belzeshrub.ron index 32fead66d4..a5a9f19ddf 100644 --- a/assets/common/items/weapons/sceptre/belzeshrub.ron +++ b/assets/common/items/weapons/sceptre/belzeshrub.ron @@ -9,7 +9,6 @@ ItemDef( power: 2.5, effect_power: 1.0, speed: 0.8, - crit_chance: 0.078125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron index f7be067c27..291ed2c603 100644 --- a/assets/common/items/weapons/sceptre/caduceus.ron +++ b/assets/common/items/weapons/sceptre/caduceus.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.0, speed: 0.6, - crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 7b599d352c..7e331870da 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 1.0, speed: 0.65, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 20ce5b14a6..7f5a69481e 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 1.5, speed: 0.65, - crit_chance: 0.21153846, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index 5db32fd4e9..1ce8b85252 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.45, effect_power: 0.1, speed: 0.95, - crit_chance: 0.09375, range: 0.95, energy_efficiency: 1.0, buff_strength: 0.9, diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index fb3b205bbf..de2aece989 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index f65ab75d40..a8a302720d 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 1.0, speed: 0.65, - crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron index d229371232..0c4e2621d9 100644 --- a/assets/common/items/weapons/staff/laevateinn.ron +++ b/assets/common/items/weapons/staff/laevateinn.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.0, speed: 0.6, - crit_chance: 0.2, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index b509af745a..c3ff542043 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.5, effect_power: 1.0, speed: 1.0, - crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index 690a516ba5..1ad6a20019 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.45, effect_power: 1.0, speed: 0.95, - crit_chance: 0.09375, range: 0.95, energy_efficiency: 1.0, buff_strength: 0.95, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 575cb8f623..0e5d3234a9 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -9,7 +9,6 @@ ItemDef( power: 3.0, effect_power: 1.2, speed: 0.7, - crit_chance: 0.2, range: 1.0, energy_efficiency: 0.8, buff_strength: 1.2, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 1fdf03ec87..8d01a5191f 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.75, effect_power: 0.7, speed: 0.8, - crit_chance: 0.14, range: 1.0, energy_efficiency: 1.3, buff_strength: 1.2, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index dd8fd07ae7..9df7a73475 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.7, effect_power: 1.0, speed: 1.0, - crit_chance: 0.13897058, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index c7e36c10ff..26f853364b 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.95, effect_power: 1.0, speed: 1.0, - crit_chance: 0.14182693, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index a5e23d0f66..84ac1ee867 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.6, effect_power: 1.0, speed: 0.8, - crit_chance: 0.1, range: 1.0, energy_efficiency: 0.9, buff_strength: 1.1, diff --git a/assets/common/items/weapons/sword_1h/starter.ron b/assets/common/items/weapons/sword_1h/starter.ron index 10b79a930d..515c70467e 100644 --- a/assets/common/items/weapons/sword_1h/starter.ron +++ b/assets/common/items/weapons/sword_1h/starter.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.4, effect_power: 1.0, speed: 1.2, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.1, buff_strength: 0.9, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index 17bdd98cb3..46e5a67631 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 413ecdb85f..03512a5e47 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/golf_club.ron b/assets/common/items/weapons/tool/golf_club.ron index 92357a55b5..e88f6df934 100644 --- a/assets/common/items/weapons/tool/golf_club.ron +++ b/assets/common/items/weapons/tool/golf_club.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.6, effect_power: 1.0, speed: 1.0, - crit_chance: 0.083333336, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 3617fde94c..0721c022e8 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.5, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 7eb8b6ed2e..d75a01a658 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index c2a3385c6b..1a54e97f17 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 4.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index ed7c073396..4d12815f4f 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 5d9e281f64..5ea84be019 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 2.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 9638f3e22b..838486c59a 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -9,7 +9,6 @@ ItemDef( power: 1.0, effect_power: 2.0, speed: 1.0, - crit_chance: 0.1125, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index f56b58e8cd..36c0c0a37e 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -7,7 +7,6 @@ power: 0.75, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -17,7 +16,6 @@ power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -27,7 +25,6 @@ power: 1.25, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -37,7 +34,6 @@ power: 1.5, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -47,7 +43,6 @@ power: 1.75, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -57,7 +52,6 @@ power: 2.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -68,7 +62,6 @@ power: 0.75, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -78,7 +71,6 @@ power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -88,7 +80,6 @@ power: 1.25, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -98,7 +89,6 @@ power: 1.5, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -108,7 +98,6 @@ power: 1.75, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -118,7 +107,6 @@ power: 2.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 99b8dd8561..5cccdeea39 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -111,7 +111,6 @@ fn weapon_stats() -> Result<(), Box> { "Power", "Effect Power", "Speed", - "Crit Chance", "Range", "Energy Efficiency", "Buff Strength", @@ -132,7 +131,6 @@ fn weapon_stats() -> Result<(), Box> { let power = tool_stats.power.to_string(); let effect_power = tool_stats.effect_power.to_string(); let speed = tool_stats.speed.to_string(); - let crit_chance = tool_stats.crit_chance.to_string(); let range = tool_stats.range.to_string(); let energy_efficiency = tool_stats.energy_efficiency.to_string(); let buff_strength = tool_stats.buff_strength.to_string(); @@ -151,7 +149,6 @@ fn weapon_stats() -> Result<(), Box> { &power, &effect_power, &speed, - &crit_chance, &range, &energy_efficiency, &buff_strength, diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 203769037a..4fe7401005 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -341,15 +341,6 @@ fn weapon_stats() -> Result<(), Box> { Hands::Two }; - let crit_chance: f32 = record - .get(headers["Crit Chance"]) - .expect(&format!( - "Error unwrapping crit_chance for {:?}", - item.item_definition_id() - )) - .parse() - .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - let range: f32 = record .get(headers["Range"]) .expect(&format!( @@ -382,7 +373,6 @@ fn weapon_stats() -> Result<(), Box> { power, effect_power, speed, - crit_chance, range, energy_efficiency, buff_strength, diff --git a/common/src/combat.rs b/common/src/combat.rs index 9a968e7bd5..79fc586c4e 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -79,7 +79,6 @@ pub struct AttackOptions { pub struct Attack { damages: Vec, effects: Vec, - crit_chance: f32, crit_multiplier: f32, } @@ -88,7 +87,6 @@ impl Default for Attack { Self { damages: Vec::new(), effects: Vec::new(), - crit_chance: 0.0, crit_multiplier: 1.0, } } @@ -108,8 +106,7 @@ impl Attack { } #[must_use] - pub fn with_crit(mut self, crit_chance: f32, crit_multiplier: f32) -> Self { - self.crit_chance = crit_chance; + pub fn with_crit(mut self, crit_multiplier: f32) -> Self { self.crit_multiplier = crit_multiplier; self } @@ -220,14 +217,7 @@ impl Attack { matches!(attack_effect.target, Some(GroupTarget::OutOfGroup)) && (target_dodging || !may_harm) }; - let crit_chance = attacker - .and_then(|a| a.stats) - .map(|s| s.crit_chance_modifier) - .map_or(self.crit_chance, |cc_mod| { - self.crit_chance * cc_mod.mult_mod + cc_mod.add_mod - }) - .clamp(0.0, 1.0); - let is_crit = rng.gen::() < crit_chance; + let is_crit = false; let mut is_applied = false; let mut accumulated_damage = 0.0; let damage_modifier = attacker @@ -1224,7 +1214,6 @@ pub fn get_weapon_kinds(inv: &Inventory) -> (Option, Option) fn weapon_rating(item: &T, _msm: &MaterialStatManifest) -> f32 { const POWER_WEIGHT: f32 = 2.0; const SPEED_WEIGHT: f32 = 3.0; - const CRIT_CHANCE_WEIGHT: f32 = 1.5; const RANGE_WEIGHT: f32 = 0.8; const EFFECT_WEIGHT: f32 = 1.5; const EQUIP_TIME_WEIGHT: f32 = 0.0; @@ -1240,7 +1229,6 @@ fn weapon_rating(item: &T, _msm: &MaterialStatManifest) -> f32 { let power_rating = stats.power; let speed_rating = stats.speed - 1.0; - let crit_chance_rating = (stats.crit_chance - 0.1) * 10.0; let range_rating = stats.range - 1.0; let effect_rating = stats.effect_power - 1.0; let equip_time_rating = 0.5 - stats.equip_time_secs; @@ -1249,7 +1237,6 @@ fn weapon_rating(item: &T, _msm: &MaterialStatManifest) -> f32 { power_rating * POWER_WEIGHT + speed_rating * SPEED_WEIGHT - + crit_chance_rating * CRIT_CHANCE_WEIGHT + range_rating * RANGE_WEIGHT + effect_rating * EFFECT_WEIGHT + equip_time_rating * EQUIP_TIME_WEIGHT diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index f70674708b..d52bdc74ed 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -111,7 +111,6 @@ pub struct Stats { pub power: f32, pub effect_power: f32, pub speed: f32, - pub crit_chance: f32, pub range: f32, pub energy_efficiency: f32, pub buff_strength: f32, @@ -124,7 +123,6 @@ impl Stats { power: 0.0, effect_power: 0.0, speed: 0.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 0.0, buff_strength: 0.0, @@ -137,7 +135,6 @@ impl Stats { power: 1.0, effect_power: 1.0, speed: 1.0, - crit_chance: 1.0, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, @@ -163,7 +160,6 @@ impl Stats { power: self.power * dur_mult.0, effect_power: self.effect_power * dur_mult.0, speed: self.speed * less_scaled, - crit_chance: self.crit_chance * dur_mult.0, range: self.range * less_scaled, energy_efficiency: self.energy_efficiency * less_scaled, buff_strength: self.buff_strength * dur_mult.0, @@ -186,7 +182,6 @@ impl Add for Stats { power: self.power + other.power, effect_power: self.effect_power + other.effect_power, speed: self.speed + other.speed, - crit_chance: self.crit_chance + other.crit_chance, range: self.range + other.range, energy_efficiency: self.energy_efficiency + other.energy_efficiency, buff_strength: self.buff_strength + other.buff_strength, @@ -207,7 +202,6 @@ impl Sub for Stats { power: self.power - other.power, effect_power: self.effect_power - other.effect_power, speed: self.speed - other.speed, - crit_chance: self.crit_chance - other.crit_chance, range: self.range - other.range, energy_efficiency: self.energy_efficiency - other.energy_efficiency, buff_strength: self.buff_strength - other.buff_strength, @@ -224,7 +218,6 @@ impl Mul for Stats { power: self.power * other.power, effect_power: self.effect_power * other.effect_power, speed: self.speed * other.speed, - crit_chance: self.crit_chance * other.crit_chance, range: self.range * other.range, energy_efficiency: self.energy_efficiency * other.energy_efficiency, buff_strength: self.buff_strength * other.buff_strength, @@ -245,7 +238,6 @@ impl Div for Stats { power: self.power / scalar, effect_power: self.effect_power / scalar, speed: self.speed / scalar, - crit_chance: self.crit_chance / scalar, range: self.range / scalar, energy_efficiency: self.energy_efficiency / scalar, buff_strength: self.buff_strength / scalar, @@ -281,7 +273,6 @@ impl Tool { power: 1.00, effect_power: 1.00, speed: 1.00, - crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/common/src/comp/melee.rs b/common/src/comp/melee.rs index 20413eefd6..dc40dacb2e 100644 --- a/common/src/comp/melee.rs +++ b/common/src/comp/melee.rs @@ -72,7 +72,7 @@ pub struct MeleeConstructor { } impl MeleeConstructor { - pub fn create_melee(self, (crit_chance, crit_mult): (f32, f32), tool_stats: Stats) -> Melee { + pub fn create_melee(self, crit_mult: f32, tool_stats: Stats) -> Melee { use MeleeConstructorKind::*; if self.scaled.is_some() { dev_panic!( @@ -127,7 +127,7 @@ impl MeleeConstructor { Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_effect(poise) .with_effect(knockback) @@ -178,7 +178,7 @@ impl MeleeConstructor { Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_effect(poise) .with_effect(knockback) @@ -221,7 +221,7 @@ impl MeleeConstructor { Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_effect(poise) .with_effect(knockback) @@ -269,7 +269,7 @@ impl MeleeConstructor { Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(poise) .with_effect(knockback) .with_combo(self.combo_gain) @@ -308,7 +308,7 @@ impl MeleeConstructor { Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(knockback) .with_combo(self.combo_gain) }, @@ -346,7 +346,7 @@ impl MeleeConstructor { Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(poise) .with_effect(knockback) .with_combo(self.combo_gain) diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs index c37e77e257..c8111c56e6 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -140,7 +140,6 @@ impl ProjectileConstructor { pub fn create_projectile( self, owner: Option, - crit_chance: f32, crit_mult: f32, tool_stats: tool::Stats, damage_effect: Option, @@ -186,7 +185,7 @@ impl ProjectileConstructor { } let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_effect(knockback) .with_combo_increment(); @@ -239,7 +238,7 @@ impl ProjectileConstructor { } let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_effect(knockback) .with_combo_increment(); @@ -281,7 +280,7 @@ impl ProjectileConstructor { .with_effect(buff); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_combo_increment(); let explosion = Explosion { @@ -319,7 +318,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_combo_increment(); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], @@ -364,7 +363,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(buff); let explosion = Explosion { effects: vec![ @@ -401,7 +400,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_combo_increment(); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], @@ -446,7 +445,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(buff); let explosion = Explosion { effects: vec![ @@ -502,7 +501,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(knockback); let explosion = Explosion { effects: vec![ @@ -550,7 +549,7 @@ impl ProjectileConstructor { .with_requirement(CombatRequirement::AnyDamage); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(buff) .with_combo_increment(); let explosion = Explosion { @@ -586,9 +585,7 @@ impl ProjectileConstructor { Some(GroupTarget::OutOfGroup), instance, ); - let attack = Attack::default() - .with_damage(damage) - .with_crit(crit_chance, crit_mult); + let attack = Attack::default().with_damage(damage).with_crit(crit_mult); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], radius, @@ -642,7 +639,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(knockback) .with_effect(buff); let explosion = Explosion { @@ -701,7 +698,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(knockback) .with_effect(buff); let explosion = Explosion { @@ -759,7 +756,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(knockback) .with_effect(buff); let variation = thread_rng().gen::(); @@ -815,7 +812,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(knockback); let explosion = Explosion { effects: vec![ @@ -846,9 +843,7 @@ impl ProjectileConstructor { Some(GroupTarget::OutOfGroup), instance, ); - let attack = Attack::default() - .with_damage(damage) - .with_crit(crit_chance, crit_mult); + let attack = Attack::default().with_damage(damage).with_crit(crit_mult); Projectile { hit_solid: vec![], hit_entity: vec![Effect::Attack(attack), Effect::Vanish], @@ -873,9 +868,7 @@ impl ProjectileConstructor { Some(GroupTarget::OutOfGroup), instance, ); - let attack = Attack::default() - .with_damage(damage) - .with_crit(crit_chance, crit_mult); + let attack = Attack::default().with_damage(damage).with_crit(crit_mult); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], radius, diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index 216a79e2fe..ad58284c59 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -1,7 +1,7 @@ use crate::{ combat::{ - Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, DamageKind, - DamageSource, GroupTarget, + self, Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, + DamageKind, DamageSource, GroupTarget, }, comp::{ beam, body::biped_large, character_state::OutputEvents, object::Body::Flamethrower, Body, @@ -116,11 +116,10 @@ impl CharacterBehavior for Data { if let Some(effect) = self.static_data.damage_effect { damage = damage.with_effect(effect); } - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_combo_increment() }; diff --git a/common/src/states/basic_melee.rs b/common/src/states/basic_melee.rs index 5b0ec8fa85..9dd1ec798f 100644 --- a/common/src/states/basic_melee.rs +++ b/common/src/states/basic_melee.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{ character_state::OutputEvents, tool::ToolKind, CharacterState, MeleeConstructor, StateUpdate, @@ -76,14 +77,14 @@ impl CharacterBehavior for Data { ..*self }); - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( data.entity, self.static_data .melee_constructor - .create_melee(crit_data, tool_stats) + .create_melee(crit_mult, tool_stats) .with_block_breaking( data.inputs .break_block_pos diff --git a/common/src/states/basic_ranged.rs b/common/src/states/basic_ranged.rs index ea4d75bfca..673ba03dc3 100644 --- a/common/src/states/basic_ranged.rs +++ b/common/src/states/basic_ranged.rs @@ -1,5 +1,5 @@ use crate::{ - combat::CombatEffect, + combat::{self, CombatEffect}, comp::{ character_state::OutputEvents, object::Body::LaserBeam, Body, CharacterState, LightEmitter, Pos, ProjectileConstructor, StateUpdate, @@ -87,12 +87,10 @@ impl CharacterBehavior for Data { StageSection::Recover => { if !self.exhausted { // Fire - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); let projectile = self.static_data.projectile.create_projectile( Some(*data.uid), - crit_chance, crit_mult, tool_stats, self.static_data.damage_effect, diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs index e12340b049..740ac091b4 100644 --- a/common/src/states/charged_melee.rs +++ b/common/src/states/charged_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::CombatEffect, + combat::{self, CombatEffect}, comp::{character_state::OutputEvents, CharacterState, MeleeConstructor, StateUpdate}, event::LocalEvent, outcome::Outcome, @@ -83,10 +83,10 @@ impl CharacterBehavior for Data { c.timer = tick_attack_or_default(data, self.timer, None); } } else { - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater - .insert(data.entity, strike.create_melee(crit_data, tool_stats)); + .insert(data.entity, strike.create_melee(crit_mult, tool_stats)); if let CharacterState::ChargedMelee(c) = &mut update.character { c.stage_section = StageSection::Charge; @@ -153,7 +153,7 @@ impl CharacterBehavior for Data { ..*self }); - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); let additional_combo = (self.charge_amount * self.static_data.additional_combo as f32 + 0.5) @@ -165,7 +165,7 @@ impl CharacterBehavior for Data { .melee_constructor .with_combo(1 + additional_combo) .handle_scaling(self.charge_amount) - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); if let Some(FrontendSpecifier::GroundCleave) = self.static_data.specifier { diff --git a/common/src/states/charged_ranged.rs b/common/src/states/charged_ranged.rs index fcc03f9b2b..5196c619c7 100644 --- a/common/src/states/charged_ranged.rs +++ b/common/src/states/charged_ranged.rs @@ -1,5 +1,5 @@ use crate::{ - combat::CombatEffect, + combat::{self, CombatEffect}, comp::{ character_state::OutputEvents, projectile::ProjectileConstructor, Body, CharacterState, LightEmitter, Pos, StateUpdate, @@ -110,8 +110,7 @@ impl CharacterBehavior for Data { + charge_frac * self.static_data.scaled_regen, }; // Fire - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); // Gets offsets let body_offsets = data @@ -120,7 +119,6 @@ impl CharacterBehavior for Data { let pos = Pos(data.pos.0 + body_offsets); let projectile = arrow.create_projectile( Some(*data.uid), - crit_chance, crit_mult, tool_stats, self.static_data.damage_effect, diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index f72ff9978e..1d6596bebb 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::{Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement}, + combat::{self, Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement}, comp::{ character_state::OutputEvents, melee::MultiTarget, @@ -252,12 +252,11 @@ impl CharacterBehavior for Data { damage = damage.with_effect(effect); } - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(energy) .with_effect(poise) .with_effect(knockback) diff --git a/common/src/states/combo_melee2.rs b/common/src/states/combo_melee2.rs index 53dbc4b45f..d9734dd0df 100644 --- a/common/src/states/combo_melee2.rs +++ b/common/src/states/combo_melee2.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{ character_state::OutputEvents, tool::Stats, CharacterState, MeleeConstructor, StateUpdate, }, @@ -157,7 +158,7 @@ impl CharacterBehavior for Data { c.exhausted = true; } - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( @@ -165,7 +166,7 @@ impl CharacterBehavior for Data { strike_data .melee_constructor .with_combo(1 + strike_data.additional_combo) - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); } else if self.timer < strike_data.swing_duration { // Swings diff --git a/common/src/states/dash_melee.rs b/common/src/states/dash_melee.rs index 7073f7a572..49ebc36bd7 100644 --- a/common/src/states/dash_melee.rs +++ b/common/src/states/dash_melee.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{ character_state::OutputEvents, item::tool, CharacterState, Melee, MeleeConstructor, MeleeConstructorKind, StateUpdate, @@ -61,12 +62,12 @@ impl CharacterBehavior for Data { handle_move(data, &mut update, 0.1); let create_melee = |charge_frac: f32| { - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); self.static_data .melee_constructor .handle_scaling(charge_frac) - .create_melee(crit_data, tool_stats) + .create_melee(crit_mult, tool_stats) }; match self.stage_section { @@ -207,7 +208,7 @@ impl CharacterBehavior for Data { / self.static_data.charge_duration.as_secs_f32()) .min(1.0); - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( @@ -215,7 +216,7 @@ impl CharacterBehavior for Data { self.static_data .melee_constructor .handle_scaling(charge_frac) - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); update.character = CharacterState::DashMelee(Data { @@ -279,5 +280,5 @@ fn create_test_melee(static_data: StaticData) -> Melee { simultaneous_hits: 1, combo_gain: 0, }; - melee.create_melee((0.0, 0.0), tool::Stats::one()) + melee.create_melee(0.0, tool::Stats::one()) } diff --git a/common/src/states/dive_melee.rs b/common/src/states/dive_melee.rs index a67c921250..74fe539e69 100644 --- a/common/src/states/dive_melee.rs +++ b/common/src/states/dive_melee.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{character_state::OutputEvents, CharacterState, MeleeConstructor, StateUpdate}, states::{ behavior::{CharacterBehavior, JoinData}, @@ -94,7 +95,7 @@ impl CharacterBehavior for Data { StageSection::Action => { if !self.exhausted { // Attack - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); let scaling = self.max_vertical_speed / self.static_data.vertical_speed; let scaling = scaling.min(self.static_data.max_scaling); @@ -104,7 +105,7 @@ impl CharacterBehavior for Data { self.static_data .melee_constructor .handle_scaling(scaling) - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); if let CharacterState::DiveMelee(c) = &mut update.character { diff --git a/common/src/states/finisher_melee.rs b/common/src/states/finisher_melee.rs index d38375aaf8..6113489bf8 100644 --- a/common/src/states/finisher_melee.rs +++ b/common/src/states/finisher_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::{CombatBuff, CombatEffect}, + combat::{self, CombatBuff, CombatEffect}, comp::{character_state::OutputEvents, CharacterState, MeleeConstructor, StateUpdate}, states::{ behavior::{CharacterBehavior, JoinData}, @@ -102,12 +102,12 @@ impl CharacterBehavior for Data { } } - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( data.entity, - melee_constructor.create_melee(crit_data, tool_stats), + melee_constructor.create_melee(crit_mult, tool_stats), ); } else if self.timer < self.static_data.swing_duration { // Swings diff --git a/common/src/states/leap_melee.rs b/common/src/states/leap_melee.rs index 048e806257..873c066e23 100644 --- a/common/src/states/leap_melee.rs +++ b/common/src/states/leap_melee.rs @@ -1,5 +1,5 @@ use crate::{ - combat::CombatEffect, + combat::{self, CombatEffect}, comp::{character_state::OutputEvents, CharacterState, MeleeConstructor, StateUpdate}, event::LocalEvent, outcome::Outcome, @@ -129,14 +129,14 @@ impl CharacterBehavior for Data { }, StageSection::Recover => { if !self.exhausted { - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( data.entity, self.static_data .melee_constructor - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); update.character = CharacterState::LeapMelee(Data { diff --git a/common/src/states/leap_shockwave.rs b/common/src/states/leap_shockwave.rs index a38af7eee1..f2660b2080 100644 --- a/common/src/states/leap_shockwave.rs +++ b/common/src/states/leap_shockwave.rs @@ -1,7 +1,7 @@ use crate::{ combat::{ - Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, DamageKind, - DamageSource, GroupTarget, Knockback, + self, Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, + DamageKind, DamageSource, GroupTarget, Knockback, }, comp::{ character_state::OutputEvents, @@ -165,11 +165,10 @@ impl CharacterBehavior for Data { if let Some(effect) = self.static_data.damage_effect { damage = damage.with_effect(effect); } - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(poise) .with_effect(knockback) .with_combo_increment(); diff --git a/common/src/states/rapid_melee.rs b/common/src/states/rapid_melee.rs index c7f7f0fb3d..f54f088187 100644 --- a/common/src/states/rapid_melee.rs +++ b/common/src/states/rapid_melee.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{character_state::OutputEvents, CharacterState, MeleeConstructor, StateUpdate}, event::ServerEvent, states::{ @@ -76,14 +77,14 @@ impl CharacterBehavior for Data { c.exhausted = true; } - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( data.entity, self.static_data .melee_constructor - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); } else if self.timer < self.static_data.swing_duration { // Swings diff --git a/common/src/states/repeater_ranged.rs b/common/src/states/repeater_ranged.rs index f1bcce0972..e6d15093b3 100644 --- a/common/src/states/repeater_ranged.rs +++ b/common/src/states/repeater_ranged.rs @@ -1,5 +1,5 @@ use crate::{ - combat::CombatEffect, + combat::{self, CombatEffect}, comp::{ character_state::OutputEvents, Body, CharacterState, LightEmitter, Pos, ProjectileConstructor, StateUpdate, @@ -91,8 +91,7 @@ impl CharacterBehavior for Data { && update.energy.current() >= self.static_data.energy_cost { // Fire if input is pressed still - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); // Gets offsets let body_offsets = data @@ -101,7 +100,6 @@ impl CharacterBehavior for Data { let pos = Pos(data.pos.0 + body_offsets); let projectile = self.static_data.projectile.create_projectile( Some(*data.uid), - crit_chance, crit_mult, tool_stats, self.static_data.damage_effect, diff --git a/common/src/states/riposte_melee.rs b/common/src/states/riposte_melee.rs index aac88b5f8e..62ea21c07d 100644 --- a/common/src/states/riposte_melee.rs +++ b/common/src/states/riposte_melee.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{character_state::OutputEvents, CharacterState, MeleeConstructor, StateUpdate}, states::{ behavior::{CharacterBehavior, JoinData}, @@ -64,14 +65,14 @@ impl CharacterBehavior for Data { c.exhausted = true; } - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( data.entity, self.static_data .melee_constructor - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); } else if self.timer < self.static_data.swing_duration { // Swings diff --git a/common/src/states/shockwave.rs b/common/src/states/shockwave.rs index 55e8aecfb2..62ef95a635 100644 --- a/common/src/states/shockwave.rs +++ b/common/src/states/shockwave.rs @@ -1,7 +1,7 @@ use crate::{ combat::{ - Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, DamageKind, - DamageSource, GroupTarget, Knockback, + self, Attack, AttackDamage, AttackEffect, CombatEffect, CombatRequirement, Damage, + DamageKind, DamageSource, GroupTarget, Knockback, }, comp::{ character_state::OutputEvents, @@ -107,11 +107,10 @@ impl CharacterBehavior for Data { if let Some(effect) = self.static_data.damage_effect { damage = damage.with_effect(effect); } - let (crit_chance, crit_mult) = - get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_crit(crit_mult) .with_effect(poise) .with_effect(knockback) .with_combo_increment(); diff --git a/common/src/states/spin_melee.rs b/common/src/states/spin_melee.rs index eacf5de16e..8588460060 100644 --- a/common/src/states/spin_melee.rs +++ b/common/src/states/spin_melee.rs @@ -1,4 +1,5 @@ use crate::{ + combat, comp::{character_state::OutputEvents, CharacterState, Melee, MeleeConstructor, StateUpdate}, states::{ behavior::{CharacterBehavior, JoinData}, @@ -86,14 +87,14 @@ impl CharacterBehavior for Data { ..*self }); - let crit_data = get_crit_data(data, self.static_data.ability_info); + let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); data.updater.insert( data.entity, self.static_data .melee_constructor - .create_melee(crit_data, tool_stats), + .create_melee(crit_mult, tool_stats), ); } else if self.timer < self.static_data.swing_duration { if matches!( diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index f4176c457e..e304029e51 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -1,6 +1,5 @@ use crate::{ astar::Astar, - combat, comp::{ ability::{AbilityInitEvent, AbilityMeta, Capability, SpecifiedAbility, Stance}, arthropod, biped_large, biped_small, bird_medium, @@ -1359,32 +1358,6 @@ pub fn get_hands(data: &JoinData<'_>) -> (Option, Option) { ) } -/// Returns (critical chance, critical multiplier) which is calculated from -/// equipped weapon and equipped armor respectively -pub fn get_crit_data(data: &JoinData<'_>, ai: AbilityInfo) -> (f32, f32) { - const DEFAULT_CRIT_CHANCE: f32 = 0.1; - - let crit_chance = ai - .hand - .map(|hand| match hand { - HandInfo::TwoHanded | HandInfo::MainHand => EquipSlot::ActiveMainhand, - HandInfo::OffHand => EquipSlot::ActiveOffhand, - }) - .and_then(|slot| data.inventory.and_then(|inv| inv.equipped(slot))) - .and_then(|item| { - if let ItemKind::Tool(tool) = &*item.kind() { - Some(tool.stats(item.stats_durability_multiplier()).crit_chance) - } else { - None - } - }) - .unwrap_or(DEFAULT_CRIT_CHANCE); - - let crit_mult = combat::compute_crit_mult(data.inventory, data.msm); - - (crit_chance, crit_mult) -} - pub fn get_tool_stats(data: &JoinData<'_>, ai: AbilityInfo) -> tool::Stats { ai.hand .map(|hand| match hand { diff --git a/server/src/wiring.rs b/server/src/wiring.rs index 384be7b52e..052c50a3f6 100644 --- a/server/src/wiring.rs +++ b/server/src/wiring.rs @@ -190,7 +190,6 @@ impl WiringAction { body: Body::Object(object::Body::Arrow), projectile: constr.create_projectile( None, - 0.0, 1.0, tool::Stats::one(), None, diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index 5324adcb11..17468cb69e 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 Crit-Chance", ]; // Background Art @@ -1302,20 +1301,6 @@ impl<'a> Widget for Diary<'a> { }, (None, None) => String::new(), }, - "Weapon Crit-Chance" => { - let crit_fmt = |cc| cc * 100.0; - match (main_weap_stats, off_weap_stats) { - (Some(m_stats), Some(o_stats)) => format!( - "{:.1}% {:.1}%", - crit_fmt(m_stats.crit_chance), - crit_fmt(o_stats.crit_chance) - ), - (Some(stats), None) | (None, Some(stats)) => { - format!("{:.1}%", crit_fmt(stats.crit_chance)) - }, - (None, None) => String::new(), - } - }, unknown => unreachable!("{}", unknown), }; diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index c7281760cb..c64e5df6d1 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -113,7 +113,7 @@ 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(), diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index ebd5cbff98..ef1959e646 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -646,16 +646,6 @@ impl<'a> Widget for ItemTooltip<'a> { 2, ); - // Crit chance - stat_text( - format!( - "{} : {:.1}%", - i18n.get_msg("common-stats-crit_chance"), - stats.crit_chance * 100.0 - ), - 3, - ); - // Range stat_text( format!( @@ -663,7 +653,7 @@ impl<'a> Widget for ItemTooltip<'a> { i18n.get_msg("common-stats-range"), (stats.range - 1.0) * 100.0 ), - 4, + 3, ); // Energy Efficiency @@ -673,7 +663,7 @@ impl<'a> Widget for ItemTooltip<'a> { i18n.get_msg("common-stats-energy_efficiency"), (stats.energy_efficiency - 1.0) * 100.0 ), - 5, + 4, ); // Buff Strength @@ -683,7 +673,7 @@ impl<'a> Widget for ItemTooltip<'a> { i18n.get_msg("common-stats-buff_strength"), (stats.buff_strength - 1.0) * 100.0 ), - 6, + 5, ); if item.has_durability() { @@ -695,7 +685,7 @@ impl<'a> Widget for ItemTooltip<'a> { durability, Item::MAX_DURABILITY ), - 7, + 6, ) } @@ -713,10 +703,6 @@ impl<'a> Widget for ItemTooltip<'a> { tool_stats.effect_power, equipped_tool_stats.effect_power, ); - let crit_chance_diff = util::comparison( - tool_stats.crit_chance, - equipped_tool_stats.crit_chance, - ); let range_diff = util::comparison(tool_stats.range, equipped_tool_stats.range); let energy_efficiency_diff = util::comparison( @@ -762,14 +748,6 @@ impl<'a> Widget for ItemTooltip<'a> { ); diff_text(text, effect_power_diff.1, 2) } - if diff.crit_chance.abs() > f32::EPSILON { - let text = format!( - "{} {:.1}%", - &crit_chance_diff.0, - &diff.crit_chance * 100.0 - ); - diff_text(text, crit_chance_diff.1, 3) - } if diff.range.abs() > f32::EPSILON { let text = format!("{} {:.1}%", &range_diff.0, &diff.range * 100.0); diff_text(text, range_diff.1, 4) @@ -1142,28 +1120,6 @@ impl<'a> Widget for ItemTooltip<'a> { .down_from(state.ids.stats[1], V_PAD_STATS) .set(state.ids.stats[2], ui); - // Crit chance - let crit_chance_text = if is_primary { - format!( - "{} : {:.1}%", - i18n.get_msg("common-stats-crit_chance"), - stats.crit_chance * 100.0 - ) - } else { - format!( - "{} : x{:.2}", - i18n.get_msg("common-stats-crit_chance"), - stats.crit_chance - ) - }; - widget::Text::new(&crit_chance_text) - .graphics_for(id) - .parent(id) - .with_style(self.style.desc) - .color(text_color) - .down_from(state.ids.stats[2], V_PAD_STATS) - .set(state.ids.stats[3], ui); - // Range let range_text = if is_primary { format!( From d3b3bca6215dd9b07f6c306230059c4927f891d1 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 22 Oct 2023 17:00:09 -0400 Subject: [PATCH 02/10] Added precision --- assets/voxygen/i18n/be/common.ftl | 1 - assets/voxygen/i18n/ca/common.ftl | 1 - assets/voxygen/i18n/cs/common.ftl | 1 - assets/voxygen/i18n/de/common.ftl | 1 - assets/voxygen/i18n/en/common.ftl | 1 - assets/voxygen/i18n/es-419/common.ftl | 1 - assets/voxygen/i18n/es/common.ftl | 1 - assets/voxygen/i18n/eu/common.ftl | 1 - assets/voxygen/i18n/fr/common.ftl | 1 - assets/voxygen/i18n/hu/common.ftl | 1 - assets/voxygen/i18n/it/common.ftl | 1 - assets/voxygen/i18n/ja/common.ftl | 1 - assets/voxygen/i18n/ko/common.ftl | 1 - assets/voxygen/i18n/pl/common.ftl | 1 - assets/voxygen/i18n/pt-BR/common.ftl | 1 - assets/voxygen/i18n/ro/common.ftl | 1 - assets/voxygen/i18n/ru/common.ftl | 1 - assets/voxygen/i18n/sr/common.ftl | 1 - assets/voxygen/i18n/sv/common.ftl | 1 - assets/voxygen/i18n/th/common.ftl | 1 - assets/voxygen/i18n/tr/common.ftl | 1 - assets/voxygen/i18n/uk/common.ftl | 1 - assets/voxygen/i18n/vi/common.ftl | 1 - assets/voxygen/i18n/zh-Hans/common.ftl | 1 - common/src/combat.rs | 29 ++++++---- common/src/comp/beam.rs | 11 ++++ common/src/comp/buff.rs | 17 ++---- common/src/comp/poise.rs | 2 +- common/src/comp/stats.rs | 4 +- common/src/states/basic_beam.rs | 2 + common/systems/src/beam.rs | 40 ++++++++++++++ common/systems/src/buff.rs | 9 ++-- common/systems/src/melee.rs | 35 +++++++++++- common/systems/src/projectile.rs | 68 ++++++++++++++++++++++++ common/systems/src/shockwave.rs | 3 ++ server/src/events/entity_manipulation.rs | 5 +- server/src/state_ext.rs | 2 +- 37 files changed, 193 insertions(+), 58 deletions(-) diff --git a/assets/voxygen/i18n/be/common.ftl b/assets/voxygen/i18n/be/common.ftl index 25a89f2d36..6c2a61da9b 100644 --- a/assets/voxygen/i18n/be/common.ftl +++ b/assets/voxygen/i18n/be/common.ftl @@ -86,7 +86,6 @@ common-rand_name = Выпадковае імя common-stats-combat_rating = БР common-stats-power = Моц common-stats-speed = Хуткасць -common-stats-crit_chance = Крыт. шанец common-stats-crit_mult = Крыт. множнік common-stats-armor = Браня common-stats-poise_res = Супраціўленне аглушэнню diff --git a/assets/voxygen/i18n/ca/common.ftl b/assets/voxygen/i18n/ca/common.ftl index 4f3045710f..93878844ab 100644 --- a/assets/voxygen/i18n/ca/common.ftl +++ b/assets/voxygen/i18n/ca/common.ftl @@ -86,7 +86,6 @@ common-rand_name = Nom Aleatori common-stats-combat_rating = PC common-stats-power = Potència common-stats-speed = Velocitat -common-stats-crit_chance = Probabilitat de Crític common-stats-crit_mult = Multiplicador de Crític common-stats-armor = Armadura common-stats-poise_res = Resistència a l'Atordiment diff --git a/assets/voxygen/i18n/cs/common.ftl b/assets/voxygen/i18n/cs/common.ftl index f388c9d3a8..397ad02e5f 100644 --- a/assets/voxygen/i18n/cs/common.ftl +++ b/assets/voxygen/i18n/cs/common.ftl @@ -83,7 +83,6 @@ common-rand_name = Náhodné jméno common-stats-combat_rating = CR common-stats-power = Síla common-stats-speed = Rychlost -common-stats-crit_chance = Kritická šance common-stats-crit_mult = Krit Násobek common-stats-armor = Zbroj common-stats-poise_res = Odolnost omráčení diff --git a/assets/voxygen/i18n/de/common.ftl b/assets/voxygen/i18n/de/common.ftl index 82be3da263..b99ea0ef51 100644 --- a/assets/voxygen/i18n/de/common.ftl +++ b/assets/voxygen/i18n/de/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = Schnelligkeit common-stats-range = Reichweite common-stats-energy_efficiency = Ausdauereffizienz common-stats-buff_strength = Buff/Debuff Stärke -common-stats-crit_chance = Krit. Trefferchance common-stats-crit_mult = Krit. Multiplikator common-stats-armor = Rüstung common-stats-poise_res = Betäubungsresistenz diff --git a/assets/voxygen/i18n/en/common.ftl b/assets/voxygen/i18n/en/common.ftl index 0b69c4d703..a8324b14ee 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-crit_chance = Crit Chance common-stats-crit_mult = Crit Mult common-stats-armor = Armor common-stats-poise_res = Stun Res diff --git a/assets/voxygen/i18n/es-419/common.ftl b/assets/voxygen/i18n/es-419/common.ftl index 7bd540bc0d..85f3289bb8 100644 --- a/assets/voxygen/i18n/es-419/common.ftl +++ b/assets/voxygen/i18n/es-419/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = Velocidad common-stats-range = Rango common-stats-energy_efficiency = Eficiencia de energía common-stats-buff_strength = Fuerza de Mejora/Debilitación -common-stats-crit_chance = Probabilidad de Crítico common-stats-crit_mult = Multiplicador de Crítico common-stats-armor = Armadura common-stats-poise_res = Resistencia al aturdimiento diff --git a/assets/voxygen/i18n/es/common.ftl b/assets/voxygen/i18n/es/common.ftl index e6d605a0e5..a3f2d1b752 100644 --- a/assets/voxygen/i18n/es/common.ftl +++ b/assets/voxygen/i18n/es/common.ftl @@ -94,7 +94,6 @@ common-stats-effect-power = Potencia de estados alterados common-stats-range = Rango common-stats-energy_efficiency = Eficiencia de aguante common-stats-buff_strength = Potencia de estados beneficiosos -common-stats-crit_chance = Probabilidad de daño crítico common-stats-crit_mult = Multiplicador de crítico common-stats-armor = Armadura common-stats-poise_res = Resistencia al aturdimiento diff --git a/assets/voxygen/i18n/eu/common.ftl b/assets/voxygen/i18n/eu/common.ftl index ec99a548bf..5bc88819c3 100644 --- a/assets/voxygen/i18n/eu/common.ftl +++ b/assets/voxygen/i18n/eu/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = Abiadura common-stats-range = Maila common-stats-energy_efficiency = Energia eraginkortasuna common-stats-buff_strength = Buff/Debuff indarra -common-stats-crit_chance = Kritiko probabilitatea common-stats-crit_mult = Kritiko biderkatzailea common-stats-armor = Armadura common-stats-poise_res = Orekarako gaitasuna diff --git a/assets/voxygen/i18n/fr/common.ftl b/assets/voxygen/i18n/fr/common.ftl index c08d05c787..7d843992f1 100644 --- a/assets/voxygen/i18n/fr/common.ftl +++ b/assets/voxygen/i18n/fr/common.ftl @@ -95,7 +95,6 @@ common-stats-speed = Vitesse common-stats-range = Portée common-stats-energy_efficiency = Efficacité du coût d'Endurance common-stats-buff_strength = Montant de l'augmentation -common-stats-crit_chance = Chance de Crit common-stats-crit_mult = Multiplicateur de Crit common-stats-armor = Armure common-stats-poise_res = Résistance à l'étourdissement diff --git a/assets/voxygen/i18n/hu/common.ftl b/assets/voxygen/i18n/hu/common.ftl index 90d002785d..194fe51d3a 100644 --- a/assets/voxygen/i18n/hu/common.ftl +++ b/assets/voxygen/i18n/hu/common.ftl @@ -81,7 +81,6 @@ common-rand_name = Véletlenszerű név common-stats-combat_rating = KÉ common-stats-power = Erő common-stats-speed = Gyorsaság -common-stats-crit_chance = Kritikus találat esélye common-stats-crit_mult = Kritikus találat szorzója common-stats-armor = Páncélzat common-stats-poise_res = Megszédíthetőség diff --git a/assets/voxygen/i18n/it/common.ftl b/assets/voxygen/i18n/it/common.ftl index b71df0c51d..53c3d19f4c 100644 --- a/assets/voxygen/i18n/it/common.ftl +++ b/assets/voxygen/i18n/it/common.ftl @@ -97,7 +97,6 @@ common-stats-effect-power = Potenza effetto common-stats-range = Intervallo common-stats-energy_efficiency = Efficienza energia common-stats-buff_strength = Quantità di aumento/diminuzione -common-stats-crit_chance = Probabilità di critico common-stats-crit_mult = Moltiplicatore del critico common-stats-armor = Armatura common-stats-poise_res = Resistenza allo stordimento diff --git a/assets/voxygen/i18n/ja/common.ftl b/assets/voxygen/i18n/ja/common.ftl index 7cde6e04fa..92cb61c3fb 100644 --- a/assets/voxygen/i18n/ja/common.ftl +++ b/assets/voxygen/i18n/ja/common.ftl @@ -77,7 +77,6 @@ common-rand_appearance = ランダムに見た目を選択 common-rand_name = ランダムに名前を選ぶ common-stats-power = Power common-stats-speed = Speed -common-stats-crit_chance = Crit Chance common-stats-crit_mult = Crit Mult common-stats-armor = Armor common-stats-poise_res = Poise res diff --git a/assets/voxygen/i18n/ko/common.ftl b/assets/voxygen/i18n/ko/common.ftl index 21ee0dd011..26b3cab1b9 100644 --- a/assets/voxygen/i18n/ko/common.ftl +++ b/assets/voxygen/i18n/ko/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = 속도 common-stats-range = 사거리 common-stats-energy_efficiency = 기력 효율 common-stats-buff_strength = 힘 버프/디버프 -common-stats-crit_chance = 치명타 확률 common-stats-crit_mult = 치명타 배수 common-stats-armor = 방어력 common-stats-poise_res = 기절 저항 diff --git a/assets/voxygen/i18n/pl/common.ftl b/assets/voxygen/i18n/pl/common.ftl index 0f9e897401..ce80c5ce44 100644 --- a/assets/voxygen/i18n/pl/common.ftl +++ b/assets/voxygen/i18n/pl/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = Prędkość common-stats-range = Zasięg common-stats-energy_efficiency = Efektywność Energii common-stats-buff_strength = Siła Efektów Wzmacniających -common-stats-crit_chance = % na cios kryt. common-stats-crit_mult = Mnożnik ciosu kryt. common-stats-armor = Obrona common-stats-poise_res = Odp. na ogłuszenie diff --git a/assets/voxygen/i18n/pt-BR/common.ftl b/assets/voxygen/i18n/pt-BR/common.ftl index fc01916215..163def67d3 100644 --- a/assets/voxygen/i18n/pt-BR/common.ftl +++ b/assets/voxygen/i18n/pt-BR/common.ftl @@ -96,7 +96,6 @@ common-stats-effect-power = Poder de Efeito common-stats-range = Alcance common-stats-energy_efficiency = Eficiência Energética common-stats-buff_strength = Buff/Debuff de força -common-stats-crit_chance = Chance de Crítico common-stats-crit_mult = Multiplicador de Crítico common-stats-armor = Armadura common-stats-poise_res = Resistência a Atordoamento diff --git a/assets/voxygen/i18n/ro/common.ftl b/assets/voxygen/i18n/ro/common.ftl index e704c04cd7..465c12b1a6 100644 --- a/assets/voxygen/i18n/ro/common.ftl +++ b/assets/voxygen/i18n/ro/common.ftl @@ -90,7 +90,6 @@ common-stats-speed = Viteză common-stats-range = Distanță common-stats-energy_efficiency = Eficiența energiei common-stats-buff_strength = Buff/Debuff Strength -common-stats-crit_chance = Șansă Crit common-stats-crit_mult = Multiplicator Crit common-stats-armor = Armură common-stats-poise_res = Stun Res diff --git a/assets/voxygen/i18n/ru/common.ftl b/assets/voxygen/i18n/ru/common.ftl index ff038bc0cb..a8a10a601d 100644 --- a/assets/voxygen/i18n/ru/common.ftl +++ b/assets/voxygen/i18n/ru/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = Скорость common-stats-range = Дистанция common-stats-energy_efficiency = Энергоэффективность common-stats-buff_strength = Увеличение силы -common-stats-crit_chance = Шанс крита common-stats-crit_mult = Множитель крита common-stats-armor = Броня common-stats-poise_res = Оглушение diff --git a/assets/voxygen/i18n/sr/common.ftl b/assets/voxygen/i18n/sr/common.ftl index 96f6bceca2..3b65a9e050 100644 --- a/assets/voxygen/i18n/sr/common.ftl +++ b/assets/voxygen/i18n/sr/common.ftl @@ -83,7 +83,6 @@ common-rand_name = Насумично име common-stats-combat_rating = CR common-stats-power = Снага common-stats-speed = Брзина -common-stats-crit_chance = Крит Шанса common-stats-crit_mult = Мулти Крит common-stats-armor = Оклоп common-stats-poise_res = Отпорност на Омаму diff --git a/assets/voxygen/i18n/sv/common.ftl b/assets/voxygen/i18n/sv/common.ftl index 648f8a3d03..8e5ade34a1 100644 --- a/assets/voxygen/i18n/sv/common.ftl +++ b/assets/voxygen/i18n/sv/common.ftl @@ -97,7 +97,6 @@ common-stats-effect-power = Effektstyrka common-stats-range = Räckvidd common-stats-energy_efficiency = Energieffektivitet common-stats-buff_strength = Buff/Debuff-styrka -common-stats-crit_chance = Kritisk chans common-stats-crit_mult = Kritisk multi common-stats-armor = Rustning common-stats-poise_res = Motståndskraft diff --git a/assets/voxygen/i18n/th/common.ftl b/assets/voxygen/i18n/th/common.ftl index 101d9332fa..43f36c8ebb 100644 --- a/assets/voxygen/i18n/th/common.ftl +++ b/assets/voxygen/i18n/th/common.ftl @@ -93,7 +93,6 @@ common-stats-speed = ความเร็ว common-stats-range = ระยะโจมตี common-stats-energy_efficiency = ประสิทธิภาพพลังงาน common-stats-buff_strength = เสริมพลังความแข็งแกร่ง -common-stats-crit_chance = โอกาสคริติคอล common-stats-crit_mult = ความรุนแรงคริติคอล common-stats-armor = เกราะ common-stats-poise_res = ความคงทน diff --git a/assets/voxygen/i18n/tr/common.ftl b/assets/voxygen/i18n/tr/common.ftl index 3a5b07d3ee..09c56d5f00 100644 --- a/assets/voxygen/i18n/tr/common.ftl +++ b/assets/voxygen/i18n/tr/common.ftl @@ -83,7 +83,6 @@ common-rand_appearance = Rastgele görünüm common-stats-combat_rating = DP common-stats-power = Güç common-stats-speed = Hız -common-stats-crit_chance = Kritik Şansı common-stats-crit_mult = Kritik Çarpanı common-stats-armor = Zırh common-stats-energy_max = Maksimum Enerji diff --git a/assets/voxygen/i18n/uk/common.ftl b/assets/voxygen/i18n/uk/common.ftl index ac4ba9d875..1d0800a827 100644 --- a/assets/voxygen/i18n/uk/common.ftl +++ b/assets/voxygen/i18n/uk/common.ftl @@ -97,7 +97,6 @@ common-stats-effect-power = Сила ефекту common-stats-range = Дистанція common-stats-energy_efficiency = Енергоощадливість common-stats-buff_strength = Сила бафу/дебафу -common-stats-crit_chance = Крит. шанс common-stats-crit_mult = Крит. множник common-stats-armor = Броня common-stats-poise_res = Супротив приголомшенню diff --git a/assets/voxygen/i18n/vi/common.ftl b/assets/voxygen/i18n/vi/common.ftl index 1656af3afe..2e059cb1e7 100644 --- a/assets/voxygen/i18n/vi/common.ftl +++ b/assets/voxygen/i18n/vi/common.ftl @@ -81,7 +81,6 @@ common-rand_name = Tên ngẫu nhiên common-stats-combat_rating = CR common-stats-power = Sức Mạnh common-stats-speed = Tốc Độ -common-stats-crit_chance = Tỉ Lệ Chí Mạng common-stats-armor = Giáp common-stats-energy_max = Năng Lượng Tối Đa common-stats-energy_reward = Thưởng Năng Lượng diff --git a/assets/voxygen/i18n/zh-Hans/common.ftl b/assets/voxygen/i18n/zh-Hans/common.ftl index d7190560e2..b4335c1626 100644 --- a/assets/voxygen/i18n/zh-Hans/common.ftl +++ b/assets/voxygen/i18n/zh-Hans/common.ftl @@ -95,7 +95,6 @@ common-stats-effect-power = 效果威力 common-stats-range = 范围 common-stats-energy_efficiency = 耐力消耗 common-stats-buff_strength = 增幅 -common-stats-crit_chance = 暴击率 common-stats-crit_mult = 暴击倍率 common-stats-armor = 护甲 common-stats-poise_res = 韧性 diff --git a/common/src/combat.rs b/common/src/combat.rs index 79fc586c4e..bc46c73fb2 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -44,6 +44,12 @@ pub enum AttackSource { Explosion, } +pub const FULL_FLANK_ANGLE: f32 = std::f32::consts::PI / 4.0; +pub const PARTIAL_FLANK_ANGLE: f32 = std::f32::consts::PI * 3.0 / 4.0; +// NOTE: Do we want to change this to be a configurable parameter on body? +pub const PROJECTILE_HEADSHOT_PROPORTION: f32 = 0.1; +pub const BEAM_DURATION_PRECISION: f32 = 2.5; + #[derive(Copy, Clone)] pub struct AttackerInfo<'a> { pub entity: EcsEntity, @@ -73,6 +79,7 @@ pub struct AttackOptions { pub target_dodging: bool, pub may_harm: bool, pub target_group: GroupTarget, + pub precision_mult: Option, } #[derive(Clone, Debug, Serialize, Deserialize)] // TODO: Yeet clone derive @@ -202,6 +209,7 @@ impl Attack { target_dodging, may_harm, target_group, + precision_mult, } = options; // target == OutOfGroup is basic heuristic that this @@ -217,7 +225,10 @@ impl Attack { matches!(attack_effect.target, Some(GroupTarget::OutOfGroup)) && (target_dodging || !may_harm) }; - let is_crit = false; + let precision_mult = attacker + .and_then(|a| a.stats) + .and_then(|s| s.precision_multiplier_override) + .or(precision_mult); let mut is_applied = false; let mut accumulated_damage = 0.0; let damage_modifier = attacker @@ -244,7 +255,7 @@ impl Attack { let change = damage.damage.calculate_health_change( damage_reduction, attacker.map(|x| x.into()), - is_crit, + precision_mult, self.crit_multiplier, strength_modifier * damage_modifier, time, @@ -273,7 +284,7 @@ impl Attack { by: attacker.map(|x| x.into()), cause: Some(damage.damage.source), time, - crit: is_crit, + crit: precision_mult.is_some(), instance: damage_instance, }; emit(ServerEvent::HealthChange { @@ -324,7 +335,7 @@ impl Attack { by: attacker.map(|x| x.into()), cause: Some(damage.damage.source), instance: damage_instance, - crit: is_crit, + crit: precision_mult.is_some(), time, }; emit(ServerEvent::HealthChange { @@ -1014,18 +1025,14 @@ impl Damage { self, damage_reduction: f32, damage_contributor: Option, - is_crit: bool, + precision_mult: Option, crit_mult: f32, damage_modifier: f32, time: Time, instance: u64, ) -> HealthChange { let mut damage = self.value * damage_modifier; - let critdamage = if is_crit { - damage * (crit_mult - 1.0) - } else { - 0.0 - }; + let critdamage = damage * precision_mult.unwrap_or(0.0) * (crit_mult - 1.0); match self.source { DamageSource::Melee | DamageSource::Projectile @@ -1042,7 +1049,7 @@ impl Damage { by: damage_contributor, cause: Some(self.source), time, - crit: is_crit, + crit: precision_mult.is_some(), instance, } }, diff --git a/common/src/comp/beam.rs b/common/src/comp/beam.rs index 20f5147996..431a099792 100644 --- a/common/src/comp/beam.rs +++ b/common/src/comp/beam.rs @@ -1,4 +1,5 @@ use crate::{combat::Attack, resources::Secs}; +use hashbrown::HashMap; use serde::{Deserialize, Serialize}; use specs::{Component, DerefFlaggedStorage, Entity as EcsEntity}; use vek::*; @@ -14,6 +15,16 @@ pub struct Beam { pub bezier: QuadraticBezier3, #[serde(skip)] pub hit_entities: Vec, + #[serde(skip)] + pub hit_durations: HashMap, +} + +impl Beam { + pub fn hit_entities_and_durations( + &mut self, + ) -> (&Vec, &mut HashMap) { + (&self.hit_entities, &mut self.hit_durations) + } } impl Component for Beam { diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs index 3ea218d601..08d9f43f2f 100644 --- a/common/src/comp/buff.rs +++ b/common/src/comp/buff.rs @@ -333,10 +333,7 @@ impl BuffKind { BuffKind::Hastened => vec![ BuffEffect::MovementSpeed(1.0 + data.strength), BuffEffect::AttackSpeed(1.0 + data.strength), - BuffEffect::CriticalChance { - kind: ModifierKind::Multiplicative, - val: 0.0, - }, + BuffEffect::PrecisionOverride(0.0), ], BuffKind::Fortitude => vec![ BuffEffect::PoiseReduction(nn_scaling(data.strength)), @@ -388,10 +385,7 @@ impl BuffKind { AttackEffect::new(None, CombatEffect::Lifesteal(data.strength)) .with_requirement(CombatRequirement::TargetHasBuff(BuffKind::Bleeding)), )], - BuffKind::ImminentCritical => vec![BuffEffect::CriticalChance { - kind: ModifierKind::Additive, - val: 1.0, - }], + BuffKind::ImminentCritical => vec![BuffEffect::PrecisionOverride(1.0)], BuffKind::Fury => vec![BuffEffect::AttackEffect( AttackEffect::new(None, CombatEffect::Combo(data.strength.round() as i32)) .with_requirement(CombatRequirement::AnyDamage), @@ -558,11 +552,8 @@ pub enum BuffEffect { }, /// Modifier to the amount of damage dealt with attacks AttackDamage(f32), - /// Multiplies crit chance of attacks - CriticalChance { - kind: ModifierKind, - val: f32, - }, + /// Overrides the precision multiplier applied to an attack + PrecisionOverride(f32), /// Changes body. BodyChange(Body), BuffImmunity(BuffKind), diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index 4fb69b8932..1db1736a24 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -134,7 +134,7 @@ impl PoiseState { } /// Returns the multiplier on poise damage to health damage for when the - /// target is in a poise state + /// target is in a poise state, also is used for precision pub fn damage_multiplier(&self) -> f32 { match self { Self::Interrupted => 0.1, diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs index 30abed94bb..c30f06a981 100644 --- a/common/src/comp/stats.rs +++ b/common/src/comp/stats.rs @@ -63,7 +63,7 @@ pub struct Stats { pub max_energy_modifiers: StatsModifier, pub poise_damage_modifier: f32, pub attack_damage_modifier: f32, - pub crit_chance_modifier: StatsModifier, + pub precision_multiplier_override: Option, pub swim_speed_modifier: f32, /// This adds effects to any attacks that the entity makes pub effects_on_attack: Vec, @@ -90,7 +90,7 @@ impl Stats { max_energy_modifiers: StatsModifier::default(), poise_damage_modifier: 1.0, attack_damage_modifier: 1.0, - crit_chance_modifier: StatsModifier::default(), + precision_multiplier_override: None, swim_speed_modifier: 1.0, effects_on_attack: Vec::new(), mitigations_penetration: 0.0, diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index ad58284c59..e2dcf8fc38 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -17,6 +17,7 @@ use crate::{ terrain::Block, util::Dir, }; +use hashbrown::HashMap; use serde::{Deserialize, Serialize}; use std::time::Duration; use vek::*; @@ -132,6 +133,7 @@ impl CharacterBehavior for Data { duration: self.static_data.beam_duration, tick_dur: Secs(1.0 / self.static_data.tick_rate as f64), hit_entities: Vec::new(), + hit_durations: HashMap::new(), specifier: self.static_data.specifier, bezier: QuadraticBezier3 { start: data.pos.0, diff --git a/common/systems/src/beam.rs b/common/systems/src/beam.rs index 13725403c2..470c02fd49 100644 --- a/common/systems/src/beam.rs +++ b/common/systems/src/beam.rs @@ -73,6 +73,11 @@ impl<'a> System<'a> for Sys { .for_each(|(pos, ori, char_state, mut beam)| { // Clear hit entities list if list should be cleared if read_data.time.0 % beam.tick_dur.0 < read_data.dt.0 as f64 { + let (hit_entities, hit_durations) = beam.hit_entities_and_durations(); + hit_durations.retain(|e, _| hit_entities.contains(e)); + for entity in hit_entities { + *hit_durations.entry(*entity).or_insert(0) += 1; + } beam.hit_entities.clear(); } // Update start, end, and control positions of beam bezier @@ -227,10 +232,45 @@ impl<'a> System<'a> for Sys { Some(entity), target, ); + + let precision_from_flank = { + let beam_dir = beam.bezier.ctrl - beam.bezier.start; + let angle = target_info.ori.map_or(std::f32::consts::PI, |t_ori| { + t_ori.look_dir().angle_between(beam_dir) + }); + if angle < combat::FULL_FLANK_ANGLE { + Some(1.0) + } else if angle < combat::PARTIAL_FLANK_ANGLE { + Some(0.5) + } else { + None + } + }; + + let precision_from_time = { + if let Some(ticks) = beam.hit_durations.get(&target) { + let dur = *ticks as f32 * beam.tick_dur.0 as f32; + let mult = + (dur / combat::BEAM_DURATION_PRECISION).clamp(0.0, 1.0); + Some(mult) + } else { + None + } + }; + + // Is there a more idiomatic way to do this (taking the max of 2 + // options)? + let precision_mult = precision_from_flank + .map(|flank| { + precision_from_time.map_or(flank, |head: f32| head.max(flank)) + }) + .or(precision_from_time); + let attack_options = AttackOptions { target_dodging, may_harm, target_group, + precision_mult, }; beam.attack.apply_attack( diff --git a/common/systems/src/buff.rs b/common/systems/src/buff.rs index aa6ef8a521..41f5fc5b00 100644 --- a/common/systems/src/buff.rs +++ b/common/systems/src/buff.rs @@ -674,9 +674,12 @@ fn execute_effect( BuffEffect::AttackDamage(dam) => { stat.attack_damage_modifier *= *dam; }, - BuffEffect::CriticalChance { kind, val } => match kind { - ModifierKind::Additive => stat.crit_chance_modifier.add_mod += val, - ModifierKind::Multiplicative => stat.crit_chance_modifier.mult_mod *= val, + BuffEffect::PrecisionOverride(val) => { + // Use lower of precision multiplier overrides + stat.precision_multiplier_override = stat + .precision_multiplier_override + .map(|mult| mult.min(*val)) + .or(Some(*val)); }, BuffEffect::BodyChange(b) => { // For when an entity is under the effects of multiple de/buffs that change the diff --git a/common/systems/src/melee.rs b/common/systems/src/melee.rs index 0558dd6a5f..b8dd7516c8 100644 --- a/common/systems/src/melee.rs +++ b/common/systems/src/melee.rs @@ -196,6 +196,8 @@ impl<'a> System<'a> for Sys { stats: read_data.stats.get(attacker), }); + let target_ori = read_data.orientations.get(target); + let target_char_state = read_data.char_states.get(target); let target_info = TargetInfo { entity: target, uid: *uid_b, @@ -203,8 +205,8 @@ impl<'a> System<'a> for Sys { stats: read_data.stats.get(target), health: read_data.healths.get(target), pos: pos_b.0, - ori: read_data.orientations.get(target), - char_state: read_data.char_states.get(target), + ori: target_ori, + char_state: target_char_state, energy: read_data.energies.get(target), buffs: read_data.buffs.get(target), }; @@ -218,10 +220,39 @@ impl<'a> System<'a> for Sys { target, ); + let precision_from_flank = { + let angle = target_ori.map_or(std::f32::consts::PI, |t_ori| { + t_ori.look_dir().angle_between(*ori.look_dir()) + }); + if angle < combat::FULL_FLANK_ANGLE { + Some(1.0) + } else if angle < combat::PARTIAL_FLANK_ANGLE { + Some(0.5) + } else { + None + } + }; + + let precision_from_poise = { + if let Some(CharacterState::Stunned(data)) = target_char_state { + Some(data.static_data.poise_state.damage_multiplier()) + } else { + None + } + }; + + // Is there a more idiomatic way to do this (taking the max of 2 options)? + let precision_mult = precision_from_flank + .map(|flank| { + precision_from_poise.map_or(flank, |head: f32| head.max(flank)) + }) + .or(precision_from_poise); + let attack_options = AttackOptions { target_dodging, may_harm, target_group, + precision_mult, }; let strength = diff --git a/common/systems/src/projectile.rs b/common/systems/src/projectile.rs index 2357c313ae..79fc5ec785 100644 --- a/common/systems/src/projectile.rs +++ b/common/systems/src/projectile.rs @@ -157,6 +157,7 @@ impl<'a> System<'a> for Sys { owner, ori: orientations.get(entity), pos, + vel, }; let target = entity_of(other); @@ -247,6 +248,7 @@ struct ProjectileInfo<'a> { owner: Option, ori: Option<&'a Ori>, pos: &'a Pos, + vel: &'a Vel, } struct ProjectileTargetInfo<'a> { @@ -343,10 +345,76 @@ fn dispatch_hit( .get(target) .and_then(|cs| cs.attack_immunities()) .map_or(false, |i| i.projectiles); + + let precision_from_flank = { + let angle = target_info.ori.map_or(std::f32::consts::PI, |t_ori| { + t_ori.look_dir().angle_between(*projectile_dir) + }); + if angle < combat::FULL_FLANK_ANGLE { + Some(1.0) + } else if angle < combat::PARTIAL_FLANK_ANGLE { + Some(0.5) + } else { + None + } + }; + + let precision_from_head = { + let curr_pos = projectile_info.pos.0; + let last_pos = projectile_info.pos.0 - projectile_info.vel.0 * read_data.dt.0; + let vel = projectile_info.vel.0; + let (target_height, target_radius) = read_data + .bodies + .get(target) + .map_or((0.0, 0.0), |b| (b.height(), b.max_radius())); + let head_top_pos = target_pos.with_z(target_pos.z + target_height); + let head_bottom_pos = head_top_pos.with_z( + head_top_pos.z - target_height * combat::PROJECTILE_HEADSHOT_PROPORTION, + ); + let headshot = if (curr_pos.z < head_bottom_pos.z && last_pos.z < head_bottom_pos.z) + || (curr_pos.z > head_top_pos.z && last_pos.z > head_top_pos.z) + { + false + } else if curr_pos.z > head_top_pos.z + || curr_pos.z < head_bottom_pos.z + || last_pos.z > head_top_pos.z + || last_pos.z < head_bottom_pos.z + { + let proj_top_intersection = { + let t = (head_top_pos.z - last_pos.z) / vel.z; + last_pos + vel * t + }; + let proj_bottom_intersection = { + let t = (head_bottom_pos.z - last_pos.z) / vel.z; + last_pos + vel * t + }; + head_top_pos.distance_squared(proj_top_intersection) < target_radius.powi(2) + || head_bottom_pos.distance_squared(proj_bottom_intersection) + < target_radius.powi(2) + } else { + let trajectory = LineSegment3 { + start: last_pos, + end: curr_pos, + }; + let head_middle_pos = head_bottom_pos.with_z( + head_bottom_pos.z + + target_height * combat::PROJECTILE_HEADSHOT_PROPORTION * 0.5, + ); + trajectory.distance_to_point(head_middle_pos) < target_radius + }; + if headshot { Some(1.0) } else { None } + }; + + // Is there a more idiomatic way to do this (taking the max of 2 options)? + let precision_mult = precision_from_flank + .map(|flank| precision_from_head.map_or(flank, |head: f32| head.max(flank))) + .or(precision_from_head); + let attack_options = AttackOptions { target_dodging, may_harm, target_group: projectile_target_info.target_group, + precision_mult, }; attack.apply_attack( diff --git a/common/systems/src/shockwave.rs b/common/systems/src/shockwave.rs index 837647ebf4..9ddcdc140c 100644 --- a/common/systems/src/shockwave.rs +++ b/common/systems/src/shockwave.rs @@ -234,10 +234,13 @@ impl<'a> System<'a> for Sys { shockwave_owner, target, ); + // Shockwaves aren't precise, and thus cannot be a precise strike + let precision_mult = None; let attack_options = AttackOptions { target_dodging, may_harm, target_group, + precision_mult, }; shockwave.properties.attack.apply_attack( diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 0f949802d4..b20e3ec2a1 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -670,7 +670,7 @@ pub fn handle_land_on_ground( let change = damage.calculate_health_change( damage_reduction, None, - false, + None, 0.0, 1.0, *time, @@ -1049,10 +1049,13 @@ pub fn handle_explosion(server: &Server, pos: Vec3, explosion: Explosion, o // PvP check let may_harm = combat::may_harm(alignments, players, id_maps, owner_entity, entity_b); + // Explosions aren't precise, and thus cannot be a precise strike + let precision_mult = None; let attack_options = combat::AttackOptions { target_dodging, may_harm, target_group, + precision_mult, }; let time = server.state.ecs().read_resource::