diff --git a/CHANGELOG.md b/CHANGELOG.md index 86e12adcb2..506c61a84a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `SnowGlitter` experimental shader. - Crafting recipe for Cloverleaf glider. - Burning Potion that applies the Burning effect to the user +- Precision ### Changed @@ -71,6 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Medium and large potions from all loot tables - LoD pop-in effect - Removed Dullahans from halloween event +- Random critical hits ### Fixed - Fixed wild roaming cyclop loot table to not drop the quarry key diff --git a/assets/common/items/armor/brinestone/crown.ron b/assets/common/items/armor/brinestone/crown.ron index 3c2d4f3436..f2fd2b7d90 100644 --- a/assets/common/items/armor/brinestone/crown.ron +++ b/assets/common/items/armor/brinestone/crown.ron @@ -7,8 +7,9 @@ ItemDef( protection: Some(Normal(8.0)), poise_resilence: Some(Normal(4.0)), energy_reward: Some(0.15), - crit_power: Some(0.05), - )), )), + precision_power: Some(-0.05), + )), + )), quality: Legendary, tags: [], ) diff --git a/assets/common/items/armor/cultist/bandana.ron b/assets/common/items/armor/cultist/bandana.ron index d08e1b0e39..9ffa1976a5 100644 --- a/assets/common/items/armor/cultist/bandana.ron +++ b/assets/common/items/armor/cultist/bandana.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.0), energy_reward: Some(0.025), - crit_power: Some(0.008), + precision_power: Some(0.008), stealth: Some(0.04), )), )), diff --git a/assets/common/items/armor/cultist/necklace.ron b/assets/common/items/armor/cultist/necklace.ron index 1fb6a492ff..73d9f3fdc6 100644 --- a/assets/common/items/armor/cultist/necklace.ron +++ b/assets/common/items/armor/cultist/necklace.ron @@ -7,7 +7,7 @@ ItemDef( protection: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.0275), - crit_power: Some(0.015), + precision_power: Some(0.015), )), )), quality: Epic, diff --git a/assets/common/items/armor/cultist/ring.ron b/assets/common/items/armor/cultist/ring.ron index bab00ee455..c6a117df76 100644 --- a/assets/common/items/armor/cultist/ring.ron +++ b/assets/common/items/armor/cultist/ring.ron @@ -7,7 +7,7 @@ ItemDef( protection: Some(Normal(0.5)), energy_max: Some(2.5), energy_reward: Some(0.0125), - crit_power: Some(0.01), + precision_power: Some(0.01), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index 793897c289..9ec61cbf5e 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - crit_power: Some(0.006), + precision_power: Some(0.006), stealth: Some(0.14), )), )), diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron index 3cb193e589..682e5c2aed 100644 --- a/assets/common/items/armor/misc/head/bandana/thief.ron +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - crit_power: Some(0.0045), + precision_power: Some(0.0045), stealth: Some(0.18), )), )), diff --git a/assets/common/items/armor/misc/head/bear_bonnet.ron b/assets/common/items/armor/misc/head/bear_bonnet.ron index 369dc77fef..68b88b073f 100644 --- a/assets/common/items/armor/misc/head/bear_bonnet.ron +++ b/assets/common/items/armor/misc/head/bear_bonnet.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(12.0)), - crit_power: Some(0.0095), + precision_power: Some(0.0095), stealth: Some(0.21), )), )), diff --git a/assets/common/items/armor/misc/head/boreal_warhelm.ron b/assets/common/items/armor/misc/head/boreal_warhelm.ron index 7f5fe5197a..6594f99c82 100644 --- a/assets/common/items/armor/misc/head/boreal_warhelm.ron +++ b/assets/common/items/armor/misc/head/boreal_warhelm.ron @@ -7,7 +7,7 @@ ItemDef( protection: Some(Normal(9.82)), poise_resilience: Some(Normal(5.5)), energy_max: Some(-6.5), - crit_power: Some(0.065), + precision_power: Some(0.065), stealth: Some(0.05), )), )), diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index ba85e75c8b..1661c2802e 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -7,7 +7,7 @@ ItemDef( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(2.0)), energy_max: Some(5.0), - crit_power: Some(0.006), + precision_power: Some(0.006), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index 9ada0b1475..c641da84cf 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(3.0)), - crit_power: Some(0.0095), + precision_power: Some(0.0095), stealth: Some(0.21), )), )), diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index 33231cfe1d..5d08dad104 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(2.5)), - crit_power: Some(0.016), + precision_power: Some(0.016), stealth: Some(0.22), )), )), diff --git a/assets/common/items/armor/misc/head/howl_cowl.ron b/assets/common/items/armor/misc/head/howl_cowl.ron index 93a56bb4bd..45df5b15b2 100644 --- a/assets/common/items/armor/misc/head/howl_cowl.ron +++ b/assets/common/items/armor/misc/head/howl_cowl.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(4.0)), - crit_power: Some(0.065), + precision_power: Some(0.065), stealth: Some(0.21), )), )), diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index 82d3107425..ba7fb7c85c 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.036), + precision_power: Some(0.036), )), )), quality: High, diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index e1488ac7ed..cf86f5b97b 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head, stats: Direct(( - crit_power: Some(0.016), + precision_power: Some(0.016), stealth: Some(0.1), )), )), diff --git a/assets/common/items/armor/misc/head/winged_coronet.ron b/assets/common/items/armor/misc/head/winged_coronet.ron index 1fbb290b71..a6f7af062b 100644 --- a/assets/common/items/armor/misc/head/winged_coronet.ron +++ b/assets/common/items/armor/misc/head/winged_coronet.ron @@ -7,7 +7,7 @@ ItemDef( protection: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.04), - crit_power: Some(0.006), + precision_power: Some(0.006), stealth: Some(0.17), )), )), diff --git a/assets/common/items/armor/misc/neck/amethyst.ron b/assets/common/items/armor/misc/neck/amethyst.ron index c278af2a7c..82732fbd88 100644 --- a/assets/common/items/armor/misc/neck/amethyst.ron +++ b/assets/common/items/armor/misc/neck/amethyst.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(1.0)), energy_reward: Some(0.075), - crit_power: Some(-0.03), + precision_power: Some(-0.03), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron index 1211d0a123..300004648a 100644 --- a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron +++ b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron @@ -5,9 +5,9 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(2.0)), - crit_power: Some(0.15), + precision_power: Some(0.1), )), )), quality: Legendary, tags: [], -) \ No newline at end of file +) diff --git a/assets/common/items/armor/misc/neck/diamond.ron b/assets/common/items/armor/misc/neck/diamond.ron index 05b1ce4ac9..53961b4247 100644 --- a/assets/common/items/armor/misc/neck/diamond.ron +++ b/assets/common/items/armor/misc/neck/diamond.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(1.0)), energy_reward: Some(-0.0375), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/fang.ron b/assets/common/items/armor/misc/neck/fang.ron index 9ab3951805..e76a627556 100644 --- a/assets/common/items/armor/misc/neck/fang.ron +++ b/assets/common/items/armor/misc/neck/fang.ron @@ -5,7 +5,7 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - crit_power: Some(0.07), + precision_power: Some(0.07), energy_max: Some(-3.5), )), )), diff --git a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron index ac1e1d43d8..a82f9f85dd 100644 --- a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron +++ b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron @@ -7,7 +7,7 @@ ItemDef( protection: Some(Normal(1.0)), energy_max: Some(8.0), energy_reward: Some(0.04), - crit_power: Some(-0.06), + precision_power: Some(-0.06), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/ruby.ron b/assets/common/items/armor/misc/neck/ruby.ron index 5f4bf02e92..e2ebebef4d 100644 --- a/assets/common/items/armor/misc/neck/ruby.ron +++ b/assets/common/items/armor/misc/neck/ruby.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(1.0)), energy_reward: Some(0.1125), - crit_power: Some(-0.045), + precision_power: Some(-0.045), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/sapphire.ron b/assets/common/items/armor/misc/neck/sapphire.ron index dc900afe1c..b7c6096bbf 100644 --- a/assets/common/items/armor/misc/neck/sapphire.ron +++ b/assets/common/items/armor/misc/neck/sapphire.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(1.0)), energy_reward: Some(-0.0225), - crit_power: Some(0.0225), + precision_power: Some(0.0225), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/amethyst.ron b/assets/common/items/armor/misc/ring/amethyst.ron index ca31828c6b..e0f08ce81a 100644 --- a/assets/common/items/armor/misc/ring/amethyst.ron +++ b/assets/common/items/armor/misc/ring/amethyst.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_reward: Some(0.05), - crit_power: Some(-0.02), + precision_power: Some(-0.02), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/diamond.ron b/assets/common/items/armor/misc/ring/diamond.ron index e38937cd99..ab8698de40 100644 --- a/assets/common/items/armor/misc/ring/diamond.ron +++ b/assets/common/items/armor/misc/ring/diamond.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_reward: Some(-0.025), - crit_power: Some(0.05), + precision_power: Some(0.04), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/ring/ruby.ron b/assets/common/items/armor/misc/ring/ruby.ron index 9e950a83c0..590327aff6 100644 --- a/assets/common/items/armor/misc/ring/ruby.ron +++ b/assets/common/items/armor/misc/ring/ruby.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_reward: Some(0.075), - crit_power: Some(-0.03), + precision_power: Some(-0.03), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/ring/sapphire.ron b/assets/common/items/armor/misc/ring/sapphire.ron index c2bebeecce..a97c11af1e 100644 --- a/assets/common/items/armor/misc/ring/sapphire.ron +++ b/assets/common/items/armor/misc/ring/sapphire.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_reward: Some(-0.015), - crit_power: Some(0.015), + precision_power: Some(0.015), )), )), quality: Moderate, diff --git a/assets/common/items/armor/pirate/hat.ron b/assets/common/items/armor/pirate/hat.ron index e40d0a23f3..1e8df990cb 100644 --- a/assets/common/items/armor/pirate/hat.ron +++ b/assets/common/items/armor/pirate/hat.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(2.5)), energy_reward: Some(0.025), - crit_power: Some(0.08), + precision_power: Some(0.08), )), )), quality: Epic, diff --git a/assets/common/items/debug/admin.ron b/assets/common/items/debug/admin.ron index 047bbbfeae..108af49da0 100644 --- a/assets/common/items/debug/admin.ron +++ b/assets/common/items/debug/admin.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Invincible), energy_max: Some(900.0), energy_reward: Some(9.0), - crit_power: Some(1.0), + precision_power: Some(1.0), stealth: Some(1000.0), )), )), 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_armor/biped_small/adlet/chest/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron index d576702d01..e7e2340a50 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.06), + precision_power: Some(0.06), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron index eeb832d21c..a1da835ab1 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.4), energy_reward: Some(0.054), - crit_power: Some(0.05), + precision_power: Some(0.05), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron index e4075bf2a9..440e95423a 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.4), energy_reward: Some(0.054), - crit_power: Some(0.05), + precision_power: Some(0.05), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron index ce03f4e99c..95b0a08988 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(1.8), energy_reward: Some(0.018), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron index a8e6b528cb..2fd0a99f79 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(1.8), energy_reward: Some(0.018), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron index a228dd8f11..d24a6f2e46 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(1.8), energy_reward: Some(0.018), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron index e5a9d98608..6cc59329e8 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron index d425a19731..58a4b7b54d 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron index 348d27fc02..1f58f2e596 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(1.8), energy_reward: Some(0.018), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron index dc950f32fb..8f97de0768 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron index 3532accdd5..71c2c000ae 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron index 3c2fb6e019..c71858758b 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(3.6), energy_reward: Some(0.04), - crit_power: Some(0.32), + precision_power: Some(0.32), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron index 4dc8320066..3d826839d0 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron index 6611f5d7c3..179f98f658 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron index df0da945de..8e376c0896 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(3.6), energy_reward: Some(0.04), - crit_power: Some(0.32), + precision_power: Some(0.32), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron index f727a345ce..85a6843cdd 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(3.0)), energy_max: Some(0.8), energy_reward: Some(0.01), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron index c0c833b16e..36c2e9fd06 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(3.0)), energy_max: Some(0.8), energy_reward: Some(0.01), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron index 3d3f794217..fb37283cef 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(3.0)), energy_max: Some(0.8), energy_reward: Some(0.01), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron index 190e3b5175..e8a498506f 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/chest/warrior.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(60.0)), energy_max: Some(120.0), energy_reward: Some(0.027), - crit_power: Some(0.025), + precision_power: Some(0.025), )), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron index 97c6243054..a01f14aa74 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/foot/warrior.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron index 272b0bd0cb..31846a6486 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/hand/warrior.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_small/boreal/head/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/head/warrior.ron index 5ae2e6b6a8..657175f312 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/head/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/head/warrior.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron b/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron index baffe495f5..3410209e6b 100644 --- a/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron +++ b/assets/common/items/npc_armor/biped_small/boreal/pants/warrior.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/biped_small/bushly/chest/bushly.ron b/assets/common/items/npc_armor/biped_small/bushly/chest/bushly.ron index 10af836e01..fae053f1a7 100644 --- a/assets/common/items/npc_armor/biped_small/bushly/chest/bushly.ron +++ b/assets/common/items/npc_armor/biped_small/bushly/chest/bushly.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/bushly/foot/bushly.ron b/assets/common/items/npc_armor/biped_small/bushly/foot/bushly.ron index dfb4a32f50..771a737c7d 100644 --- a/assets/common/items/npc_armor/biped_small/bushly/foot/bushly.ron +++ b/assets/common/items/npc_armor/biped_small/bushly/foot/bushly.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron b/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron index cbc2bc8783..57e22255ab 100644 --- a/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron +++ b/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/bushly/pants/bushly.ron b/assets/common/items/npc_armor/biped_small/bushly/pants/bushly.ron index 7741d75720..d531f9aea4 100644 --- a/assets/common/items/npc_armor/biped_small/bushly/pants/bushly.ron +++ b/assets/common/items/npc_armor/biped_small/bushly/pants/bushly.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/clockwork/chest/clockwork.ron b/assets/common/items/npc_armor/biped_small/clockwork/chest/clockwork.ron index 7e29babf62..e07befe0c5 100644 --- a/assets/common/items/npc_armor/biped_small/clockwork/chest/clockwork.ron +++ b/assets/common/items/npc_armor/biped_small/clockwork/chest/clockwork.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.06), + precision_power: Some(0.06), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/clockwork/foot/clockwork.ron b/assets/common/items/npc_armor/biped_small/clockwork/foot/clockwork.ron index 64252e6fe1..91f4446965 100644 --- a/assets/common/items/npc_armor/biped_small/clockwork/foot/clockwork.ron +++ b/assets/common/items/npc_armor/biped_small/clockwork/foot/clockwork.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(1.8), energy_reward: Some(0.018), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/clockwork/hand/clockwork.ron b/assets/common/items/npc_armor/biped_small/clockwork/hand/clockwork.ron index efe0bed6ae..c93923c878 100644 --- a/assets/common/items/npc_armor/biped_small/clockwork/hand/clockwork.ron +++ b/assets/common/items/npc_armor/biped_small/clockwork/hand/clockwork.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/clockwork/head/clockwork.ron b/assets/common/items/npc_armor/biped_small/clockwork/head/clockwork.ron index e9cba698f4..0e54cbde86 100644 --- a/assets/common/items/npc_armor/biped_small/clockwork/head/clockwork.ron +++ b/assets/common/items/npc_armor/biped_small/clockwork/head/clockwork.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(4.5)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/clockwork/pants/clockwork.ron b/assets/common/items/npc_armor/biped_small/clockwork/pants/clockwork.ron index 97242268d4..faf42eaf0c 100644 --- a/assets/common/items/npc_armor/biped_small/clockwork/pants/clockwork.ron +++ b/assets/common/items/npc_armor/biped_small/clockwork/pants/clockwork.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(4.5)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/flamekeeper/chest/flamekeeper.ron b/assets/common/items/npc_armor/biped_small/flamekeeper/chest/flamekeeper.ron index a90a381a31..d19c70d428 100644 --- a/assets/common/items/npc_armor/biped_small/flamekeeper/chest/flamekeeper.ron +++ b/assets/common/items/npc_armor/biped_small/flamekeeper/chest/flamekeeper.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.06), + precision_power: Some(0.06), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/flamekeeper/foot/flamekeeper.ron b/assets/common/items/npc_armor/biped_small/flamekeeper/foot/flamekeeper.ron index ab34976390..e30a09a984 100644 --- a/assets/common/items/npc_armor/biped_small/flamekeeper/foot/flamekeeper.ron +++ b/assets/common/items/npc_armor/biped_small/flamekeeper/foot/flamekeeper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(1.8), energy_reward: Some(0.018), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/flamekeeper/hand/flamekeeper.ron b/assets/common/items/npc_armor/biped_small/flamekeeper/hand/flamekeeper.ron index 1089a9a54d..87ab332f33 100644 --- a/assets/common/items/npc_armor/biped_small/flamekeeper/hand/flamekeeper.ron +++ b/assets/common/items/npc_armor/biped_small/flamekeeper/hand/flamekeeper.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/flamekeeper/head/flamekeeper.ron b/assets/common/items/npc_armor/biped_small/flamekeeper/head/flamekeeper.ron index 2034d6672b..1620bb1295 100644 --- a/assets/common/items/npc_armor/biped_small/flamekeeper/head/flamekeeper.ron +++ b/assets/common/items/npc_armor/biped_small/flamekeeper/head/flamekeeper.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/flamekeeper/pants/flamekeeper.ron b/assets/common/items/npc_armor/biped_small/flamekeeper/pants/flamekeeper.ron index acd47c76bb..7002671569 100644 --- a/assets/common/items/npc_armor/biped_small/flamekeeper/pants/flamekeeper.ron +++ b/assets/common/items/npc_armor/biped_small/flamekeeper/pants/flamekeeper.ron @@ -6,7 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron index 45fe570fd8..a987de47f1 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(60.0)), energy_max: Some(120.0), energy_reward: Some(0.027), - crit_power: Some(0.025), + precision_power: Some(0.025), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron index eda093fbcc..3e08df3845 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.7), energy_reward: Some(0.027), - crit_power: Some(0.025), + precision_power: Some(0.025), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron index eda093fbcc..3e08df3845 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.7), energy_reward: Some(0.027), - crit_power: Some(0.025), + precision_power: Some(0.025), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron index eda093fbcc..3e08df3845 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.7), energy_reward: Some(0.027), - crit_power: Some(0.025), + precision_power: Some(0.025), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron index 4d25804d7e..a5c2d8600e 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron index a269b39abb..2a9dbbbc17 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron index a269b39abb..2a9dbbbc17 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron index a269b39abb..2a9dbbbc17 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron index af495d1079..95f20bb37e 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron index a9c7109826..97b07b020d 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron index a9c7109826..97b07b020d 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron index a9c7109826..97b07b020d 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.9), energy_reward: Some(0.009), - crit_power: Some(0.008), + precision_power: Some(0.008), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron index e59c0ffa73..a4e8aaf138 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron index 5a8faecd95..0684c3a4e4 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron index 5a8faecd95..0684c3a4e4 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron index 5a8faecd95..0684c3a4e4 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron index ee65b8c32f..99275de76d 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron index 24b63ee9f0..869409e084 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron index 24b63ee9f0..869409e084 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron index 24b63ee9f0..869409e084 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(1.8), energy_reward: Some(0.02), - crit_power: Some(0.016), + precision_power: Some(0.016), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron index a9521226f1..900a90b2d4 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.4), energy_reward: Some(0.005), - crit_power: Some(0.004), + precision_power: Some(0.004), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron index 576f9528a6..45d6fa2fe6 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.4), energy_reward: Some(0.005), - crit_power: Some(0.004), + precision_power: Some(0.004), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron index 576f9528a6..45d6fa2fe6 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.4), energy_reward: Some(0.005), - crit_power: Some(0.004), + precision_power: Some(0.004), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron index 576f9528a6..45d6fa2fe6 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(0.4), energy_reward: Some(0.005), - crit_power: Some(0.004), + precision_power: Some(0.004), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron index 217a06c39e..8a11831a72 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.108), - crit_power: Some(0.1), + precision_power: Some(0.1), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron index 123b447118..c521a976b0 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.108), - crit_power: Some(0.1), + precision_power: Some(0.1), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron index 7ba9928f7f..6810bb0e1a 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.108), - crit_power: Some(0.1), + precision_power: Some(0.1), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron index 51bd8f98b3..501befcb7e 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron index c4c8ee3b56..af42475054 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron index 978fa44f39..4248bbc1d2 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron index 1c85eaf9a4..98fbbf2b9a 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron index 88cd01c453..30e20ded9a 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron index 8727f705ed..8db42ced52 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron index f0cdaba85c..9029eb9a67 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron index 9ea0787f97..40e40eb2d5 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron index 40cc3ae2fb..1ddd02642a 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron index 290649bf08..ed9274f80e 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron index c883fac499..9b8216d49c 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron index 3bb69ce534..07bc23ce1c 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron index d81a2d5169..def85f736b 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron index dad80533bd..9d5b77babb 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron index c26a5eb0e5..e8957ba8d2 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron index d56ef51a68..50cb81968a 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.108), - crit_power: Some(0.1), + precision_power: Some(0.1), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron index 4e1085387f..912b9e75cd 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.108), - crit_power: Some(0.1), + precision_power: Some(0.1), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron index 375fa228f6..d63e9dfe66 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.108), - crit_power: Some(0.1), + precision_power: Some(0.1), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron index 05d7360aa6..16b6e402a7 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron index f2e8641137..5f2bfc7f63 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron index 1621f6bec6..0bcdbd13b5 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron index c09a2b6974..c38eccafef 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron index 53998466e9..7eec4e260b 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron index 0d4cb5c964..06228a15e7 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.036), - crit_power: Some(0.032), + precision_power: Some(0.032), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron index 9e7bdb1d0d..1589fab193 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron index a8fb8c3f55..3e05c2912a 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron index 34baf7f422..26a65b8a2c 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron index bc3a378e93..f61debc701 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron index 14ce6cd2fb..0f4ae486d4 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron index d95b0ed2af..2b27f70ceb 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(5.0), energy_reward: Some(0.08), - crit_power: Some(0.064), + precision_power: Some(0.064), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/irrwurz/chest/irrwurz.ron b/assets/common/items/npc_armor/biped_small/irrwurz/chest/irrwurz.ron index 3b1d8e8e2b..a483ed1ce4 100644 --- a/assets/common/items/npc_armor/biped_small/irrwurz/chest/irrwurz.ron +++ b/assets/common/items/npc_armor/biped_small/irrwurz/chest/irrwurz.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/irrwurz/foot/irrwurz.ron b/assets/common/items/npc_armor/biped_small/irrwurz/foot/irrwurz.ron index 6976f097a9..106a5ef41b 100644 --- a/assets/common/items/npc_armor/biped_small/irrwurz/foot/irrwurz.ron +++ b/assets/common/items/npc_armor/biped_small/irrwurz/foot/irrwurz.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/irrwurz/hand/irrwurz.ron b/assets/common/items/npc_armor/biped_small/irrwurz/hand/irrwurz.ron index 38db7da70e..a27a0ff3e1 100644 --- a/assets/common/items/npc_armor/biped_small/irrwurz/hand/irrwurz.ron +++ b/assets/common/items/npc_armor/biped_small/irrwurz/hand/irrwurz.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/irrwurz/pants/irrwurz.ron b/assets/common/items/npc_armor/biped_small/irrwurz/pants/irrwurz.ron index 3847ebc19c..a7619f9b88 100644 --- a/assets/common/items/npc_armor/biped_small/irrwurz/pants/irrwurz.ron +++ b/assets/common/items/npc_armor/biped_small/irrwurz/pants/irrwurz.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron index 662063c797..34f17b1e3d 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron index 79417e0a72..6d8771757d 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron index 6730632147..82449f27f3 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron index 5b29a825ca..758bac420b 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron index c6606c3da2..25709a7a5f 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron index 631d285212..f40af2675b 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(6.0)), energy_max: Some(13.5), energy_reward: Some(0.135), - crit_power: Some(0.125), + precision_power: Some(0.125), stealth: Some(0.125), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron index a90f29a61b..b8c2fdf158 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(6.0)), energy_max: Some(13.5), energy_reward: Some(0.135), - crit_power: Some(0.125), + precision_power: Some(0.125), stealth: Some(0.125), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron index 28402b5450..fcadc33568 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(6.0)), energy_max: Some(13.5), energy_reward: Some(0.135), - crit_power: Some(0.125), + precision_power: Some(0.125), stealth: Some(0.125), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron index c66f4ab5fa..b07c86692b 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.045), - crit_power: Some(0.04), + precision_power: Some(0.04), stealth: Some(0.04), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron index 07f63c7b24..ee13d824ac 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.045), - crit_power: Some(0.04), + precision_power: Some(0.04), stealth: Some(0.04), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron index e1cb61b248..5f38b950ab 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.045), - crit_power: Some(0.04), + precision_power: Some(0.04), stealth: Some(0.04), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron index 40df2ff49a..b6215422c1 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.045), - crit_power: Some(0.04), + precision_power: Some(0.04), stealth: Some(0.04), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron index 1057050974..39fa56db30 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.045), - crit_power: Some(0.04), + precision_power: Some(0.04), stealth: Some(0.04), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron index 5d56f70849..cd07aeb9d8 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(2.0)), energy_max: Some(4.5), energy_reward: Some(0.045), - crit_power: Some(0.04), + precision_power: Some(0.04), stealth: Some(0.04), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron index cc44ee46e3..e511fc88f5 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(9.0), energy_reward: Some(0.1), - crit_power: Some(0.08), + precision_power: Some(0.08), stealth: Some(0.08), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron index e42b0239e4..93b9f4485b 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(9.0), energy_reward: Some(0.1), - crit_power: Some(0.08), + precision_power: Some(0.08), stealth: Some(0.08), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron index 143673057a..623509b055 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(5.0)), energy_max: Some(9.0), energy_reward: Some(0.1), - crit_power: Some(0.08), + precision_power: Some(0.08), stealth: Some(0.08), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron index 3207ad2e07..a6e5f305bd 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(9.0), energy_reward: Some(0.1), - crit_power: Some(0.08), + precision_power: Some(0.08), stealth: Some(0.08), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron index a0db6a8773..d32e8d6c4f 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(9.0), energy_reward: Some(0.1), - crit_power: Some(0.08), + precision_power: Some(0.08), stealth: Some(0.08), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron index cccb97e075..aa9f8d5630 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(9.0), energy_reward: Some(0.1), - crit_power: Some(0.08), + precision_power: Some(0.08), stealth: Some(0.08), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron index 09c58a3b39..80a1ee58a0 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.0), energy_reward: Some(0.025), - crit_power: Some(0.02), + precision_power: Some(0.02), stealth: Some(0.02), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron index abc3030796..dbfdbcd2d3 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.0), energy_reward: Some(0.025), - crit_power: Some(0.02), + precision_power: Some(0.02), stealth: Some(0.02), )), )), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron index e0c84d7f43..ad64a97857 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(1.0)), energy_max: Some(2.0), energy_reward: Some(0.025), - crit_power: Some(0.02), + precision_power: Some(0.02), stealth: Some(0.02), )), )), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron index 5f71527177..926a1e3672 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron index 606f594554..a7e75e6d9e 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron index 3ecac67833..cf7b27d5fc 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.81), - crit_power: Some(0.075), + precision_power: Some(0.075), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron index 95d8e45769..121ed2ee89 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.027), - crit_power: Some(0.024), + precision_power: Some(0.024), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron index 6e11c11e79..5c43d3062a 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.027), - crit_power: Some(0.024), + precision_power: Some(0.024), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron index 7dfb8cf19c..d7be59660e 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.027), - crit_power: Some(0.024), + precision_power: Some(0.024), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron index 0f10620d19..880645b5d0 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.027), - crit_power: Some(0.024), + precision_power: Some(0.024), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron index d58d2ffb00..b389d4fcc9 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.027), - crit_power: Some(0.024), + precision_power: Some(0.024), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron index 967a90dc44..7f157a4400 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.027), - crit_power: Some(0.024), + precision_power: Some(0.024), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron index 6d4121b5d0..400cecdb3b 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.06), - crit_power: Some(0.048), + precision_power: Some(0.048), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron index f85f227dab..008d44c60b 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.06), - crit_power: Some(0.048), + precision_power: Some(0.048), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron index 354b4719ff..635b5a3e5b 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.06), - crit_power: Some(0.048), + precision_power: Some(0.048), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron index 1a97b659b9..42836184a1 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.06), - crit_power: Some(0.048), + precision_power: Some(0.048), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron index 83e9e9a7fc..cead09c58f 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.06), - crit_power: Some(0.048), + precision_power: Some(0.048), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron index 173be2d3d5..2289df0718 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.06), - crit_power: Some(0.048), + precision_power: Some(0.048), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron index 999f283b95..374c106bc5 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.015), - crit_power: Some(0.012), + precision_power: Some(0.012), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron index 4f5ff7c4b2..36c8c8177f 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.015), - crit_power: Some(0.012), + precision_power: Some(0.012), )), )), quality: Low, diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron index 69669f50c0..f198f413fa 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron @@ -8,7 +8,7 @@ ItemDef( poise_resilience: Some(Normal(4.0)), energy_max: Some(3.4), energy_reward: Some(0.015), - crit_power: Some(0.012), + precision_power: Some(0.012), )), )), quality: Low, 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..c95995aae6 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, @@ -153,32 +141,32 @@ // Hides "Rawhide": ( protection: Some(Normal(20.0)), - crit_power: Some(0.5), + precision_power: Some(0.4), stealth: Some(0.5), ), "Leather": ( protection: Some(Normal(28.0)), - crit_power: Some(0.6), + precision_power: Some(0.48), stealth: Some(0.7), ), "Scale": ( protection: Some(Normal(36.0)), - crit_power: Some(0.7), + precision_power: Some(0.56), stealth: Some(0.9), ), "Carapace": ( protection: Some(Normal(44.0)), - crit_power: Some(0.8), + precision_power: Some(0.64), stealth: Some(1.1), ), "Plate": ( protection: Some(Normal(52.0)), - crit_power: Some(0.9), + precision_power: Some(0.72), stealth: Some(1.3), ), "Dragonscale": ( protection: Some(Normal(60.0)), - crit_power: Some(1.0), + precision_power: Some(0.8), stealth: Some(1.5), ), // Cloths @@ -224,7 +212,7 @@ poise_resilience: Some(Normal(20.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.4), + precision_power: Some(0.4), ), "Assassin": ( protection: Some(Normal(50.0)), @@ -235,7 +223,7 @@ poise_resilience: Some(Normal(20.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.4), + precision_power: Some(0.4), ), "Bonerattler": ( protection: Some(Normal(80.0)), @@ -245,7 +233,7 @@ poise_resilience: Some(Normal(20.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.4), + precision_power: Some(0.4), ), "Cloth Blue": ( protection: Some(Normal(5.0)), @@ -261,7 +249,7 @@ poise_resilience: Some(Normal(20.0)), energy_max: Some(30.0), energy_reward: Some(0.4), - crit_power: Some(0.25), + precision_power: Some(0.25), stealth: Some(0.4), ), "Ferocious": ( @@ -276,14 +264,14 @@ poise_resilience: Some(Normal(20.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.4), + precision_power: Some(0.4), ), "Pirate": ( protection: Some(Normal(120.0)), poise_resilience: Some(Normal(20.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.4), + precision_power: Some(0.4), ), "Savage": ( protection: Some(Normal(60.0)), @@ -308,20 +296,20 @@ poise_resilience: Some(Normal(20.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.4), + precision_power: Some(0.4), ), "Cardinal": ( protection: Some(Normal(540.0)), poise_resilience: Some(Normal(60.0)), energy_max: Some(45.0), energy_reward: Some(0.5), - crit_power: Some(0.8), + precision_power: Some(0.8), ), "Boreal": ( protection: Some(Normal(88.0)), poise_resilience: Some(Normal(49.5)), energy_max: Some(-58.5), - crit_power: Some(0.585), + precision_power: Some(0.585), stealth: Some(0.45), ), "Brinestone": ( @@ -329,14 +317,14 @@ poise_resilience: Some(Normal(29.5)), energy_max: Some(63.0), energy_reward: Some(0.63), - crit_power: Some(-0.21), + precision_power: Some(-0.20), ), "Miner": ( protection: Some(Normal(120.0)), poise_resilience: Some(Normal(5.0)), energy_max: Some(100.0), energy_reward: Some(0.4), - crit_power: Some(0.5), + precision_power: Some(0.5), ) }, ) diff --git a/assets/voxygen/i18n/be/common.ftl b/assets/voxygen/i18n/be/common.ftl index 25a89f2d36..20ebb650bf 100644 --- a/assets/voxygen/i18n/be/common.ftl +++ b/assets/voxygen/i18n/be/common.ftl @@ -86,13 +86,12 @@ common-rand_name = Выпадковае імя common-stats-combat_rating = БР common-stats-power = Моц common-stats-speed = Хуткасць -common-stats-crit_chance = Крыт. шанец -common-stats-crit_mult = Крыт. множнік +common-stats-precision_mult = Крыт. множнік common-stats-armor = Браня common-stats-poise_res = Супраціўленне аглушэнню common-stats-energy_max = Максімальная энергія common-stats-energy_reward = Бонус энергіі -common-stats-crit_power = Крыт. моц +common-stats-precision_power = Крыт. моц common-stats-stealth = Скрытнасць common-stats-slots = Яч. common-material-metal = Метал diff --git a/assets/voxygen/i18n/ca/common.ftl b/assets/voxygen/i18n/ca/common.ftl index 4f3045710f..e716234b76 100644 --- a/assets/voxygen/i18n/ca/common.ftl +++ b/assets/voxygen/i18n/ca/common.ftl @@ -86,13 +86,12 @@ 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-precision_mult = Multiplicador de Crític common-stats-armor = Armadura common-stats-poise_res = Resistència a l'Atordiment common-stats-energy_max = Energia Màxima common-stats-energy_reward = Recompensa d'Energia -common-stats-crit_power = Potència Crítica +common-stats-precision_power = Potència Crítica common-stats-stealth = Sigil common-stats-slots = Ranura common-material-metal = Metall diff --git a/assets/voxygen/i18n/cs/common.ftl b/assets/voxygen/i18n/cs/common.ftl index f388c9d3a8..59ac55e4f1 100644 --- a/assets/voxygen/i18n/cs/common.ftl +++ b/assets/voxygen/i18n/cs/common.ftl @@ -83,13 +83,12 @@ 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-precision_mult = Krit Násobek common-stats-armor = Zbroj common-stats-poise_res = Odolnost omráčení common-stats-energy_max = Max Energie common-stats-energy_reward = Odměna Energie -common-stats-crit_power = Síla Kritu +common-stats-precision_power = Síla Kritu common-stats-stealth = Plížení common-stats-slots = Sloty common-material-metal = Kov diff --git a/assets/voxygen/i18n/de/common.ftl b/assets/voxygen/i18n/de/common.ftl index 82be3da263..a2fa24afad 100644 --- a/assets/voxygen/i18n/de/common.ftl +++ b/assets/voxygen/i18n/de/common.ftl @@ -93,13 +93,12 @@ 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-precision_mult = Krit. Multiplikator common-stats-armor = Rüstung common-stats-poise_res = Betäubungsresistenz common-stats-energy_max = Maximale Ausdauer common-stats-energy_reward = Ausdauerbonus -common-stats-crit_power = Krit. Multiplikator +common-stats-precision_power = Krit. Multiplikator common-stats-stealth = Tarnung common-stats-slots = Inventarplätze common-material-metal = Metall diff --git a/assets/voxygen/i18n/en/common.ftl b/assets/voxygen/i18n/en/common.ftl index 0b69c4d703..f2ef0f7350 100644 --- a/assets/voxygen/i18n/en/common.ftl +++ b/assets/voxygen/i18n/en/common.ftl @@ -97,13 +97,12 @@ 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-precision_mult = Crit Mult common-stats-armor = Armor common-stats-poise_res = Stun Res common-stats-energy_max = Max Energy common-stats-energy_reward = Energy Reward -common-stats-crit_power = Crit Power +common-stats-precision_power = Crit Power common-stats-stealth = Stealth common-stats-slots = Slots common-stats-durability = Durability diff --git a/assets/voxygen/i18n/es-419/common.ftl b/assets/voxygen/i18n/es-419/common.ftl index 7bd540bc0d..c362a14f0d 100644 --- a/assets/voxygen/i18n/es-419/common.ftl +++ b/assets/voxygen/i18n/es-419/common.ftl @@ -93,13 +93,12 @@ 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-precision_mult = Multiplicador de Crítico common-stats-armor = Armadura common-stats-poise_res = Resistencia al aturdimiento common-stats-energy_max = Energía Máxima common-stats-energy_reward = Recuperación de energía -common-stats-crit_power = Poder de Crítico +common-stats-precision_power = Poder de Crítico common-stats-stealth = Sigilo common-stats-slots = Espacios common-material-metal = Metal diff --git a/assets/voxygen/i18n/es/common.ftl b/assets/voxygen/i18n/es/common.ftl index e6d605a0e5..52663cffe3 100644 --- a/assets/voxygen/i18n/es/common.ftl +++ b/assets/voxygen/i18n/es/common.ftl @@ -94,13 +94,12 @@ 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-precision_mult = Multiplicador de crítico common-stats-armor = Armadura common-stats-poise_res = Resistencia al aturdimiento common-stats-energy_max = Aguante máximo common-stats-energy_reward = Ganancia de aguante -common-stats-crit_power = Daño crítico +common-stats-precision_power = Daño crítico common-stats-stealth = Sigilo common-stats-slots = Casillas common-stats-durability = Durabilidad diff --git a/assets/voxygen/i18n/eu/common.ftl b/assets/voxygen/i18n/eu/common.ftl index ec99a548bf..42d160c4ad 100644 --- a/assets/voxygen/i18n/eu/common.ftl +++ b/assets/voxygen/i18n/eu/common.ftl @@ -93,13 +93,12 @@ 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-precision_mult = Kritiko biderkatzailea common-stats-armor = Armadura common-stats-poise_res = Orekarako gaitasuna common-stats-energy_max = Gehienezko energia common-stats-energy_reward = Energia saria -common-stats-crit_power = Kritiko indarra +common-stats-precision_power = Kritiko indarra common-stats-stealth = Isilpea common-stats-slots = Sarbide lasterrak common-material-metal = Metala diff --git a/assets/voxygen/i18n/fr/common.ftl b/assets/voxygen/i18n/fr/common.ftl index c08d05c787..5ec2760343 100644 --- a/assets/voxygen/i18n/fr/common.ftl +++ b/assets/voxygen/i18n/fr/common.ftl @@ -95,13 +95,12 @@ 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-precision_mult = Multiplicateur de Crit common-stats-armor = Armure common-stats-poise_res = Résistance à l'étourdissement common-stats-energy_max = Énergie Max common-stats-energy_reward = Regain d'Énergie -common-stats-crit_power = Dégâts Crit +common-stats-precision_power = Dégâts Crit common-stats-stealth = Furtivité common-stats-slots = Emplacements common-material-metal = Métal diff --git a/assets/voxygen/i18n/hu/common.ftl b/assets/voxygen/i18n/hu/common.ftl index 90d002785d..b2db5fc56c 100644 --- a/assets/voxygen/i18n/hu/common.ftl +++ b/assets/voxygen/i18n/hu/common.ftl @@ -81,13 +81,12 @@ 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-precision_mult = Kritikus találat szorzója common-stats-armor = Páncélzat common-stats-poise_res = Megszédíthetőség common-stats-energy_max = Maximum energia common-stats-energy_reward = Energiajutalom -common-stats-crit_power = Kritikus találat ereje +common-stats-precision_power = Kritikus találat ereje common-stats-stealth = Lopakodás common-stats-slots = Rekeszek common-material-metal = Fém diff --git a/assets/voxygen/i18n/it/common.ftl b/assets/voxygen/i18n/it/common.ftl index b71df0c51d..dfb5dc1555 100644 --- a/assets/voxygen/i18n/it/common.ftl +++ b/assets/voxygen/i18n/it/common.ftl @@ -97,13 +97,12 @@ 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-precision_mult = Moltiplicatore del critico common-stats-armor = Armatura common-stats-poise_res = Resistenza allo stordimento common-stats-energy_max = Energia massima common-stats-energy_reward = Ricompensa d'energia -common-stats-crit_power = Potere del critico +common-stats-precision_power = Potere del critico common-stats-stealth = Movimento furtivo common-stats-slots = Slot common-stats-durability = Resistenza diff --git a/assets/voxygen/i18n/ja/common.ftl b/assets/voxygen/i18n/ja/common.ftl index 7cde6e04fa..694eb1023a 100644 --- a/assets/voxygen/i18n/ja/common.ftl +++ b/assets/voxygen/i18n/ja/common.ftl @@ -77,8 +77,7 @@ 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-precision_mult = Crit Mult common-stats-armor = Armor common-stats-poise_res = Poise res common-stats-slots = Slots diff --git a/assets/voxygen/i18n/ko/common.ftl b/assets/voxygen/i18n/ko/common.ftl index 21ee0dd011..15d7f83a71 100644 --- a/assets/voxygen/i18n/ko/common.ftl +++ b/assets/voxygen/i18n/ko/common.ftl @@ -93,13 +93,12 @@ common-stats-speed = 속도 common-stats-range = 사거리 common-stats-energy_efficiency = 기력 효율 common-stats-buff_strength = 힘 버프/디버프 -common-stats-crit_chance = 치명타 확률 -common-stats-crit_mult = 치명타 배수 +common-stats-precision_mult = 치명타 배수 common-stats-armor = 방어력 common-stats-poise_res = 기절 저항 common-stats-energy_max = 최대 기력 common-stats-energy_reward = 기력 보상 -common-stats-crit_power = 치명타 위력 +common-stats-precision_power = 치명타 위력 common-stats-stealth = 은신 common-stats-slots = 슬롯 common-material-metal = 금속 diff --git a/assets/voxygen/i18n/pl/common.ftl b/assets/voxygen/i18n/pl/common.ftl index 0f9e897401..654fe0cb51 100644 --- a/assets/voxygen/i18n/pl/common.ftl +++ b/assets/voxygen/i18n/pl/common.ftl @@ -93,13 +93,12 @@ 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-precision_mult = Mnożnik ciosu kryt. common-stats-armor = Obrona common-stats-poise_res = Odp. na ogłuszenie common-stats-energy_max = Maksymalna energia common-stats-energy_reward = Bonus energii -common-stats-crit_power = Moc ciosu kryt. +common-stats-precision_power = Moc ciosu kryt. common-stats-stealth = Skradanie common-stats-slots = Sloty common-material-metal = Metal diff --git a/assets/voxygen/i18n/pt-BR/common.ftl b/assets/voxygen/i18n/pt-BR/common.ftl index fc01916215..b146f75dcc 100644 --- a/assets/voxygen/i18n/pt-BR/common.ftl +++ b/assets/voxygen/i18n/pt-BR/common.ftl @@ -96,13 +96,12 @@ 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-precision_mult = Multiplicador de Crítico common-stats-armor = Armadura common-stats-poise_res = Resistência a Atordoamento common-stats-energy_max = Energia Máxima common-stats-energy_reward = Recompensa de Energia -common-stats-crit_power = Poder Crítico +common-stats-precision_power = Poder Crítico common-stats-stealth = Furtividade common-stats-slots = Espaços common-stats-durability = Durabilidade diff --git a/assets/voxygen/i18n/ro/common.ftl b/assets/voxygen/i18n/ro/common.ftl index e704c04cd7..e48c06c495 100644 --- a/assets/voxygen/i18n/ro/common.ftl +++ b/assets/voxygen/i18n/ro/common.ftl @@ -90,13 +90,12 @@ 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-precision_mult = Multiplicator Crit common-stats-armor = Armură common-stats-poise_res = Stun Res common-stats-energy_max = Energie Maximă common-stats-energy_reward = Energy Reward -common-stats-crit_power = Crit Power +common-stats-precision_power = Crit Power common-stats-stealth = Strecurare common-stats-slots = Sloturi common-material-metal = Metal diff --git a/assets/voxygen/i18n/ru/common.ftl b/assets/voxygen/i18n/ru/common.ftl index ff038bc0cb..22971077e4 100644 --- a/assets/voxygen/i18n/ru/common.ftl +++ b/assets/voxygen/i18n/ru/common.ftl @@ -93,13 +93,12 @@ common-stats-speed = Скорость common-stats-range = Дистанция common-stats-energy_efficiency = Энергоэффективность common-stats-buff_strength = Увеличение силы -common-stats-crit_chance = Шанс крита -common-stats-crit_mult = Множитель крита +common-stats-precision_mult = Множитель крита common-stats-armor = Броня common-stats-poise_res = Оглушение common-stats-energy_max = Максимальная энергия common-stats-energy_reward = Восстановление энергии -common-stats-crit_power = Сила крита +common-stats-precision_power = Сила крита common-stats-stealth = Скрытность common-stats-slots = Слоты common-material-metal = Металл diff --git a/assets/voxygen/i18n/sr/common.ftl b/assets/voxygen/i18n/sr/common.ftl index 96f6bceca2..7224a86c5f 100644 --- a/assets/voxygen/i18n/sr/common.ftl +++ b/assets/voxygen/i18n/sr/common.ftl @@ -83,13 +83,12 @@ common-rand_name = Насумично име common-stats-combat_rating = CR common-stats-power = Снага common-stats-speed = Брзина -common-stats-crit_chance = Крит Шанса -common-stats-crit_mult = Мулти Крит +common-stats-precision_mult = Мулти Крит common-stats-armor = Оклоп common-stats-poise_res = Отпорност на Омаму common-stats-energy_max = Макс Здравље common-stats-energy_reward = Здравље Награда -common-stats-crit_power = Крит Снага +common-stats-precision_power = Крит Снага common-stats-stealth = Невидљивост common-stats-slots = Места common-material-metal = Метал diff --git a/assets/voxygen/i18n/sv/common.ftl b/assets/voxygen/i18n/sv/common.ftl index 648f8a3d03..c01ff58925 100644 --- a/assets/voxygen/i18n/sv/common.ftl +++ b/assets/voxygen/i18n/sv/common.ftl @@ -97,13 +97,12 @@ 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-precision_mult = Kritisk multi common-stats-armor = Rustning common-stats-poise_res = Motståndskraft common-stats-energy_max = Max Energi common-stats-energy_reward = Energibelöning -common-stats-crit_power = Kritisk Kraft +common-stats-precision_power = Kritisk Kraft common-stats-stealth = Smygning common-stats-slots = Packningutrymme common-stats-durability = Hållbarhet diff --git a/assets/voxygen/i18n/th/common.ftl b/assets/voxygen/i18n/th/common.ftl index 101d9332fa..2cf3fc08bc 100644 --- a/assets/voxygen/i18n/th/common.ftl +++ b/assets/voxygen/i18n/th/common.ftl @@ -93,13 +93,12 @@ common-stats-speed = ความเร็ว common-stats-range = ระยะโจมตี common-stats-energy_efficiency = ประสิทธิภาพพลังงาน common-stats-buff_strength = เสริมพลังความแข็งแกร่ง -common-stats-crit_chance = โอกาสคริติคอล -common-stats-crit_mult = ความรุนแรงคริติคอล +common-stats-precision_mult = ความรุนแรงคริติคอล common-stats-armor = เกราะ common-stats-poise_res = ความคงทน common-stats-energy_max = พลังงานสูงสุด common-stats-energy_reward = อัตราฟื้นฟูพลังงาน -common-stats-crit_power = ความรุนแรงของคริติคอล +common-stats-precision_power = ความรุนแรงของคริติคอล common-stats-stealth = ลดการถูกตรวจจับ common-stats-slots = จำนวนช่อง common-material-metal = โลหะ diff --git a/assets/voxygen/i18n/tr/common.ftl b/assets/voxygen/i18n/tr/common.ftl index 3a5b07d3ee..1fd8b584f0 100644 --- a/assets/voxygen/i18n/tr/common.ftl +++ b/assets/voxygen/i18n/tr/common.ftl @@ -83,16 +83,15 @@ 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-precision_mult = Kritik Çarpanı common-stats-armor = Zırh common-stats-energy_max = Maksimum Enerji common-stats-energy_reward = Enerji Ödülü -common-stats-crit_power = Kritik Gücü +common-stats-precision_power = Kritik Gücü common-stats-stealth = Gizlilik common-stats-slots = Slotlar common-material-metal = Metal common-material-wood = Tahta common-material-stone = Taş common-material-cloth = Kumaş -common-material-hide = Post \ No newline at end of file +common-material-hide = Post diff --git a/assets/voxygen/i18n/uk/common.ftl b/assets/voxygen/i18n/uk/common.ftl index ac4ba9d875..619eeb99bb 100644 --- a/assets/voxygen/i18n/uk/common.ftl +++ b/assets/voxygen/i18n/uk/common.ftl @@ -97,13 +97,12 @@ 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-precision_mult = Крит. множник common-stats-armor = Броня common-stats-poise_res = Супротив приголомшенню common-stats-energy_max = Макс. енергія common-stats-energy_reward = Винагороди Енергії -common-stats-crit_power = Крит. модифікатор +common-stats-precision_power = Крит. модифікатор common-stats-stealth = Непомінтість common-stats-slots = Слотів common-stats-durability = Міцність diff --git a/assets/voxygen/i18n/vi/common.ftl b/assets/voxygen/i18n/vi/common.ftl index 1656af3afe..f0f31ad634 100644 --- a/assets/voxygen/i18n/vi/common.ftl +++ b/assets/voxygen/i18n/vi/common.ftl @@ -81,11 +81,10 @@ 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 -common-stats-crit_power = Sức Mạnh Chí Mạng +common-stats-precision_power = Sức Mạnh Chí Mạng common-stats-stealth = Lén Lút common-material-metal = Kim Loại common-material-wood = Gỗ diff --git a/assets/voxygen/i18n/zh-Hans/common.ftl b/assets/voxygen/i18n/zh-Hans/common.ftl index d7190560e2..21a24fd9ed 100644 --- a/assets/voxygen/i18n/zh-Hans/common.ftl +++ b/assets/voxygen/i18n/zh-Hans/common.ftl @@ -95,13 +95,12 @@ 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-precision_mult = 暴击倍率 common-stats-armor = 护甲 common-stats-poise_res = 韧性 common-stats-energy_max = 最大耐力值 common-stats-energy_reward = 耐力值增益 -common-stats-crit_power = 暴击伤害 +common-stats-precision_power = 暴击伤害 common-stats-stealth = 隐蔽性 common-stats-slots = 栏位 common-stats-durability = 耐久 diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 99b8dd8561..cb191e3a03 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -73,7 +73,7 @@ fn armor_stats() -> Result<(), Box> { }; let max_energy = armor_stats.energy_max.unwrap_or(0.0).to_string(); let energy_reward = armor_stats.energy_reward.unwrap_or(0.0).to_string(); - let crit_power = armor_stats.crit_power.unwrap_or(0.0).to_string(); + let precision_power = armor_stats.precision_power.unwrap_or(0.0).to_string(); let stealth = armor_stats.stealth.unwrap_or(0.0).to_string(); wtr.write_record([ @@ -87,7 +87,7 @@ fn armor_stats() -> Result<(), Box> { &poise_resilience, &max_energy, &energy_reward, - &crit_power, + &precision_power, &stealth, item.description(), ])?; @@ -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..4bbb546e74 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -148,17 +148,18 @@ fn armor_stats() -> Result<(), Box> { None }; - let crit_power = - if let Some(crit_power_raw) = record.get(headers["Crit Power"]) { - let value = crit_power_raw.parse().unwrap(); - if value == 0.0 { None } else { Some(value) } - } else { - eprintln!( - "Could not unwrap crit power value for {:?}", - item.item_definition_id() - ); - None - }; + let precision_power = if let Some(precision_power_raw) = + record.get(headers["Precision Power"]) + { + let value = precision_power_raw.parse().unwrap(); + if value == 0.0 { None } else { Some(value) } + } else { + eprintln!( + "Could not unwrap precision power value for {:?}", + item.item_definition_id() + ); + None + }; let stealth = if let Some(stealth_raw) = record.get(headers["Stealth"]) { @@ -178,7 +179,7 @@ fn armor_stats() -> Result<(), Box> { poise_resilience, energy_max, energy_reward, - crit_power, + precision_power, stealth, ground_contact: Default::default(), }; @@ -341,15 +342,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 +374,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..1a13ba314d 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -44,6 +44,18 @@ 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; +pub const MAX_BACK_FLANK_PRECISION: f32 = 0.75; +pub const MAX_SIDE_FLANK_PRECISION: f32 = 0.25; +pub const MAX_HEADSHOT_PRECISION: f32 = 1.0; +pub const MAX_TOP_HEADSHOT_PRECISION: f32 = 0.5; +pub const MAX_BEAM_DUR_PRECISION: f32 = 0.25; +pub const MAX_MELEE_POISE_PRECISION: f32 = 0.5; + #[derive(Copy, Clone)] pub struct AttackerInfo<'a> { pub entity: EcsEntity, @@ -73,14 +85,14 @@ 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 pub struct Attack { damages: Vec, effects: Vec, - crit_chance: f32, - crit_multiplier: f32, + precision_multiplier: f32, } impl Default for Attack { @@ -88,8 +100,7 @@ impl Default for Attack { Self { damages: Vec::new(), effects: Vec::new(), - crit_chance: 0.0, - crit_multiplier: 1.0, + precision_multiplier: 1.0, } } } @@ -108,9 +119,8 @@ impl Attack { } #[must_use] - pub fn with_crit(mut self, crit_chance: f32, crit_multiplier: f32) -> Self { - self.crit_chance = crit_chance; - self.crit_multiplier = crit_multiplier; + pub fn with_precision(mut self, precision_multiplier: f32) -> Self { + self.precision_multiplier = precision_multiplier; self } @@ -205,6 +215,7 @@ impl Attack { target_dodging, may_harm, target_group, + precision_mult, } = options; // target == OutOfGroup is basic heuristic that this @@ -220,14 +231,10 @@ impl Attack { matches!(attack_effect.target, Some(GroupTarget::OutOfGroup)) && (target_dodging || !may_harm) }; - let crit_chance = attacker + let precision_mult = 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; + .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 @@ -254,8 +261,8 @@ impl Attack { let change = damage.damage.calculate_health_change( damage_reduction, attacker.map(|x| x.into()), - is_crit, - self.crit_multiplier, + precision_mult, + self.precision_multiplier, strength_modifier * damage_modifier, time, damage_instance, @@ -283,7 +290,7 @@ impl Attack { by: attacker.map(|x| x.into()), cause: Some(damage.damage.source), time, - crit: is_crit, + precise: precision_mult.is_some(), instance: damage_instance, }; emit(ServerEvent::HealthChange { @@ -334,7 +341,7 @@ impl Attack { by: attacker.map(|x| x.into()), cause: Some(damage.damage.source), instance: damage_instance, - crit: is_crit, + precise: precision_mult.is_some(), time, }; emit(ServerEvent::HealthChange { @@ -399,7 +406,7 @@ impl Attack { by: attacker.map(|a| a.into()), cause: None, time, - crit: false, + precise: false, instance: rand::random(), }; if change.amount.abs() > Health::HEALTH_EPSILON { @@ -441,7 +448,7 @@ impl Attack { by: attacker.map(|a| a.into()), cause: None, time, - crit: false, + precise: false, instance: rand::random(), }; if change.amount.abs() > Health::HEALTH_EPSILON { @@ -619,7 +626,7 @@ impl Attack { by: attacker.map(|a| a.into()), cause: None, time, - crit: false, + precise: false, instance: rand::random(), }; if change.amount.abs() > Health::HEALTH_EPSILON { @@ -661,7 +668,7 @@ impl Attack { by: attacker.map(|a| a.into()), cause: None, time, - crit: false, + precise: false, instance: rand::random(), }; if change.amount.abs() > Health::HEALTH_EPSILON { @@ -1024,26 +1031,22 @@ impl Damage { self, damage_reduction: f32, damage_contributor: Option, - is_crit: bool, - crit_mult: f32, + precision_mult: Option, + precision_power: 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 precise_damage = damage * precision_mult.unwrap_or(0.0) * (precision_power - 1.0); match self.source { DamageSource::Melee | DamageSource::Projectile | DamageSource::Explosion | DamageSource::Shockwave | DamageSource::Energy => { - // Critical hit - damage += critdamage; + // Precise hit + damage += precise_damage; // Armor damage *= 1.0 - damage_reduction; @@ -1052,7 +1055,7 @@ impl Damage { by: damage_contributor, cause: Some(self.source), time, - crit: is_crit, + precise: precision_mult.is_some(), instance, } }, @@ -1066,7 +1069,7 @@ impl Damage { by: None, cause: Some(self.source), time, - crit: false, + precise: false, instance, } }, @@ -1075,7 +1078,7 @@ impl Damage { by: None, cause: Some(self.source), time, - crit: false, + precise: false, instance, }, } @@ -1224,7 +1227,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 +1242,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 +1250,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 @@ -1306,7 +1306,7 @@ pub fn combat_rating( const ENERGY_WEIGHT: f32 = 0.5; const SKILLS_WEIGHT: f32 = 1.0; const POISE_WEIGHT: f32 = 0.5; - const CRIT_WEIGHT: f32 = 0.5; + const PRECISION_WEIGHT: f32 = 0.5; // Normalized with a standard max health of 100 let health_rating = health.base_max() / 100.0 @@ -1323,8 +1323,8 @@ pub fn combat_rating( / (1.0 - Poise::compute_poise_damage_reduction(Some(inventory), msm, None, None)) .max(0.00001); - // Normalized with a standard crit multiplier of 1.2 - let crit_rating = compute_crit_mult(Some(inventory), msm) / 1.2; + // Normalized with a standard precision multiplier of 1.2 + let precision_rating = compute_precision_mult(Some(inventory), msm) / 1.2; // Assumes a standard person has earned 20 skill points in the general skill // tree and 10 skill points for the weapon skill tree @@ -1337,13 +1337,13 @@ pub fn combat_rating( let combined_rating = (health_rating * HEALTH_WEIGHT + energy_rating * ENERGY_WEIGHT + poise_rating * POISE_WEIGHT - + crit_rating * CRIT_WEIGHT + + precision_rating * PRECISION_WEIGHT + skills_rating * SKILLS_WEIGHT + weapon_rating * WEAPON_WEIGHT) / (HEALTH_WEIGHT + ENERGY_WEIGHT + POISE_WEIGHT - + CRIT_WEIGHT + + PRECISION_WEIGHT + SKILLS_WEIGHT + WEAPON_WEIGHT); @@ -1352,22 +1352,25 @@ pub fn combat_rating( combined_rating * body.combat_multiplier() } -pub fn compute_crit_mult(inventory: Option<&Inventory>, msm: &MaterialStatManifest) -> f32 { - // Starts with a value of 1.25 when summing the stats from each armor piece, and - // defaults to a value of 1.25 if no inventory is equipped - inventory.map_or(1.25, |inv| { - inv.equipped_items() - .filter_map(|item| { - if let ItemKind::Armor(armor) = &*item.kind() { - armor - .stats(msm, item.stats_durability_multiplier()) - .crit_power - } else { - None - } - }) - .fold(1.25, |a, b| a + b) - }) +pub fn compute_precision_mult(inventory: Option<&Inventory>, msm: &MaterialStatManifest) -> f32 { + // Starts with a value of 0.1 when summing the stats from each armor piece, and + // defaults to a value of 0.1 if no inventory is equipped. Precision multiplier + // cannot go below 1 + 1.0 + inventory + .map_or(0.1, |inv| { + inv.equipped_items() + .filter_map(|item| { + if let ItemKind::Armor(armor) = &*item.kind() { + armor + .stats(msm, item.stats_durability_multiplier()) + .precision_power + } else { + None + } + }) + .fold(0.1, |a, b| a + b) + }) + .max(0.0) } /// Computes the energy reward modifier from worn armor @@ -1469,3 +1472,13 @@ pub fn compute_protection( .sum::>() }) } + +/// Used to compute the precision multiplier achieved by flanking a target +pub fn precision_mult_from_flank(attack_dir: Vec3, target_ori: Option<&Ori>) -> Option { + let angle = target_ori.map(|t_ori| t_ori.look_dir().angle_between(attack_dir)); + match angle { + Some(angle) if angle < FULL_FLANK_ANGLE => Some(MAX_BACK_FLANK_PRECISION), + Some(angle) if angle < PARTIAL_FLANK_ANGLE => Some(MAX_SIDE_FLANK_PRECISION), + Some(_) | None => None, + } +} 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..aac831abfb 100644 --- a/common/src/comp/buff.rs +++ b/common/src/comp/buff.rs @@ -93,9 +93,10 @@ pub enum BuffKind { /// Your attacks against bleeding targets have lifesteal /// Strength increases the fraction of damage restored as life Bloodfeast, - /// Guarantees that the next attack is a critical hit. Does this kind of - /// hackily by adding 100% to the crit, will need to be adjusted if we ever - /// allow double crits instead of treating 100 as a ceiling. + /// Guarantees that the next attack is a precise hit. Does this kind of + /// hackily by adding 100% to the precision, will need to be adjusted if we + /// ever allow double precision hits instead of treating 100 as a + /// ceiling. ImminentCritical, /// Increases combo gain, every 1 strength increases combo per strike by 1, /// rounds to nearest integer @@ -333,10 +334,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 +386,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 +553,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/health.rs b/common/src/comp/health.rs index 39054fc983..2476169571 100644 --- a/common/src/comp/health.rs +++ b/common/src/comp/health.rs @@ -18,8 +18,8 @@ pub struct HealthChange { pub cause: Option, /// The time that the health change occurred at pub time: Time, - /// A boolean that tells you if the change was a crit - pub crit: bool, + /// A boolean that tells you if the change was a precsie hit + pub precise: bool, /// A random ID, used to group up health changes from the same attack pub instance: u64, } @@ -129,7 +129,7 @@ impl Health { amount: 0.0, by: None, cause: None, - crit: false, + precise: false, time: Time(0.0), instance: rand::random(), }, @@ -211,7 +211,7 @@ impl Health { amount: 0.0, by: None, cause: None, - crit: false, + precise: false, time: Time(0.0), instance: rand::random(), }, @@ -246,7 +246,7 @@ mod tests { time: Time(123.0), by: Some(damage_contrib), cause: None, - crit: false, + precise: false, instance: rand::random(), }; @@ -273,7 +273,7 @@ mod tests { time: Time(123.0), by: Some(damage_contrib), cause: None, - crit: false, + precise: false, instance: rand::random(), }; @@ -294,7 +294,7 @@ mod tests { time: Time(123.0), by: Some(damage_contrib), cause: None, - crit: false, + precise: false, instance: rand::random(), }; health.change_by(health_change); @@ -321,7 +321,7 @@ mod tests { time: Time(10.0), by: Some(damage_contrib1), cause: None, - crit: false, + precise: false, instance: rand::random(), }; health.change_by(health_change); @@ -332,7 +332,7 @@ mod tests { time: Time(100.0), by: Some(damage_contrib2), cause: None, - crit: false, + precise: false, instance: rand::random(), }; health.change_by(health_change); @@ -347,7 +347,7 @@ mod tests { time: Time(620.0), by: Some(damage_contrib2), cause: None, - crit: false, + precise: false, instance: rand::random(), }; health.change_by(health_change); diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index 155add6b82..f85213d88f 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -112,9 +112,9 @@ pub struct Stats { /// energy, it is then multiplied by this value before the energy is /// rewarded. pub energy_reward: Option, - /// Crit power is summed, and then added to the default crit multiplier of - /// 1.25. Damage is multiplied by this value when an attack crits. - pub crit_power: Option, + /// Precision power is summed, and then added to the default precision + /// multiplier of 1.1. + pub precision_power: Option, /// Stealth is summed along with the base stealth bonus (2.0), and then /// the agent's perception distance is divided by this value pub stealth: Option, @@ -130,7 +130,7 @@ impl Stats { poise_resilience: None, energy_max: None, energy_reward: None, - crit_power: None, + precision_power: None, stealth: None, ground_contact: Friction::Normal, } @@ -152,7 +152,7 @@ impl Mul for Stats { poise_resilience: self.poise_resilience.map(|a| a * val), energy_max: self.energy_max.map(|a| a * val), energy_reward: self.energy_reward.map(|a| a * val), - crit_power: self.crit_power.map(|a| a * val), + precision_power: self.precision_power.map(|a| a * val), stealth: self.stealth.map(|a| a * val), // There is nothing to multiply, it is just an enum ground_contact: self.ground_contact, @@ -175,7 +175,10 @@ impl Sub for Stats { .energy_reward .zip(other.energy_reward) .map(|(a, b)| a - b), - crit_power: self.crit_power.zip(other.crit_power).map(|(a, b)| a - b), + precision_power: self + .precision_power + .zip(other.precision_power) + .map(|(a, b)| a - b), stealth: self.stealth.zip(other.stealth).map(|(a, b)| a - b), ground_contact: Friction::Normal, } @@ -284,7 +287,7 @@ impl Armor { poise_resilience: Some(poise_resilience), energy_max: None, energy_reward: None, - crit_power: None, + precision_power: None, stealth: None, ground_contact: Friction::Normal, }), 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..ac7e77d981 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, precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_mult) .with_effect(poise) .with_effect(knockback) .with_combo(self.combo_gain) 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/projectile.rs b/common/src/comp/projectile.rs index c37e77e257..cb97c6a5f3 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -140,8 +140,7 @@ impl ProjectileConstructor { pub fn create_projectile( self, owner: Option, - crit_chance: f32, - crit_mult: f32, + precision_mult: f32, tool_stats: tool::Stats, damage_effect: Option, ) -> Projectile { @@ -186,7 +185,7 @@ impl ProjectileConstructor { } let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_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_precision(precision_mult) .with_effect(buff) .with_combo_increment(); let explosion = Explosion { @@ -588,7 +587,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult); + .with_precision(precision_mult); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], radius, @@ -642,7 +641,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_mult) .with_effect(knockback) .with_effect(buff); let explosion = Explosion { @@ -701,7 +700,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_mult) .with_effect(knockback) .with_effect(buff); let explosion = Explosion { @@ -759,7 +758,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_mult) .with_effect(knockback) .with_effect(buff); let variation = thread_rng().gen::(); @@ -815,7 +814,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_mult) .with_effect(knockback); let explosion = Explosion { effects: vec![ @@ -848,7 +847,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult); + .with_precision(precision_mult); Projectile { hit_solid: vec![], hit_entity: vec![Effect::Attack(attack), Effect::Vanish], @@ -875,7 +874,7 @@ impl ProjectileConstructor { ); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult); + .with_precision(precision_mult); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], radius, 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/outcome.rs b/common/src/outcome.rs index c4122c8c84..b226f885a6 100644 --- a/common/src/outcome.rs +++ b/common/src/outcome.rs @@ -7,7 +7,7 @@ use vek::*; #[derive(Debug, Clone, Copy, Serialize, Deserialize)] pub struct HealthChangeInfo { pub amount: f32, - pub crit: bool, + pub precise: bool, pub target: Uid, pub by: Option, pub cause: Option, diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index 216a79e2fe..859e9abf80 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, @@ -17,6 +17,7 @@ use crate::{ terrain::Block, util::Dir, }; +use hashbrown::HashMap; use serde::{Deserialize, Serialize}; use std::time::Duration; use vek::*; @@ -116,11 +117,11 @@ 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 precision_mult = + combat::compute_precision_mult(data.inventory, data.msm); Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_mult) .with_effect(energy) .with_combo_increment() }; @@ -133,6 +134,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/src/states/basic_melee.rs b/common/src/states/basic_melee.rs index 5b0ec8fa85..98e91ea8d2 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 precision_mult = combat::compute_precision_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(precision_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..3868368155 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,13 +87,11 @@ 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 precision_mult = combat::compute_precision_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, + precision_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..ce4bb3c3b2 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,11 @@ 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 precision_mult = + combat::compute_precision_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(precision_mult, tool_stats)); if let CharacterState::ChargedMelee(c) = &mut update.character { c.stage_section = StageSection::Charge; @@ -153,7 +154,7 @@ impl CharacterBehavior for Data { ..*self }); - let crit_data = get_crit_data(data, self.static_data.ability_info); + let precision_mult = combat::compute_precision_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 +166,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(precision_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..49c81dfa56 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 precision_mult = combat::compute_precision_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); // Gets offsets let body_offsets = data @@ -120,8 +119,7 @@ impl CharacterBehavior for Data { let pos = Pos(data.pos.0 + body_offsets); let projectile = arrow.create_projectile( Some(*data.uid), - crit_chance, - crit_mult, + precision_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..63c370afc8 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 precision_mult = combat::compute_precision_mult(data.inventory, data.msm); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_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..858f5a7119 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 precision_mult = combat::compute_precision_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(precision_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..ac16b0386f 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 precision_mult = combat::compute_precision_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(precision_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 precision_mult = combat::compute_precision_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(precision_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..9a11cd2757 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 precision_mult = combat::compute_precision_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(precision_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..98324a3181 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 precision_mult = combat::compute_precision_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(precision_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..0e89f3f0e8 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 precision_mult = combat::compute_precision_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(precision_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..f87d613fa1 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 precision_mult = combat::compute_precision_mult(data.inventory, data.msm); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_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..8c786133a9 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 precision_mult = combat::compute_precision_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(precision_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..ff971c1114 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 precision_mult = combat::compute_precision_mult(data.inventory, data.msm); let tool_stats = get_tool_stats(data, self.static_data.ability_info); // Gets offsets let body_offsets = data @@ -101,8 +100,7 @@ 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, + precision_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..5c915f0859 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 precision_mult = combat::compute_precision_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(precision_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..5a2551d7d4 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 precision_mult = combat::compute_precision_mult(data.inventory, data.msm); let attack = Attack::default() .with_damage(damage) - .with_crit(crit_chance, crit_mult) + .with_precision(precision_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..0f0ab1058c 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 precision_mult = combat::compute_precision_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(precision_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..8bb5f8627a 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 { @@ -1407,7 +1380,8 @@ pub fn input_is_pressed(data: &JoinData<'_>, input: InputKind) -> bool { } /// Checked `Duration` addition. Computes `timer` + `dt`, applying relevant stat -/// attack modifiers and `other_modifiers`, returning None if overflow occurred. +/// attack modifiers and `otcompute_precision_multeturning None if overflow +/// occurred. pub fn checked_tick_attack( data: &JoinData<'_>, timer: Duration, diff --git a/common/systems/src/beam.rs b/common/systems/src/beam.rs index 13725403c2..3d25e5b54a 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,34 @@ impl<'a> System<'a> for Sys { Some(entity), target, ); + + let precision_from_flank = combat::precision_mult_from_flank( + beam.bezier.ctrl - beam.bezier.start, + target_info.ori, + ); + + 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(combat::MAX_BEAM_DUR_PRECISION * mult) + } else { + None + } + }; + + let precision_mult = match (precision_from_flank, precision_from_time) { + (Some(a), Some(b)) => Some(a.max(b)), + (Some(a), None) | (None, Some(a)) => Some(a), + (None, None) => None, + }; + 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..8f890ee0c2 100644 --- a/common/systems/src/buff.rs +++ b/common/systems/src/buff.rs @@ -560,7 +560,7 @@ fn execute_effect( by: damage_contributor, cause, time: *read_data.time, - crit: false, + precise: false, instance: *instance, }, }); @@ -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..81e3a3b076 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,31 @@ impl<'a> System<'a> for Sys { target, ); + let precision_from_flank = + combat::precision_mult_from_flank(*ori.look_dir(), target_ori); + + let precision_from_poise = { + if let Some(CharacterState::Stunned(data)) = target_char_state { + Some( + combat::MAX_MELEE_POISE_PRECISION + * data.static_data.poise_state.damage_multiplier(), + ) + } else { + None + } + }; + + let precision_mult = match (precision_from_flank, precision_from_poise) { + (Some(a), Some(b)) => Some(a.max(b)), + (Some(a), None) | (None, Some(a)) => Some(a), + (None, None) => None, + }; + 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..28c0f8dacb 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,88 @@ fn dispatch_hit( .get(target) .and_then(|cs| cs.attack_immunities()) .map_or(false, |i| i.projectiles); + + let precision_from_flank = + combat::precision_mult_from_flank(*projectile_dir, target_info.ori); + + let precision_from_head = { + // This performs a cylinder and line segment intersection check. The cylinder is + // the upper 10% of an entity's dimensions. The line segment is from the + // projectile's positions on the current and previous tick. + 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, + ); + 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) + { + None + } 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 + }; + let intersected_bottom = head_bottom_pos + .distance_squared(proj_bottom_intersection) + < target_radius.powi(2); + let intersected_top = head_top_pos.distance_squared(proj_top_intersection) + < target_radius.powi(2); + let hit_head = intersected_bottom || intersected_top; + let hit_from_bottom = last_pos.z < head_bottom_pos.z && intersected_bottom; + let hit_from_top = last_pos.z > head_top_pos.z && intersected_top; + // If projectile from bottom, do not award precision damage because it trivial + // to get from up close If projectile from top, reduce + // precision damage to mitigate cheesing benefits + if !hit_head || hit_from_bottom { + None + } else if hit_from_top { + Some(combat::MAX_TOP_HEADSHOT_PRECISION) + } else { + Some(combat::MAX_HEADSHOT_PRECISION) + } + } 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, + ); + if trajectory.distance_to_point(head_middle_pos) < target_radius { + Some(combat::MAX_HEADSHOT_PRECISION) + } else { + None + } + } + }; + + let precision_mult = match (precision_from_flank, precision_from_head) { + (Some(a), Some(b)) => Some(a.max(b)), + (Some(a), None) | (None, Some(a)) => Some(a), + (None, None) => None, + }; + 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/cmd.rs b/server/src/cmd.rs index 0238c5751c..11e1c3fb53 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -1206,7 +1206,7 @@ fn handle_health( amount: hp - health.current(), by: None, cause: None, - crit: false, + precise: false, time: *time, instance: rand::random(), }; diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 0f949802d4..f0e78baccb 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -84,7 +84,7 @@ pub fn handle_health_change(server: &Server, entity: EcsEntity, change: HealthCh by: change.by, target: *uid, cause: change.cause, - crit: change.crit, + precise: change.precise, instance: change.instance, }, }); @@ -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::