From 6e2dff7136746a9cce0836d7ef2899528e5a4dc6 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 6 Jun 2023 19:51:45 -0400 Subject: [PATCH] Weapon stats adjustments and ability icon revisions --- .../items/modular/weapon/primary/axe/axe.ron | 14 +++++++------- .../items/modular/weapon/primary/axe/battleaxe.ron | 10 +++++----- .../items/modular/weapon/primary/axe/greataxe.ron | 12 ++++++------ .../items/modular/weapon/primary/axe/jagged.ron | 8 ++++---- .../items/modular/weapon/primary/axe/labrys.ron | 8 ++++---- .../items/modular/weapon/primary/axe/ornate.ron | 12 ++++++------ .../items/modular/weapon/primary/axe/poleaxe.ron | 10 +++++----- .../items/modular/weapon/secondary/axe/long.ron | 8 ++++---- .../items/modular/weapon/secondary/axe/short.ron | 8 ++++---- .../common/items/weapons/axe/malachite_axe-0.ron | 12 ++++++------ assets/common/items/weapons/axe/parashu.ron | 10 +++++----- assets/common/items/weapons/axe/starter_axe.ron | 12 ++++++------ assets/voxygen/element/skills/axe/bloodfeast.png | 4 ++-- assets/voxygen/element/skills/axe/bulkhead.png | 4 ++-- assets/voxygen/element/skills/axe/capsize.png | 4 ++-- assets/voxygen/element/skills/axe/cleave.png | 4 ++-- assets/voxygen/element/skills/axe/defiance.png | 4 ++-- assets/voxygen/element/skills/axe/fracture.png | 4 ++-- assets/voxygen/element/skills/axe/furor.png | 4 ++-- assets/voxygen/element/skills/axe/keelhaul.png | 4 ++-- assets/voxygen/element/skills/axe/lacerate.png | 4 ++-- assets/voxygen/element/skills/axe/savage_sense.png | 4 ++-- assets/voxygen/element/skills/axe/sunder.png | 4 ++-- assets/voxygen/element/skills/axe/triple_chop.png | 4 ++-- 24 files changed, 86 insertions(+), 86 deletions(-) diff --git a/assets/common/items/modular/weapon/primary/axe/axe.ron b/assets/common/items/modular/weapon/primary/axe/axe.ron index eb443824a0..cb2c05f4c9 100644 --- a/assets/common/items/modular/weapon/primary/axe/axe.ron +++ b/assets/common/items/modular/weapon/primary/axe/axe.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - 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, + 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, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/battleaxe.ron b/assets/common/items/modular/weapon/primary/axe/battleaxe.ron index 87da1749f1..5157db01ac 100644 --- a/assets/common/items/modular/weapon/primary/axe/battleaxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/battleaxe.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.8, - effect_power: 0.8, - speed: 1.25, - crit_chance: 0.075, + power: 0.9, + effect_power: 1.2, + speed: 1.3, + crit_chance: 0.06, range: 1.0, energy_efficiency: 0.8, - buff_strength: 0.8, + buff_strength: 1.2, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/greataxe.ron b/assets/common/items/modular/weapon/primary/axe/greataxe.ron index a36b051b4a..c6770b24d0 100644 --- a/assets/common/items/modular/weapon/primary/axe/greataxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/greataxe.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.8, - effect_power: 1.5, + power: 1.1, + effect_power: 1.4, speed: 0.8, - crit_chance: 0.075, - range: 1.0, - energy_efficiency: 0.8, - buff_strength: 0.8, + crit_chance: 0.08, + range: 0.9, + energy_efficiency: 0.9, + buff_strength: 1.2, ), hand_restriction: Some(Two), weapon_name: Universal("Greataxe"), diff --git a/assets/common/items/modular/weapon/primary/axe/jagged.ron b/assets/common/items/modular/weapon/primary/axe/jagged.ron index d32d55286a..8cfc832d23 100644 --- a/assets/common/items/modular/weapon/primary/axe/jagged.ron +++ b/assets/common/items/modular/weapon/primary/axe/jagged.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 1.0, + power: 0.9, effect_power: 0.8, - speed: 0.7, - crit_chance: 0.075, + speed: 1.2, + crit_chance: 0.12, range: 1.0, energy_efficiency: 0.8, - buff_strength: 1.5, + buff_strength: 1.4, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/labrys.ron b/assets/common/items/modular/weapon/primary/axe/labrys.ron index 207b1565e5..cddea9ef05 100644 --- a/assets/common/items/modular/weapon/primary/axe/labrys.ron +++ b/assets/common/items/modular/weapon/primary/axe/labrys.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 1.25, - effect_power: 0.8, + power: 1.5, + effect_power: 1.2, speed: 0.8, - crit_chance: 0.075, + crit_chance: 0.1, range: 1.0, - energy_efficiency: 0.8, + energy_efficiency: 0.9, buff_strength: 0.8, ), hand_restriction: Some(Two), diff --git a/assets/common/items/modular/weapon/primary/axe/ornate.ron b/assets/common/items/modular/weapon/primary/axe/ornate.ron index b708a957ea..b3b3431ce8 100644 --- a/assets/common/items/modular/weapon/primary/axe/ornate.ron +++ b/assets/common/items/modular/weapon/primary/axe/ornate.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.8, + power: 0.7, effect_power: 0.8, - speed: 0.8, - crit_chance: 0.1, - range: 1.0, - energy_efficiency: 1.5, - buff_strength: 0.8, + speed: 1.1, + crit_chance: 0.14, + range: 1.1, + energy_efficiency: 1.3, + buff_strength: 1.0, ), hand_restriction: None, weapon_name: HandednessDependent( diff --git a/assets/common/items/modular/weapon/primary/axe/poleaxe.ron b/assets/common/items/modular/weapon/primary/axe/poleaxe.ron index cc7a769af4..5fd7571313 100644 --- a/assets/common/items/modular/weapon/primary/axe/poleaxe.ron +++ b/assets/common/items/modular/weapon/primary/axe/poleaxe.ron @@ -6,13 +6,13 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 0.25, - power: 0.8, + power: 1.1, effect_power: 0.8, - speed: 0.8, - crit_chance: 0.2, + speed: 0.9, + crit_chance: 0.16, range: 1.3, - energy_efficiency: 0.8, - buff_strength: 0.8, + energy_efficiency: 0.9, + buff_strength: 0.9, ), hand_restriction: Some(Two), weapon_name: Universal("Poleaxe"), diff --git a/assets/common/items/modular/weapon/secondary/axe/long.ron b/assets/common/items/modular/weapon/secondary/axe/long.ron index 8740cd8711..bced66624b 100644 --- a/assets/common/items/modular/weapon/secondary/axe/long.ron +++ b/assets/common/items/modular/weapon/secondary/axe/long.ron @@ -5,12 +5,12 @@ ItemDef( ToolSecondaryComponent( toolkind: Axe, stats: ( - equip_time_secs: 1.0, - power: 1.25, + equip_time_secs: 1.1, + power: 1.1, effect_power: 1.1, - speed: 0.8, + speed: 0.9, crit_chance: 0.9, - range: 1.2, + range: 1.1, energy_efficiency: 0.9, buff_strength: 1.1, ), diff --git a/assets/common/items/modular/weapon/secondary/axe/short.ron b/assets/common/items/modular/weapon/secondary/axe/short.ron index aef3df6326..911635a51a 100644 --- a/assets/common/items/modular/weapon/secondary/axe/short.ron +++ b/assets/common/items/modular/weapon/secondary/axe/short.ron @@ -5,12 +5,12 @@ ItemDef( ToolSecondaryComponent( toolkind: Axe, stats: ( - equip_time_secs: 1.0, - power: 0.8, + equip_time_secs: 0.9, + power: 0.9, effect_power: 0.9, - speed: 1.2, + speed: 1.1, crit_chance: 1.1, - range: 0.85, + range: 0.9, energy_efficiency: 1.1, buff_strength: 0.9, ), diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index eefa7e28cb..d709351399 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -5,14 +5,14 @@ ItemDef( kind: Axe, hands: Two, stats: ( - equip_time_secs: 0.4, + equip_time_secs: 0.5, power: 1.75, - effect_power: 1.0, - speed: 0.65, - crit_chance: 0.140625, + effect_power: 1.3, + speed: 0.8, + crit_chance: 0.04, range: 1.0, - energy_efficiency: 1.0, - buff_strength: 1.0, + energy_efficiency: 1.3, + buff_strength: 1.2, ), )), quality: Epic, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index ea55724dbc..0e056cd71c 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -5,14 +5,14 @@ ItemDef( kind: Axe, hands: Two, stats: ( - equip_time_secs: 0.3, + equip_time_secs: 0.5, power: 3.0, - effect_power: 1.0, - speed: 0.6, + effect_power: 1.2, + speed: 0.7, crit_chance: 0.2, range: 1.0, - energy_efficiency: 1.0, - buff_strength: 1.0, + energy_efficiency: 0.8, + buff_strength: 1.2, ), )), quality: Legendary, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index 7d26a4d733..7622a73716 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -5,14 +5,14 @@ ItemDef( kind: Axe, hands: Two, stats: ( - equip_time_secs: 0.4, - power: 0.45, + equip_time_secs: 0.3, + power: 0.5, effect_power: 1.0, - speed: 0.95, - crit_chance: 0.09375, - range: 0.95, + speed: 1.0, + crit_chance: 0.1, + range: 1.0, energy_efficiency: 1.0, - buff_strength: 0.9, + buff_strength: 1.0, ), )), quality: Low, diff --git a/assets/voxygen/element/skills/axe/bloodfeast.png b/assets/voxygen/element/skills/axe/bloodfeast.png index 79bc270bb8..0859cf1207 100644 --- a/assets/voxygen/element/skills/axe/bloodfeast.png +++ b/assets/voxygen/element/skills/axe/bloodfeast.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99a5dbc13c4e41cd0b16c5082a244c3e2896a285ca95f15a1062960f313c7e77 -size 577 +oid sha256:028bc654128927ea0d97f03ea710728ac75f77abb4bad4734799fc7f0832c8e3 +size 572 diff --git a/assets/voxygen/element/skills/axe/bulkhead.png b/assets/voxygen/element/skills/axe/bulkhead.png index fa10a3a822..4d078cadec 100644 --- a/assets/voxygen/element/skills/axe/bulkhead.png +++ b/assets/voxygen/element/skills/axe/bulkhead.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ad423522211a13202bdeddba21e0c6bf1f4c6d59bbf6ca5e0d3a89f078358a5 -size 730 +oid sha256:8f3b46d22c7eae01f9278d5a2348f5da77603488725bbaee20334d729f9c6555 +size 745 diff --git a/assets/voxygen/element/skills/axe/capsize.png b/assets/voxygen/element/skills/axe/capsize.png index e3f0017676..1711181a5f 100644 --- a/assets/voxygen/element/skills/axe/capsize.png +++ b/assets/voxygen/element/skills/axe/capsize.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cbd9f30ff6ff1b74bba42feff3f1d5475bbb5dee2475a8a11626862db3ca858 -size 773 +oid sha256:21e22a83c14da88a50afa78ef064e11b12676575f99ac0180fb2d992aa8f10ad +size 790 diff --git a/assets/voxygen/element/skills/axe/cleave.png b/assets/voxygen/element/skills/axe/cleave.png index 955b5c2480..490b29f712 100644 --- a/assets/voxygen/element/skills/axe/cleave.png +++ b/assets/voxygen/element/skills/axe/cleave.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9fc82992bdcea48786190d8ed37c98812baf240e91c05cae9863cf3becb1e58 -size 565 +oid sha256:fb61c3ef347dcd915a02fcb5c83d3819a9556923bdffa8d9f3c6646fcbe398a2 +size 567 diff --git a/assets/voxygen/element/skills/axe/defiance.png b/assets/voxygen/element/skills/axe/defiance.png index e970c4ded3..22386866e5 100644 --- a/assets/voxygen/element/skills/axe/defiance.png +++ b/assets/voxygen/element/skills/axe/defiance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbe144a41a7ff1942c50b6ce2a85eab3c35f5c19a64f81fbc4102cd7b8d76c4c -size 657 +oid sha256:ae833c69d0bd8cebaa9c1d9d4b621f414595c7d2a48d2b302a4dcdeba576b09b +size 650 diff --git a/assets/voxygen/element/skills/axe/fracture.png b/assets/voxygen/element/skills/axe/fracture.png index 5d47980e0b..64495d8ccf 100644 --- a/assets/voxygen/element/skills/axe/fracture.png +++ b/assets/voxygen/element/skills/axe/fracture.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16e030b89079cceb4d15dc6cc8ed56b2e8d9596e878cc8a824fa9388747591a8 -size 469 +oid sha256:d2d831956e1d72c412efbcf4095d275e9f7bffa97b22d4b761fbb2c3224f25e6 +size 494 diff --git a/assets/voxygen/element/skills/axe/furor.png b/assets/voxygen/element/skills/axe/furor.png index 059da1926a..49e21acbcd 100644 --- a/assets/voxygen/element/skills/axe/furor.png +++ b/assets/voxygen/element/skills/axe/furor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ee950d093850a79f723b9aa504dea63372150b3a507a5957b48fd2075b0540f -size 650 +oid sha256:b713edb925f9880ff27d5b039bbe75c7cd7495b713282106eb05b4a70f19aa60 +size 656 diff --git a/assets/voxygen/element/skills/axe/keelhaul.png b/assets/voxygen/element/skills/axe/keelhaul.png index d28c0a2a5f..771547a39c 100644 --- a/assets/voxygen/element/skills/axe/keelhaul.png +++ b/assets/voxygen/element/skills/axe/keelhaul.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db34e05c952f48d567f406c21c5cd1d4c223b5819cab3b6d3e52ca721bd71905 -size 615 +oid sha256:18510d0fcac3ad3baf27fa87135531d5ac4c5c7067557a0a37417910fd29323a +size 630 diff --git a/assets/voxygen/element/skills/axe/lacerate.png b/assets/voxygen/element/skills/axe/lacerate.png index b7b403dbfd..ee08303bfb 100644 --- a/assets/voxygen/element/skills/axe/lacerate.png +++ b/assets/voxygen/element/skills/axe/lacerate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88e4b480951bbd4d57e20a5e8ae7bbf90e1dac2059989940ba037c1c53ee464b -size 784 +oid sha256:6047fd84feade285068f65ad0017fc649560d9cb7503c9ce7cc3747c6812915d +size 791 diff --git a/assets/voxygen/element/skills/axe/savage_sense.png b/assets/voxygen/element/skills/axe/savage_sense.png index f539975aee..7faa03d29d 100644 --- a/assets/voxygen/element/skills/axe/savage_sense.png +++ b/assets/voxygen/element/skills/axe/savage_sense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e03b90b00f86927f73f9888c2e08a9bb248909b78ab55fb20cb4399f6bcee5c0 -size 644 +oid sha256:86282e81ef9a21ba22bdbdaf33cec2ba743341008c76ba51de79d61d7a355d55 +size 684 diff --git a/assets/voxygen/element/skills/axe/sunder.png b/assets/voxygen/element/skills/axe/sunder.png index 227204d803..216c6c9380 100644 --- a/assets/voxygen/element/skills/axe/sunder.png +++ b/assets/voxygen/element/skills/axe/sunder.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f0d965e11c30876bca1908ac08c1842a6b04b600cc48077a90672e332205c1c -size 567 +oid sha256:ac8e960eb2ee91efb9d7a620d3c72e5d6c9021fb3c3475e3c17a060916f46cd2 +size 600 diff --git a/assets/voxygen/element/skills/axe/triple_chop.png b/assets/voxygen/element/skills/axe/triple_chop.png index 9365146800..b7f84efa96 100644 --- a/assets/voxygen/element/skills/axe/triple_chop.png +++ b/assets/voxygen/element/skills/axe/triple_chop.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80d89cac6fc19c12966a8ccddd41f86572ca35d2b67909500c623d59d8504259 -size 694 +oid sha256:a6552810db82163cdfeba1fee0f12f46fd04b6607a96383dc4e40acd4921da6c +size 708