From 95148a99682245c7c029c1798d3e2661f582cda6 Mon Sep 17 00:00:00 2001 From: runrobdog Date: Fri, 17 Jun 2022 12:35:06 +0200 Subject: [PATCH] tweaks entity stats --- .../custom/arthropods/antlion/charge.ron | 6 +++--- .../custom/arthropods/antlion/singlestrike.ron | 4 ++-- .../custom/arthropods/blackwidow/poisonball.ron | 4 ++-- .../arthropods/blackwidow/singlestrike.ron | 4 ++-- .../custom/arthropods/hornbeetle/leap.ron | 4 ++-- .../arthropods/hornbeetle/singlestrike.ron | 4 ++-- .../custom/arthropods/tarantula/leap.ron | 4 ++-- .../custom/arthropods/tarantula/singlestrike.ron | 4 ++-- .../custom/arthropods/weevil/singlestrike.ron | 4 ++-- .../custom/arthropods/weevil/threadshot.ron | 4 ++-- assets/common/abilities/custom/asp/firebomb.ron | 4 ++-- .../common/abilities/custom/asp/singlestrike.ron | 4 ++-- assets/common/abilities/custom/basilisk/dash.ron | 6 +++--- .../common/abilities/custom/basilisk/petrify.ron | 4 ++-- .../abilities/custom/basilisk/triplestrike.ron | 12 ++++++------ .../common/abilities/custom/beastclaws/basic.ron | 4 ++-- .../abilities/custom/birdlargebasic/dash.ron | 6 +++--- .../custom/birdlargebasic/triplestrike.ron | 12 ++++++------ .../custom/birdlargebreathe/firebomb.ron | 4 ++-- .../custom/birdlargebreathe/flamethrower.ron | 4 ++-- .../custom/birdlargebreathe/triplestrike.ron | 12 ++++++------ .../abilities/custom/birdlargefire/firebomb.ron | 4 ++-- .../custom/birdlargefire/fireshockwave.ron | 4 ++-- .../custom/birdlargefire/flamethrower.ron | 4 ++-- .../custom/birdlargefire/triplestrike.ron | 12 ++++++------ .../common/abilities/custom/claygolem/laser.ron | 4 ++-- .../common/abilities/custom/claygolem/rocket.ron | 4 ++-- .../abilities/custom/claygolem/shockwave.ron | 4 ++-- .../common/abilities/custom/claygolem/strike.ron | 4 ++-- assets/common/abilities/custom/deadwood/dash.ron | 6 +++--- .../abilities/custom/deadwood/lifestealbeam.ron | 4 ++-- .../custom/harvester/explodingpumpkin.ron | 4 ++-- .../abilities/custom/harvester/firebreath.ron | 6 +++--- .../common/abilities/custom/harvester/scythe.ron | 4 ++-- .../abilities/custom/husk/singlestrike.ron | 4 ++-- .../abilities/custom/husk/triplestrike.ron | 12 ++++++------ .../abilities/custom/husk_brute/chargedmelee.ron | 6 +++--- .../abilities/custom/husk_brute/singlestrike.ron | 4 ++-- .../common/abilities/custom/mandragora/basic.ron | 4 ++-- .../abilities/custom/mandragora/scream.ron | 4 ++-- .../abilities/custom/maneater/poisonball.ron | 4 ++-- .../abilities/custom/maneater/singlestrike.ron | 4 ++-- .../abilities/custom/mindflayer/cursedflames.ron | 4 ++-- .../custom/mindflayer/necroticsphere.ron | 4 ++-- .../custom/mindflayer/necroticvortex.ron | 4 ++-- .../common/abilities/custom/minotaur/charge.ron | 6 +++--- .../common/abilities/custom/minotaur/cleave.ron | 4 ++-- .../custom/minotaur/cripplingstrike.ron | 2 +- assets/common/abilities/custom/oni/dash.ron | 6 +++--- .../common/abilities/custom/oni/doublestrike.ron | 8 ++++---- .../custom/quadlowbasic/singlestrike.ron | 4 ++-- .../custom/quadlowbasic/triplestrike.ron | 12 ++++++------ .../custom/quadlowbeam/lifestealbeam.ron | 4 ++-- .../abilities/custom/quadlowbreathe/dash.ron | 6 +++--- .../custom/quadlowbreathe/flamethrower.ron | 4 ++-- .../custom/quadlowbreathe/triplestrike.ron | 12 ++++++------ .../abilities/custom/quadlowquick/dash.ron | 6 +++--- .../abilities/custom/quadlowquick/quadstrike.ron | 16 ++++++++-------- .../abilities/custom/quadlowranged/firebomb.ron | 4 ++-- .../abilities/custom/quadlowtail/charged.ron | 6 +++--- .../custom/quadlowtail/triplestrike.ron | 10 +++++----- .../custom/quadmedbasic/singlestrike.ron | 4 ++-- .../custom/quadmedbasic/triplestrike.ron | 12 ++++++------ .../abilities/custom/quadmedcharge/dash.ron | 6 +++--- .../custom/quadmedcharge/doublestrike.ron | 8 ++++---- .../abilities/custom/quadmedhoof/basic.ron | 4 ++-- .../custom/quadmedjump/doublestrike.ron | 8 ++++---- .../common/abilities/custom/quadmedjump/leap.ron | 4 ++-- .../abilities/custom/quadmedjump/quickleap.ron | 4 ++-- .../abilities/custom/quadmedquick/dash.ron | 6 +++--- .../custom/quadmedquick/triplestrike.ron | 12 ++++++------ .../custom/quadsmallbasic/singlestrike.ron | 4 ++-- .../custom/stonegolemfist/shockwave.ron | 4 ++-- .../custom/stonegolemfist/singlestrike.ron | 4 ++-- .../abilities/custom/stonegolemfist/spin.ron | 4 ++-- .../abilities/custom/theropodbasic/dash.ron | 6 +++--- .../custom/theropodbasic/singlestrike.ron | 4 ++-- .../custom/theropodbasic/triplestrike.ron | 12 ++++++------ .../custom/theropodbird/singlestrike.ron | 4 ++-- .../custom/theropodbird/triplestrike.ron | 12 ++++++------ .../abilities/custom/tidalwarrior/bubbles.ron | 4 ++-- .../abilities/custom/tidalwarrior/pincer.ron | 4 ++-- .../abilities/custom/tidalwarrior/scuttle.ron | 4 ++-- .../abilities/custom/tidalwarrior/totem_wave.ron | 4 ++-- assets/common/abilities/custom/tornado/spin.ron | 2 +- assets/common/abilities/custom/turret/arrows.ron | 4 ++-- .../abilities/custom/turret/flamethrower.ron | 4 ++-- .../abilities/custom/wendigomagic/frostbomb.ron | 4 ++-- .../custom/wendigomagic/singlestrike.ron | 4 ++-- .../abilities/custom/woodgolem/shockwave.ron | 4 ++-- .../common/abilities/custom/woodgolem/spin.ron | 4 ++-- .../common/abilities/custom/woodgolem/strike.ron | 4 ++-- .../common/abilities/custom/yeti/frostbreath.ron | 4 ++-- .../common/abilities/custom/yeti/icespikes.ron | 4 ++-- assets/common/abilities/custom/yeti/snowball.ron | 4 ++-- assets/common/abilities/custom/yeti/strike.ron | 2 +- .../items/modular/weapon/secondary/axe/long.ron | 6 +++--- .../items/modular/weapon/secondary/bow/long.ron | 6 +++--- .../items/modular/weapon/secondary/bow/short.ron | 6 +++--- .../modular/weapon/secondary/hammer/long.ron | 6 +++--- .../modular/weapon/secondary/hammer/short.ron | 10 +++++----- .../modular/weapon/secondary/sceptre/heavy.ron | 6 +++--- .../modular/weapon/secondary/sceptre/light.ron | 6 +++--- .../modular/weapon/secondary/staff/heavy.ron | 6 +++--- .../modular/weapon/secondary/staff/light.ron | 6 +++--- .../modular/weapon/secondary/sword/long.ron | 6 +++--- .../modular/weapon/secondary/sword/short.ron | 10 +++++----- assets/common/items/weapons/axe/starter_axe.ron | 8 ++++---- assets/common/items/weapons/bow/starter.ron | 6 +++--- .../items/weapons/hammer/starter_hammer.ron | 8 ++++---- .../items/weapons/sceptre/starter_sceptre.ron | 8 ++++---- .../common/items/weapons/staff/starter_staff.ron | 8 ++++---- assets/common/items/weapons/sword/starter.ron | 8 ++++---- assets/common/items/weapons/sword_1h/starter.ron | 8 ++++---- assets/voxygen/i18n/en/common.ron | 2 +- assets/voxygen/voxel/item_drop_manifest.ron | 2 +- assets/world/wildlife/spawn/tundra/core.ron | 2 +- 117 files changed, 329 insertions(+), 329 deletions(-) diff --git a/assets/common/abilities/custom/arthropods/antlion/charge.ron b/assets/common/abilities/custom/arthropods/antlion/charge.ron index b30662dd84..8376ca4986 100644 --- a/assets/common/abilities/custom/arthropods/antlion/charge.ron +++ b/assets/common/abilities/custom/arthropods/antlion/charge.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Stab( - damage: 15.0, + damage: 30.0, poise: 20.0, knockback: 10.0, energy_regen: 0.0, ), scaled: Some(Stab( - damage: 60.0, + damage: 120.0, poise: 45.0, knockback: 25.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 3.0, - buildup_duration: 0.3, + buildup_duration: 0.6, charge_duration: 4.0, swing_duration: 0.1, recover_duration: 0.4, diff --git a/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron b/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron index 7a406cc784..883d4916f6 100644 --- a/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 37, + base_damage: 74, damage_increase: 0, base_poise_damage: 27.5, poise_damage_increase: 0, knockback: 9.0, range: 3.0, angle: 60.0, - base_buildup_duration: 0.7, + base_buildup_duration: 1.4, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron index 0cf8078f70..00e112a0f4 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.6, + buildup_duration: 1.2, recover_duration: 0.35, projectile: Poisonball( - damage: 25.0, + damage: 50.0, radius: 3.0, energy_regen: 0, min_falloff: 0.2, diff --git a/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron b/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron index f93dc5f540..43c60417b3 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 25, + base_damage: 50, damage_increase: 0, base_poise_damage: 16, poise_damage_increase: 0, knockback: 2.0, range: 3.0, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron b/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron index fd676b982e..2671e31ddb 100644 --- a/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron +++ b/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron @@ -1,12 +1,12 @@ LeapMelee( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 1.0, movement_duration: 0.4, swing_duration: 0.075, recover_duration: 0.2, melee_constructor: ( kind: Bash( - damage: 30.0, + damage: 60.0, poise: 20.0, knockback: 4.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron b/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron index 06a049559b..04a00bd754 100644 --- a/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 27, + base_damage: 54, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, range: 3.0, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/arthropods/tarantula/leap.ron b/assets/common/abilities/custom/arthropods/tarantula/leap.ron index f556131d65..bbc94aaab1 100644 --- a/assets/common/abilities/custom/arthropods/tarantula/leap.ron +++ b/assets/common/abilities/custom/arthropods/tarantula/leap.ron @@ -1,12 +1,12 @@ LeapMelee( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 1.0, movement_duration: 0.4, swing_duration: 0.075, recover_duration: 0.2, melee_constructor: ( kind: Bash( - damage: 35.0, + damage: 70.0, poise: 30.0, knockback: 1.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron b/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron index e201771290..4ec90f818e 100644 --- a/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 30, + base_damage: 60, damage_increase: 0, base_poise_damage: 21, poise_damage_increase: 0, knockback: 3.0, range: 3.0, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron b/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron index 891fba2e05..c8d804e188 100644 --- a/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 22, + base_damage: 44, damage_increase: 0, base_poise_damage: 14, poise_damage_increase: 0, knockback: 3.0, range: 3.0, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron index cc8938deb0..477ecdf953 100644 --- a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron +++ b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.2, + buildup_duration: 0.4, recover_duration: 0.2, beam_duration: 1.0, - damage: 0.6, + damage: 1.2, tick_rate: 15.0, range: 30.0, max_angle: 1.0, diff --git a/assets/common/abilities/custom/asp/firebomb.ron b/assets/common/abilities/custom/asp/firebomb.ron index 02b54ed7f3..17686a0eb9 100644 --- a/assets/common/abilities/custom/asp/firebomb.ron +++ b/assets/common/abilities/custom/asp/firebomb.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.6, recover_duration: 0.35, projectile: Fireball( - damage: 13.0, + damage: 26.0, radius: 5.0, energy_regen: 0, min_falloff: 0.5, diff --git a/assets/common/abilities/custom/asp/singlestrike.ron b/assets/common/abilities/custom/asp/singlestrike.ron index bf66750e24..7ab8a87aaf 100644 --- a/assets/common/abilities/custom/asp/singlestrike.ron +++ b/assets/common/abilities/custom/asp/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 14.0, + base_damage: 28.0, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.6, + base_buildup_duration: 1.2, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.2, diff --git a/assets/common/abilities/custom/basilisk/dash.ron b/assets/common/abilities/custom/basilisk/dash.ron index 34a1b77bc3..434162296e 100644 --- a/assets/common/abilities/custom/basilisk/dash.ron +++ b/assets/common/abilities/custom/basilisk/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 12.0, + damage: 24.0, poise: 25.0, knockback: 4.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 18.0, + damage: 36.0, poise: 0.0, knockback: 17.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 4.0, - buildup_duration: 0.8, + buildup_duration: 1.6, charge_duration: 1.0, swing_duration: 0.1, recover_duration: 1.0, diff --git a/assets/common/abilities/custom/basilisk/petrify.ron b/assets/common/abilities/custom/basilisk/petrify.ron index d5914137d3..796aa7e936 100644 --- a/assets/common/abilities/custom/basilisk/petrify.ron +++ b/assets/common/abilities/custom/basilisk/petrify.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.9, + buildup_duration: 1.8, recover_duration: 1.0, beam_duration: 1.0, - damage: 42.0, + damage: 84.0, tick_rate: 0.5, range: 22.0, max_angle: 5.0, diff --git a/assets/common/abilities/custom/basilisk/triplestrike.ron b/assets/common/abilities/custom/basilisk/triplestrike.ron index 9a7e49b3bd..d78252af9d 100644 --- a/assets/common/abilities/custom/basilisk/triplestrike.ron +++ b/assets/common/abilities/custom/basilisk/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 18.0, + base_damage: 36.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 3.0, range: 2.8, angle: 30.0, - base_buildup_duration: 0.7, + base_buildup_duration: 1.4, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 18.0, + base_damage: 36.0, damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, knockback: 3.0, range: 2.8, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 18.0, + base_damage: 36.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 2.8, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/beastclaws/basic.ron b/assets/common/abilities/custom/beastclaws/basic.ron index 22a98bfc32..b895667487 100644 --- a/assets/common/abilities/custom/beastclaws/basic.ron +++ b/assets/common/abilities/custom/beastclaws/basic.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.25, + buildup_duration: 0.5, swing_duration: 0.1, recover_duration: 0.25, melee_constructor: ( kind: Slash( - damage: 20.0, + damage: 40.0, poise: 40.0, knockback: 25.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/birdlargebasic/dash.ron b/assets/common/abilities/custom/birdlargebasic/dash.ron index ce53e9dd44..dc31516d29 100644 --- a/assets/common/abilities/custom/birdlargebasic/dash.ron +++ b/assets/common/abilities/custom/birdlargebasic/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 8.0, + damage: 16.0, poise: 50.0, knockback: 6.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 15.0, + damage: 30.0, poise: 100.0, knockback: 12.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 1.9, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 3.0, swing_duration: 0.1, recover_duration: 0.7, diff --git a/assets/common/abilities/custom/birdlargebasic/triplestrike.ron b/assets/common/abilities/custom/birdlargebasic/triplestrike.ron index 5fc9b43899..9eb2134f86 100644 --- a/assets/common/abilities/custom/birdlargebasic/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebasic/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 11.0, + base_damage: 22.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 5.0, range: 4.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 9.0, + base_damage: 18.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 14.0, + base_damage: 28.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/birdlargebreathe/firebomb.ron b/assets/common/abilities/custom/birdlargebreathe/firebomb.ron index a3708e2740..3f58ce7754 100644 --- a/assets/common/abilities/custom/birdlargebreathe/firebomb.ron +++ b/assets/common/abilities/custom/birdlargebreathe/firebomb.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 1.0, recover_duration: 0.35, projectile: Fireball( - damage: 10.0, + damage: 20.0, radius: 5.0, energy_regen: 5.0, min_falloff: 0.5, diff --git a/assets/common/abilities/custom/birdlargebreathe/flamethrower.ron b/assets/common/abilities/custom/birdlargebreathe/flamethrower.ron index 6b6ccdff31..67a105712b 100644 --- a/assets/common/abilities/custom/birdlargebreathe/flamethrower.ron +++ b/assets/common/abilities/custom/birdlargebreathe/flamethrower.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.4, + buildup_duration: 0.8, recover_duration: 0.25, beam_duration: 0.5, - damage: 5.0, + damage: 10.0, tick_rate: 3.0, range: 15.0, max_angle: 22.5, diff --git a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron index c8c932a288..0bbb0d9c61 100644 --- a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 10.0, + base_damage: 20.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 5.0, range: 4.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -24,14 +24,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -46,14 +46,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 13.0, + base_damage: 26.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/birdlargefire/firebomb.ron b/assets/common/abilities/custom/birdlargefire/firebomb.ron index a3708e2740..3f58ce7754 100644 --- a/assets/common/abilities/custom/birdlargefire/firebomb.ron +++ b/assets/common/abilities/custom/birdlargefire/firebomb.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 1.0, recover_duration: 0.35, projectile: Fireball( - damage: 10.0, + damage: 20.0, radius: 5.0, energy_regen: 5.0, min_falloff: 0.5, diff --git a/assets/common/abilities/custom/birdlargefire/fireshockwave.ron b/assets/common/abilities/custom/birdlargefire/fireshockwave.ron index 36671dc626..98971737a2 100644 --- a/assets/common/abilities/custom/birdlargefire/fireshockwave.ron +++ b/assets/common/abilities/custom/birdlargefire/fireshockwave.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 60.0, - buildup_duration: 0.7, + buildup_duration: 1.4, swing_duration: 0.1, recover_duration: 0.2, - damage: 20.0, + damage: 40.0, poise_damage: 0, knockback: ( strength: 25.0, direction: Away), shockwave_angle: 360.0, diff --git a/assets/common/abilities/custom/birdlargefire/flamethrower.ron b/assets/common/abilities/custom/birdlargefire/flamethrower.ron index 6b6ccdff31..67a105712b 100644 --- a/assets/common/abilities/custom/birdlargefire/flamethrower.ron +++ b/assets/common/abilities/custom/birdlargefire/flamethrower.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.4, + buildup_duration: 0.8, recover_duration: 0.25, beam_duration: 0.5, - damage: 5.0, + damage: 10.0, tick_rate: 3.0, range: 15.0, max_angle: 22.5, diff --git a/assets/common/abilities/custom/birdlargefire/triplestrike.ron b/assets/common/abilities/custom/birdlargefire/triplestrike.ron index c8c932a288..2d66fbb072 100644 --- a/assets/common/abilities/custom/birdlargefire/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargefire/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 10.0, + base_damage: 20.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 5.0, range: 4.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -24,14 +24,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -46,14 +46,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 13.0, + base_damage: 26.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 10.0, range: 3.5, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 0.375, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/claygolem/laser.ron b/assets/common/abilities/custom/claygolem/laser.ron index cb07b26331..b15de8d61d 100644 --- a/assets/common/abilities/custom/claygolem/laser.ron +++ b/assets/common/abilities/custom/claygolem/laser.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.5, + buildup_duration: 0.75, recover_duration: 0.4, beam_duration: 0.25, - damage: 7.0, + damage: 10.5, tick_rate: 2.0, range: 40.0, max_angle: 1.0, diff --git a/assets/common/abilities/custom/claygolem/rocket.ron b/assets/common/abilities/custom/claygolem/rocket.ron index 5b5a87cc02..a1a57c4d0a 100644 --- a/assets/common/abilities/custom/claygolem/rocket.ron +++ b/assets/common/abilities/custom/claygolem/rocket.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.2, recover_duration: 0.5, projectile: ClayRocket( - damage: 50.0, + damage: 75.0, knockback: 18.0, radius: 5.0, min_falloff: 0.75, diff --git a/assets/common/abilities/custom/claygolem/shockwave.ron b/assets/common/abilities/custom/claygolem/shockwave.ron index 2d9a425735..81c4ae9142 100644 --- a/assets/common/abilities/custom/claygolem/shockwave.ron +++ b/assets/common/abilities/custom/claygolem/shockwave.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 0, - buildup_duration: 1.5, + buildup_duration: 2.25, swing_duration: 0.12, recover_duration: 1.2, - damage: 50.0, + damage: 75.0, poise_damage: 50, knockback: (strength: 30.0, direction: TowardsUp), shockwave_angle: 180.0, diff --git a/assets/common/abilities/custom/claygolem/strike.ron b/assets/common/abilities/custom/claygolem/strike.ron index c49c68b75f..10d4bb24bf 100644 --- a/assets/common/abilities/custom/claygolem/strike.ron +++ b/assets/common/abilities/custom/claygolem/strike.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.2, swing_duration: 0.1, recover_duration: 0.5, melee_constructor: ( kind: Bash( - damage: 20.0, + damage: 30.0, poise: 50.0, knockback: 10.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/deadwood/dash.ron b/assets/common/abilities/custom/deadwood/dash.ron index 853c25462e..13f78b3b81 100644 --- a/assets/common/abilities/custom/deadwood/dash.ron +++ b/assets/common/abilities/custom/deadwood/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 8.0, + damage: 16.0, poise: 25.0, knockback: 4.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 15.0, + damage: 30.0, poise: 0.0, knockback: 17.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 3, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 1.0, swing_duration: 0.1, recover_duration: 1.0, diff --git a/assets/common/abilities/custom/deadwood/lifestealbeam.ron b/assets/common/abilities/custom/deadwood/lifestealbeam.ron index 9f3964953a..ca15b048ed 100644 --- a/assets/common/abilities/custom/deadwood/lifestealbeam.ron +++ b/assets/common/abilities/custom/deadwood/lifestealbeam.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.25, + buildup_duration: 0.5, recover_duration: 0.25, beam_duration: 1, - damage: 3.0, + damage: 6.0, tick_rate: 2.0, range: 25.0, max_angle: 1.0, diff --git a/assets/common/abilities/custom/harvester/explodingpumpkin.ron b/assets/common/abilities/custom/harvester/explodingpumpkin.ron index 23800d70a6..cbc298f11b 100644 --- a/assets/common/abilities/custom/harvester/explodingpumpkin.ron +++ b/assets/common/abilities/custom/harvester/explodingpumpkin.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 0.75, recover_duration: 0.8, projectile: ExplodingPumpkin( - damage: 25.0, + damage: 37.5, knockback: 25.0, radius: 5.0, min_falloff: 0.6, diff --git a/assets/common/abilities/custom/harvester/firebreath.ron b/assets/common/abilities/custom/harvester/firebreath.ron index 8a95a1f296..af59d0eb50 100644 --- a/assets/common/abilities/custom/harvester/firebreath.ron +++ b/assets/common/abilities/custom/harvester/firebreath.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.7, - recover_duration: 0.6, + buildup_duration: 1.4, + recover_duration: 0.45, beam_duration: 1.0, - damage: 6.0, + damage: 9.0, tick_rate: 1.5, range: 20.0, max_angle: 15.0, diff --git a/assets/common/abilities/custom/harvester/scythe.ron b/assets/common/abilities/custom/harvester/scythe.ron index 6beea854eb..6abe9e2e16 100644 --- a/assets/common/abilities/custom/harvester/scythe.ron +++ b/assets/common/abilities/custom/harvester/scythe.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.6, + buildup_duration: 0.9, swing_duration: 0.1, recover_duration: 0.6, melee_constructor: ( kind: Slash( - damage: 14.0, + damage: 21.0, poise: 10.0, knockback: 10.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/husk/singlestrike.ron b/assets/common/abilities/custom/husk/singlestrike.ron index 42fa5e98e3..bfd687b5b1 100644 --- a/assets/common/abilities/custom/husk/singlestrike.ron +++ b/assets/common/abilities/custom/husk/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 16.0, + base_damage: 32.0, damage_increase: 0, base_poise_damage: 12, poise_damage_increase: 0, knockback: 5.0, range: 2.5, angle: 60.0, - base_buildup_duration: 0.25, + base_buildup_duration: 0.5, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.25, diff --git a/assets/common/abilities/custom/husk/triplestrike.ron b/assets/common/abilities/custom/husk/triplestrike.ron index 56d2ecc260..38b8c49ab1 100644 --- a/assets/common/abilities/custom/husk/triplestrike.ron +++ b/assets/common/abilities/custom/husk/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 16.0, + base_damage: 32.0, damage_increase: 0, base_poise_damage: 6, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.2, + base_buildup_duration: 0.4, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.2, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 16.0, + base_damage: 32.0, damage_increase: 0, base_poise_damage: 8, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.22, + base_buildup_duration: 0.44, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.2, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 16.0, + base_damage: 32.0, damage_increase: 0, base_poise_damage: 10, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.2, + base_buildup_duration: 0.4, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.2, diff --git a/assets/common/abilities/custom/husk_brute/chargedmelee.ron b/assets/common/abilities/custom/husk_brute/chargedmelee.ron index 68c9bb8a50..2527523484 100644 --- a/assets/common/abilities/custom/husk_brute/chargedmelee.ron +++ b/assets/common/abilities/custom/husk_brute/chargedmelee.ron @@ -3,13 +3,13 @@ ChargedMelee( energy_drain: 0, melee_constructor: ( kind: Bash( - damage: 5.0, + damage: 10.0, poise: 50.0, knockback: 0.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 45.0, + damage: 90.0, poise: 150.0, knockback: 0.0, energy_regen: 0.0, @@ -20,5 +20,5 @@ ChargedMelee( charge_duration: 1.5, swing_duration: 0.1, hit_timing: 0.8, - recover_duration: 0.5, + recover_duration: 1.0, ) diff --git a/assets/common/abilities/custom/husk_brute/singlestrike.ron b/assets/common/abilities/custom/husk_brute/singlestrike.ron index ef4b204ef2..83b8724da8 100644 --- a/assets/common/abilities/custom/husk_brute/singlestrike.ron +++ b/assets/common/abilities/custom/husk_brute/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 20.0, + base_damage: 40.0, damage_increase: 0, base_poise_damage: 12, poise_damage_increase: 0, knockback: 5.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.5, + base_buildup_duration: 1.0, base_swing_duration: 0.2, hit_timing: 0.5, base_recover_duration: 0.5, diff --git a/assets/common/abilities/custom/mandragora/basic.ron b/assets/common/abilities/custom/mandragora/basic.ron index cf44dd6b25..bd15d18ab1 100644 --- a/assets/common/abilities/custom/mandragora/basic.ron +++ b/assets/common/abilities/custom/mandragora/basic.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.2, + buildup_duration: 0.4, swing_duration: 0.05, recover_duration: 0.3, melee_constructor: ( kind: Bash( - damage: 4, + damage: 8, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/custom/mandragora/scream.ron b/assets/common/abilities/custom/mandragora/scream.ron index f7625a5a76..e07816faf7 100644 --- a/assets/common/abilities/custom/mandragora/scream.ron +++ b/assets/common/abilities/custom/mandragora/scream.ron @@ -1,10 +1,10 @@ SpinMelee( - buildup_duration: 0.5, + buildup_duration: 0.25, swing_duration: 0.3, recover_duration: 0.5, melee_constructor: ( kind: SonicWave( - damage: 5, + damage: 10, poise: 100, knockback: 20, ), diff --git a/assets/common/abilities/custom/maneater/poisonball.ron b/assets/common/abilities/custom/maneater/poisonball.ron index 8b13e59ecf..0d4f59666c 100644 --- a/assets/common/abilities/custom/maneater/poisonball.ron +++ b/assets/common/abilities/custom/maneater/poisonball.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.6, recover_duration: 0.35, projectile: NecroticSphere( - damage: 26.0, + damage: 52.0, radius: 5.0, energy_regen: 0, min_falloff: 0.5, diff --git a/assets/common/abilities/custom/maneater/singlestrike.ron b/assets/common/abilities/custom/maneater/singlestrike.ron index ac08ed7a97..979d2a3037 100644 --- a/assets/common/abilities/custom/maneater/singlestrike.ron +++ b/assets/common/abilities/custom/maneater/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 20.0, + base_damage: 40.0, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.5, + base_buildup_duration: 1.0, base_swing_duration: 0.075, hit_timing: 0.5, base_recover_duration: 0.2, diff --git a/assets/common/abilities/custom/mindflayer/cursedflames.ron b/assets/common/abilities/custom/mindflayer/cursedflames.ron index 122d85f834..b43cdee860 100644 --- a/assets/common/abilities/custom/mindflayer/cursedflames.ron +++ b/assets/common/abilities/custom/mindflayer/cursedflames.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.40, + buildup_duration: 0.3, recover_duration: 0.50, beam_duration: 1.0, - damage: 15.0, + damage: 22.5, tick_rate: 5.0, range: 22.0, max_angle: 15.0, diff --git a/assets/common/abilities/custom/mindflayer/necroticsphere.ron b/assets/common/abilities/custom/mindflayer/necroticsphere.ron index e353fd46fe..53de12ba0f 100644 --- a/assets/common/abilities/custom/mindflayer/necroticsphere.ron +++ b/assets/common/abilities/custom/mindflayer/necroticsphere.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.75, + buildup_duration: 1.125, recover_duration: 0.4, projectile: NecroticSphere( - damage: 45.0, + damage: 67.5, radius: 5.0, min_falloff: 0.9, ), diff --git a/assets/common/abilities/custom/mindflayer/necroticvortex.ron b/assets/common/abilities/custom/mindflayer/necroticvortex.ron index 2234840015..c5bbff4208 100644 --- a/assets/common/abilities/custom/mindflayer/necroticvortex.ron +++ b/assets/common/abilities/custom/mindflayer/necroticvortex.ron @@ -1,10 +1,10 @@ SpinMelee( - buildup_duration: 0.8, + buildup_duration: 1.2, swing_duration: 0.5, recover_duration: 0.6, melee_constructor: ( kind: NecroticVortex( - damage: 20.0, + damage: 30.0, pull: 7.0, lifesteal: 2.0, ), diff --git a/assets/common/abilities/custom/minotaur/charge.ron b/assets/common/abilities/custom/minotaur/charge.ron index fbe24cc225..3dcacb91a7 100644 --- a/assets/common/abilities/custom/minotaur/charge.ron +++ b/assets/common/abilities/custom/minotaur/charge.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Stab( - damage: 15.0, + damage: 22.5, poise: 25.0, knockback: 10.0, energy_regen: 0.0, ), scaled: Some(Stab( - damage: 60.0, + damage: 90.0, poise: 100.0, knockback: 30.0, energy_regen: 0.0, @@ -24,7 +24,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 5.0, - buildup_duration: 0.4, + buildup_duration: 0.6, charge_duration: 4.0, swing_duration: 0.1, recover_duration: 1.7, diff --git a/assets/common/abilities/custom/minotaur/cleave.ron b/assets/common/abilities/custom/minotaur/cleave.ron index 8724657bd8..ef4d07ad4f 100644 --- a/assets/common/abilities/custom/minotaur/cleave.ron +++ b/assets/common/abilities/custom/minotaur/cleave.ron @@ -3,7 +3,7 @@ ChargedMelee( energy_drain: 0, melee_constructor: ( kind: Slash( - damage: 5.0, + damage: 7.5, poise: 50.0, knockback: 0.0, energy_regen: 0.0, @@ -17,7 +17,7 @@ ChargedMelee( range: 5.0, angle: 45.0, ), - charge_duration: 1.5, + charge_duration: 2.25, swing_duration: 0.1, hit_timing: 0.8, recover_duration: 0.5, diff --git a/assets/common/abilities/custom/minotaur/cripplingstrike.ron b/assets/common/abilities/custom/minotaur/cripplingstrike.ron index 490be6f94f..991b3c234a 100644 --- a/assets/common/abilities/custom/minotaur/cripplingstrike.ron +++ b/assets/common/abilities/custom/minotaur/cripplingstrike.ron @@ -1,6 +1,6 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.3, + buildup_duration: 0.45, swing_duration: 0.1, recover_duration: 0.6, melee_constructor: ( diff --git a/assets/common/abilities/custom/oni/dash.ron b/assets/common/abilities/custom/oni/dash.ron index f5f7c9fa0e..a2322529fb 100644 --- a/assets/common/abilities/custom/oni/dash.ron +++ b/assets/common/abilities/custom/oni/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Slash( - damage: 8.0, + damage: 16.0, poise: 0.0, knockback: 8.0, energy_regen: 0.0, ), scaled: Some(Slash( - damage: 16.0, + damage: 32.0, poise: 0.0, knockback: 7.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 3.0, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 3.0, swing_duration: 0.35, recover_duration: 1.2, diff --git a/assets/common/abilities/custom/oni/doublestrike.ron b/assets/common/abilities/custom/oni/doublestrike.ron index 3f39a42911..dd8ee46dfc 100644 --- a/assets/common/abilities/custom/oni/doublestrike.ron +++ b/assets/common/abilities/custom/oni/doublestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 9.0, + base_damage: 18.0, damage_increase: 1.0, base_poise_damage: 0, poise_damage_increase: 0, knockback: 4.0, range: 3.5, angle: 50.0, - base_buildup_duration: 0.6, + base_buildup_duration: 1.2, base_swing_duration: 0.12, hit_timing: 0.5, base_recover_duration: 0.6, @@ -24,14 +24,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 13.0, + base_damage: 26.0, damage_increase: 1.5, base_poise_damage: 0, poise_damage_increase: 0, knockback: 16.0, range: 5.5, angle: 15.0, - base_buildup_duration: 0.5, + base_buildup_duration: 1.0, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 1.2, diff --git a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron index cf0349d12c..37f2dedf93 100644 --- a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 20.0, + base_damage: 40.0, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 2.0, angle: 60.0, - base_buildup_duration: 0.6, + base_buildup_duration: 1.2, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron index 308860f0ee..24db85efae 100644 --- a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 14.0, + base_damage: 28.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 3.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 14.0, + base_damage: 28.0, damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, knockback: 3.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 14.0, + base_damage: 28.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/quadlowbeam/lifestealbeam.ron b/assets/common/abilities/custom/quadlowbeam/lifestealbeam.ron index ca19726b1e..270d982f87 100644 --- a/assets/common/abilities/custom/quadlowbeam/lifestealbeam.ron +++ b/assets/common/abilities/custom/quadlowbeam/lifestealbeam.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.25, + buildup_duration: 0.5, recover_duration: 0.25, beam_duration: 1.0, - damage: 3.0, + damage: 6.0, tick_rate: 2.0, range: 25.0, max_angle: 1.0, diff --git a/assets/common/abilities/custom/quadlowbreathe/dash.ron b/assets/common/abilities/custom/quadlowbreathe/dash.ron index af63c687b7..87b920217a 100644 --- a/assets/common/abilities/custom/quadlowbreathe/dash.ron +++ b/assets/common/abilities/custom/quadlowbreathe/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 8.0, + damage: 16.0, poise: 25.0, knockback: 4.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 15.0, + damage: 30.0, poise: 0.0, knockback: 17.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 4.0, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 1.0, swing_duration: 0.1, recover_duration: 1.0, diff --git a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron index 3b89fcec4a..3bc90081a5 100644 --- a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron +++ b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.4, + buildup_duration: 0.8, recover_duration: 0.25, beam_duration: 0.5, - damage: 7.0, + damage: 14.0, tick_rate: 3.0, range: 15.0, max_angle: 22.5, diff --git a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron index f17dcdedbb..55fc5c3b3c 100644 --- a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 22.0, + base_damage: 44.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 22.0, + base_damage: 44.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 22.0, + base_damage: 44.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/quadlowquick/dash.ron b/assets/common/abilities/custom/quadlowquick/dash.ron index 4a8a65b283..2f6ddd5a14 100644 --- a/assets/common/abilities/custom/quadlowquick/dash.ron +++ b/assets/common/abilities/custom/quadlowquick/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 4.0, + damage: 8.0, poise: 30.0, knockback: 2.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 8.0, + damage: 16.0, poise: 0.0, knockback: 7.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 0.8, swing_duration: 0.1, recover_duration: 1.0, diff --git a/assets/common/abilities/custom/quadlowquick/quadstrike.ron b/assets/common/abilities/custom/quadlowquick/quadstrike.ron index b8575523ff..cecacd8f2e 100644 --- a/assets/common/abilities/custom/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/custom/quadlowquick/quadstrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 6.0, + base_damage: 12.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 1.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.6, + base_buildup_duration: 1.2, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.1, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 6.0, + base_damage: 12.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 1.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.15, + base_buildup_duration: 0.3, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.1, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 6.0, + base_damage: 12.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 1.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.2, + base_buildup_duration: 0.4, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.1, @@ -50,14 +50,14 @@ ComboMelee( ), ( stage: 4, - base_damage: 6.0, + base_damage: 12.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 8.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.2, + base_buildup_duration: 0.4, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.1, diff --git a/assets/common/abilities/custom/quadlowranged/firebomb.ron b/assets/common/abilities/custom/quadlowranged/firebomb.ron index 7b4fe7b0f0..e27c74814e 100644 --- a/assets/common/abilities/custom/quadlowranged/firebomb.ron +++ b/assets/common/abilities/custom/quadlowranged/firebomb.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.6, recover_duration: 0.35, projectile: NecroticSphere( - damage: 13.0, + damage: 26.0, radius: 5.0, energy_regen: 0, min_falloff: 0.5, diff --git a/assets/common/abilities/custom/quadlowtail/charged.ron b/assets/common/abilities/custom/quadlowtail/charged.ron index ff3ae1f4a0..f3cc2a50f3 100644 --- a/assets/common/abilities/custom/quadlowtail/charged.ron +++ b/assets/common/abilities/custom/quadlowtail/charged.ron @@ -3,13 +3,13 @@ ChargedMelee( energy_drain: 0, melee_constructor: ( kind: Bash( - damage: 4.0, + damage: 8.0, poise: 30.0, knockback: 10.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 20.0, + damage: 40.0, poise: 80.0, knockback: 20.0, energy_regen: 0.0, @@ -17,7 +17,7 @@ ChargedMelee( range: 6.0, angle: 90.0, ), - charge_duration: 0.8, + charge_duration: 1.6, swing_duration: 0.7, hit_timing: 0.9, recover_duration: 0.7, diff --git a/assets/common/abilities/custom/quadlowtail/triplestrike.ron b/assets/common/abilities/custom/quadlowtail/triplestrike.ron index 36c18555bc..5610758c07 100644 --- a/assets/common/abilities/custom/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowtail/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 22, knockback: 10.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.2, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, knockback: 10.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.2, + base_buildup_duration: 0.4, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.2, @@ -34,7 +34,7 @@ ComboMelee( ), ( stage: 3, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, diff --git a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron index 2b654ced93..9bce527f4d 100644 --- a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 10.0, + base_damage: 20.0, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 2.7, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/quadmedbasic/triplestrike.ron b/assets/common/abilities/custom/quadmedbasic/triplestrike.ron index c0ce86171f..cafac5dc39 100644 --- a/assets/common/abilities/custom/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 5.0, + base_damage: 10.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.45, + base_buildup_duration: 0.9, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.2, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 5.0, + base_damage: 10.0, damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, knockback: 5.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.2, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 5.0, + base_damage: 10.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.2, diff --git a/assets/common/abilities/custom/quadmedcharge/dash.ron b/assets/common/abilities/custom/quadmedcharge/dash.ron index f8cdd68571..dda607a549 100644 --- a/assets/common/abilities/custom/quadmedcharge/dash.ron +++ b/assets/common/abilities/custom/quadmedcharge/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 7.0, + damage: 14.0, poise: 28.0, knockback: 8.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 28.0, + damage: 56.0, poise: 40.0, knockback: 17.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 1.2, swing_duration: 0.1, recover_duration: 1.1, diff --git a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron index 73b31feec1..98c3c33626 100644 --- a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 25.0, + base_damage: 50.0, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, knockback: 4.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 37.0, + base_damage: 74.0, damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 22, knockback: 4.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/quadmedhoof/basic.ron b/assets/common/abilities/custom/quadmedhoof/basic.ron index 86baf681b0..af6a48c05b 100644 --- a/assets/common/abilities/custom/quadmedhoof/basic.ron +++ b/assets/common/abilities/custom/quadmedhoof/basic.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.65, + buildup_duration: 1.3, swing_duration: 0.3, recover_duration: 0.35, melee_constructor: ( kind: Bash( - damage: 10.0, + damage:20.0, poise: 28.0, knockback: 25.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/quadmedjump/doublestrike.ron b/assets/common/abilities/custom/quadmedjump/doublestrike.ron index 37eb39aaa5..7461a42408 100644 --- a/assets/common/abilities/custom/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedjump/doublestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 30, poise_damage_increase: 0, knockback: 4.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 30, poise_damage_increase: 0, knockback: 4.0, range: 2.2, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/quadmedjump/leap.ron b/assets/common/abilities/custom/quadmedjump/leap.ron index db4d7b1bc2..8d97c56cdc 100644 --- a/assets/common/abilities/custom/quadmedjump/leap.ron +++ b/assets/common/abilities/custom/quadmedjump/leap.ron @@ -1,12 +1,12 @@ LeapMelee( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 1.0, movement_duration: 0.4, swing_duration: 0.075, recover_duration: 0.2, melee_constructor: ( kind: Bash( - damage: 12.0, + damage: 24.0, poise: 60.0, knockback: 4.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/quadmedjump/quickleap.ron b/assets/common/abilities/custom/quadmedjump/quickleap.ron index 771e8d55a7..c4a14e5d12 100644 --- a/assets/common/abilities/custom/quadmedjump/quickleap.ron +++ b/assets/common/abilities/custom/quadmedjump/quickleap.ron @@ -1,12 +1,12 @@ LeapMelee( energy_cost: 0, - buildup_duration: 0.2, + buildup_duration: 0.8, movement_duration: 0.3, swing_duration: 0.075, recover_duration: 0.125, melee_constructor: ( kind: Bash( - damage: 8.0, + damage: 16.0, poise: 30.0, knockback: 2.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/quadmedquick/dash.ron b/assets/common/abilities/custom/quadmedquick/dash.ron index a39225f2f4..aa79cfaf7c 100644 --- a/assets/common/abilities/custom/quadmedquick/dash.ron +++ b/assets/common/abilities/custom/quadmedquick/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 7.5, + damage: 15.0, poise: 28.0, knockback: 3.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 2.0, + damage: 4.0, poise: 28.0, knockback: 7.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.5, - buildup_duration: 1.2, + buildup_duration: 2.4, charge_duration: 1.0, swing_duration: 0.1, recover_duration: 1.0, diff --git a/assets/common/abilities/custom/quadmedquick/triplestrike.ron b/assets/common/abilities/custom/quadmedquick/triplestrike.ron index 7c2f8980e6..eb67c0a7a0 100644 --- a/assets/common/abilities/custom/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedquick/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 10.0, + base_damage: 20.0, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, knockback: 5.0, range: 2.2, angle: 40.0, - base_buildup_duration: 0.6, + base_buildup_duration: 1.2, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.4, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 10.0, + base_damage: 20.0, damage_increase: 0, base_poise_damage: 17, poise_damage_increase: 0, knockback: 5.0, range: 2.2, angle: 40.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 10.0, + base_damage: 20.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 5.0, range: 2.2, angle: 40.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron index 73ad450775..2e30da75ab 100644 --- a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 3.0, + base_damage: 6.0, damage_increase: 0, base_poise_damage: 10, poise_damage_increase: 0, knockback: 1.0, range: 1.5, angle: 50.0, - base_buildup_duration: 0.3, + base_buildup_duration: 0.6, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, diff --git a/assets/common/abilities/custom/stonegolemfist/shockwave.ron b/assets/common/abilities/custom/stonegolemfist/shockwave.ron index 0f9ac664d1..46b6d60d11 100644 --- a/assets/common/abilities/custom/stonegolemfist/shockwave.ron +++ b/assets/common/abilities/custom/stonegolemfist/shockwave.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 0, - buildup_duration: 0.6, + buildup_duration: 1.2, swing_duration: 0.12, recover_duration: 1.2, - damage: 50.0, + damage: 100.0, poise_damage: 50, knockback: (strength: 40.0, direction: TowardsUp), shockwave_angle: 100.0, diff --git a/assets/common/abilities/custom/stonegolemfist/singlestrike.ron b/assets/common/abilities/custom/stonegolemfist/singlestrike.ron index eec00b7c17..a1cbfe64bf 100644 --- a/assets/common/abilities/custom/stonegolemfist/singlestrike.ron +++ b/assets/common/abilities/custom/stonegolemfist/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 30.0, + base_damage: 60.0, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, knockback: 3.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.9, + base_buildup_duration: 1.8, base_swing_duration: 0.1, hit_timing: 0.5, base_recover_duration: 0.9, diff --git a/assets/common/abilities/custom/stonegolemfist/spin.ron b/assets/common/abilities/custom/stonegolemfist/spin.ron index dece734a86..a06ddca64c 100644 --- a/assets/common/abilities/custom/stonegolemfist/spin.ron +++ b/assets/common/abilities/custom/stonegolemfist/spin.ron @@ -1,10 +1,10 @@ SpinMelee( - buildup_duration: 0.1, + buildup_duration: 0.2, swing_duration: 0.3, recover_duration: 0.1, melee_constructor: ( kind: Bash( - damage: 50.0, + damage: 100.0, poise: 30.0, knockback: 0.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/theropodbasic/dash.ron b/assets/common/abilities/custom/theropodbasic/dash.ron index e62f53d02e..79d0aa22bc 100644 --- a/assets/common/abilities/custom/theropodbasic/dash.ron +++ b/assets/common/abilities/custom/theropodbasic/dash.ron @@ -2,13 +2,13 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 12.0, + damage: 24.0, poise: 0.0, knockback: 8.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 16.0, + damage: 32.0, poise: 0.0, knockback: 17.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 0.5, + buildup_duration: 1.0, charge_duration: 1.2, swing_duration: 0.1, recover_duration: 1.1, diff --git a/assets/common/abilities/custom/theropodbasic/singlestrike.ron b/assets/common/abilities/custom/theropodbasic/singlestrike.ron index 1226876cdd..57d5e8598e 100644 --- a/assets/common/abilities/custom/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 27.0, + base_damage: 54.0, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, knockback: 4.0, range: 7.5, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/theropodbasic/triplestrike.ron b/assets/common/abilities/custom/theropodbasic/triplestrike.ron index 7516469eb9..b3406fbdf3 100644 --- a/assets/common/abilities/custom/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 30.0, + base_damage: 60.0, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, knockback: 3.0, range: 7.5, angle: 30.0, - base_buildup_duration: 0.7, + base_buildup_duration: 1.4, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 34.0, + base_damage: 68.0, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, knockback: 3.0, range: 5.5, angle: 30.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.2, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.15, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 40.0, + base_damage: 80.0, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, knockback: 25.0, range: 5.5, angle: 30.0, - base_buildup_duration: 0.3, + base_buildup_duration: 0.6, base_swing_duration: 0.125, hit_timing: 0.5, base_recover_duration: 0.9, diff --git a/assets/common/abilities/custom/theropodbird/singlestrike.ron b/assets/common/abilities/custom/theropodbird/singlestrike.ron index d7932993cc..c1843faaf7 100644 --- a/assets/common/abilities/custom/theropodbird/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbird/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 11.0, + base_damage: 22.0, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 2.0, range: 3.0, angle: 15.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/theropodbird/triplestrike.ron b/assets/common/abilities/custom/theropodbird/triplestrike.ron index 51d8a24280..b1db65ed2b 100644 --- a/assets/common/abilities/custom/theropodbird/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbird/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 11.0, + base_damage: 22.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 3.0, angle: 15.0, - base_buildup_duration: 0.65, + base_buildup_duration: 1.3, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 15.0, + base_damage: 30.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 3.0, angle: 15.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.8, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.15, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 18.0, + base_damage: 36.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 3.0, angle: 15.0, - base_buildup_duration: 0.35, + base_buildup_duration: 0.7, base_swing_duration: 0.125, hit_timing: 0.5, base_recover_duration: 0.9, diff --git a/assets/common/abilities/custom/tidalwarrior/bubbles.ron b/assets/common/abilities/custom/tidalwarrior/bubbles.ron index d0466b356a..c98e937e05 100644 --- a/assets/common/abilities/custom/tidalwarrior/bubbles.ron +++ b/assets/common/abilities/custom/tidalwarrior/bubbles.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.5, + buildup_duration: 0.75, recover_duration: 0.5, beam_duration: 2.5, - damage: 5.0, + damage: 7.5, tick_rate: 2.0, range: 25.0, max_angle: 15.0, diff --git a/assets/common/abilities/custom/tidalwarrior/pincer.ron b/assets/common/abilities/custom/tidalwarrior/pincer.ron index 8b52b39ed2..c90ec5fd69 100644 --- a/assets/common/abilities/custom/tidalwarrior/pincer.ron +++ b/assets/common/abilities/custom/tidalwarrior/pincer.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.3, + buildup_duration: 0.45, swing_duration: 0.1, recover_duration: 0.6, melee_constructor: ( kind: Bash( - damage: 5.0, + damage: 7.5, poise: 0.0, knockback: 50.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/tidalwarrior/scuttle.ron b/assets/common/abilities/custom/tidalwarrior/scuttle.ron index 36d4651e66..85eac7038a 100644 --- a/assets/common/abilities/custom/tidalwarrior/scuttle.ron +++ b/assets/common/abilities/custom/tidalwarrior/scuttle.ron @@ -8,7 +8,7 @@ DashMelee( energy_regen: 0.0, ), scaled: Some(Bash( - damage: 25.0, + damage: 12.5, poise: 40.0, knockback: 30.0, energy_regen: 0.0, @@ -18,7 +18,7 @@ DashMelee( ), energy_drain: 0, forward_speed: 10.0, - buildup_duration: 0.4, + buildup_duration: 0.6, charge_duration: 2.0, swing_duration: 0.1, recover_duration: 0.5, diff --git a/assets/common/abilities/custom/tidalwarrior/totem_wave.ron b/assets/common/abilities/custom/tidalwarrior/totem_wave.ron index 7271a351dd..b59e639c10 100644 --- a/assets/common/abilities/custom/tidalwarrior/totem_wave.ron +++ b/assets/common/abilities/custom/tidalwarrior/totem_wave.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 0, - buildup_duration: 0.4, + buildup_duration: 0.6, swing_duration: 0.1, recover_duration: 3.5, - damage: 1.0, + damage: 1.5, poise_damage: 0, knockback: ( strength: 18.0, direction: Away), shockwave_angle: 360.0, diff --git a/assets/common/abilities/custom/tornado/spin.ron b/assets/common/abilities/custom/tornado/spin.ron index 4b040a1c92..fe87bdedf9 100644 --- a/assets/common/abilities/custom/tornado/spin.ron +++ b/assets/common/abilities/custom/tornado/spin.ron @@ -4,7 +4,7 @@ SpinMelee( recover_duration: 0.0, melee_constructor: ( kind: Slash( - damage: 40.0, + damage: 80.0, poise: 0.0, knockback: 50.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/turret/arrows.ron b/assets/common/abilities/custom/turret/arrows.ron index 88867de18a..80962801e0 100644 --- a/assets/common/abilities/custom/turret/arrows.ron +++ b/assets/common/abilities/custom/turret/arrows.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 1.0, + buildup_duration: 2.0, recover_duration: 0.3, projectile: Arrow( - damage: 20.0, + damage: 40.0, knockback: 5.0, energy_regen: 10.0, ), diff --git a/assets/common/abilities/custom/turret/flamethrower.ron b/assets/common/abilities/custom/turret/flamethrower.ron index 30fabdc45e..5e04c071b2 100644 --- a/assets/common/abilities/custom/turret/flamethrower.ron +++ b/assets/common/abilities/custom/turret/flamethrower.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.25, + buildup_duration: 0.5, recover_duration: 0.25, beam_duration: 1.0, - damage: 3.5, + damage: 7, tick_rate: 3.0, range: 20.0, max_angle: 15.0, diff --git a/assets/common/abilities/custom/wendigomagic/frostbomb.ron b/assets/common/abilities/custom/wendigomagic/frostbomb.ron index 37f8295f9f..85f3670f68 100644 --- a/assets/common/abilities/custom/wendigomagic/frostbomb.ron +++ b/assets/common/abilities/custom/wendigomagic/frostbomb.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, buildup_duration: 0.5, - recover_duration: 0.35, + recover_duration: 0.7, projectile: Frostball( - damage: 12.0, + damage: 24.0, radius: 5.0, min_falloff: 0.5, ), diff --git a/assets/common/abilities/custom/wendigomagic/singlestrike.ron b/assets/common/abilities/custom/wendigomagic/singlestrike.ron index 94083f6be7..95d0a90a42 100644 --- a/assets/common/abilities/custom/wendigomagic/singlestrike.ron +++ b/assets/common/abilities/custom/wendigomagic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 18.0, + base_damage: 36.0, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, knockback: 3.0, range: 2.5, angle: 30.0, - base_buildup_duration: 0.6, + base_buildup_duration: 1.2, base_swing_duration: 0.2, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/woodgolem/shockwave.ron b/assets/common/abilities/custom/woodgolem/shockwave.ron index 45e34c9b48..53ba82b702 100644 --- a/assets/common/abilities/custom/woodgolem/shockwave.ron +++ b/assets/common/abilities/custom/woodgolem/shockwave.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 0, - buildup_duration: 1.5, + buildup_duration: 3.0, swing_duration: 0.12, recover_duration: 1.2, - damage: 20.0, + damage: 40.0, poise_damage: 30, knockback: (strength: 30.0, direction: TowardsUp), shockwave_angle: 90.0, diff --git a/assets/common/abilities/custom/woodgolem/spin.ron b/assets/common/abilities/custom/woodgolem/spin.ron index 81e3a01214..4d0063df8f 100644 --- a/assets/common/abilities/custom/woodgolem/spin.ron +++ b/assets/common/abilities/custom/woodgolem/spin.ron @@ -1,10 +1,10 @@ SpinMelee( - buildup_duration: 0.35, + buildup_duration: 0.7, swing_duration: 0.3, recover_duration: 0.2, melee_constructor: ( kind: Bash( - damage: 15.0, + damage: 30.0, poise: 30.0, knockback: 20.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/woodgolem/strike.ron b/assets/common/abilities/custom/woodgolem/strike.ron index 5dd0dd6715..19cc34b762 100644 --- a/assets/common/abilities/custom/woodgolem/strike.ron +++ b/assets/common/abilities/custom/woodgolem/strike.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.6, swing_duration: 0.1, recover_duration: 0.5, melee_constructor: ( kind: Bash( - damage: 10.0, + damage: 20.0, poise: 25.0, knockback: 15.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/yeti/frostbreath.ron b/assets/common/abilities/custom/yeti/frostbreath.ron index a4e8052047..f237b50a6e 100644 --- a/assets/common/abilities/custom/yeti/frostbreath.ron +++ b/assets/common/abilities/custom/yeti/frostbreath.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.8, + buildup_duration: 1.2, recover_duration: 0.25, beam_duration: 0.25, - damage: 1.0, + damage: 1.5, tick_rate: 5.0, range: 15.0, max_angle: 30.0, diff --git a/assets/common/abilities/custom/yeti/icespikes.ron b/assets/common/abilities/custom/yeti/icespikes.ron index f7ede09e73..5797f1129b 100644 --- a/assets/common/abilities/custom/yeti/icespikes.ron +++ b/assets/common/abilities/custom/yeti/icespikes.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 0, - buildup_duration: 0.6, + buildup_duration: 0.9, swing_duration: 0.15, recover_duration: 1.0, - damage: 10.0, + damage: 15.0, poise_damage: 10, knockback: (strength: 18.0, direction: Up), shockwave_angle: 90.0, diff --git a/assets/common/abilities/custom/yeti/snowball.ron b/assets/common/abilities/custom/yeti/snowball.ron index e437a73f7a..1f74d280b5 100644 --- a/assets/common/abilities/custom/yeti/snowball.ron +++ b/assets/common/abilities/custom/yeti/snowball.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 0.75, recover_duration: 0.9, projectile: Snowball( - damage: 20.0, + damage: 30.0, radius: 5.0, min_falloff: 0.7, ), diff --git a/assets/common/abilities/custom/yeti/strike.ron b/assets/common/abilities/custom/yeti/strike.ron index 20fcb6ce98..e7bbb5f03e 100644 --- a/assets/common/abilities/custom/yeti/strike.ron +++ b/assets/common/abilities/custom/yeti/strike.ron @@ -1,6 +1,6 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.2, swing_duration: 0.1, recover_duration: 1.0, melee_constructor: ( diff --git a/assets/common/items/modular/weapon/secondary/axe/long.ron b/assets/common/items/modular/weapon/secondary/axe/long.ron index a64625488a..8740cd8711 100644 --- a/assets/common/items/modular/weapon/secondary/axe/long.ron +++ b/assets/common/items/modular/weapon/secondary/axe/long.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Axe, stats: ( equip_time_secs: 1.0, - power: 1.1, + power: 1.25, effect_power: 1.1, - speed: 0.9, + speed: 0.8, crit_chance: 0.9, - range: 1.0, + range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, ), diff --git a/assets/common/items/modular/weapon/secondary/bow/long.ron b/assets/common/items/modular/weapon/secondary/bow/long.ron index d4df5ef79a..d93ba75bc9 100644 --- a/assets/common/items/modular/weapon/secondary/bow/long.ron +++ b/assets/common/items/modular/weapon/secondary/bow/long.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 1.0, - power: 1.1, + power: 1.25, effect_power: 1.1, - speed: 0.9, + speed: 0.8, crit_chance: 0.9, - range: 1.0, + range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, ), diff --git a/assets/common/items/modular/weapon/secondary/bow/short.ron b/assets/common/items/modular/weapon/secondary/bow/short.ron index 721093da15..50706e8cf8 100644 --- a/assets/common/items/modular/weapon/secondary/bow/short.ron +++ b/assets/common/items/modular/weapon/secondary/bow/short.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Bow, stats: ( equip_time_secs: 1.0, - power: 0.9, + power: 0.8, effect_power: 0.9, - speed: 1.1, + speed: 1.8, crit_chance: 1.1, - range: 1.0, + 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 069b53ca07..0a8d192f4b 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/long.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/long.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 1.0, - power: 1.1, + power: 1.25, effect_power: 1.1, - speed: 0.9, + speed: 0.8, crit_chance: 0.9, - range: 1.0, + range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, ), diff --git a/assets/common/items/modular/weapon/secondary/hammer/short.ron b/assets/common/items/modular/weapon/secondary/hammer/short.ron index cfef83cea2..511e21defa 100644 --- a/assets/common/items/modular/weapon/secondary/hammer/short.ron +++ b/assets/common/items/modular/weapon/secondary/hammer/short.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Hammer, stats: ( equip_time_secs: 1.0, - power: 0.9, + power: 0.8, effect_power: 0.9, - speed: 1.0, - crit_chance: 1.0, - range: 1.0, - energy_efficiency: 1.0, + speed: 1.8, + crit_chance: 1.1, + range: 0.85, + energy_efficiency: 1.1, buff_strength: 0.9, ), hand_restriction: Some(One), diff --git a/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron b/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron index 9eda02e004..d299f5ec22 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/heavy.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 1.0, - power: 1.1, + power: 1.25, effect_power: 1.1, - speed: 0.9, + speed: 0.8, crit_chance: 0.9, - range: 1.0, + 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 d81de5ad1e..c01d7438ac 100644 --- a/assets/common/items/modular/weapon/secondary/sceptre/light.ron +++ b/assets/common/items/modular/weapon/secondary/sceptre/light.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Sceptre, stats: ( equip_time_secs: 1.0, - power: 0.9, + power: 0.8, effect_power: 0.9, - speed: 1.1, + speed: 1.8, crit_chance: 1.1, - range: 1.0, + range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, ), diff --git a/assets/common/items/modular/weapon/secondary/staff/heavy.ron b/assets/common/items/modular/weapon/secondary/staff/heavy.ron index da21220bc5..30bba2a38d 100644 --- a/assets/common/items/modular/weapon/secondary/staff/heavy.ron +++ b/assets/common/items/modular/weapon/secondary/staff/heavy.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 1.0, - power: 1.1, + power: 1.25, effect_power: 1.1, - speed: 0.9, + speed: 0.8, crit_chance: 0.9, - range: 1.0, + 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 af046cab7c..b7492ae0ec 100644 --- a/assets/common/items/modular/weapon/secondary/staff/light.ron +++ b/assets/common/items/modular/weapon/secondary/staff/light.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Staff, stats: ( equip_time_secs: 1.0, - power: 0.9, + power: 0.8, effect_power: 0.9, - speed: 1.1, + speed: 1.8, crit_chance: 1.1, - range: 1.0, + range: 0.85, energy_efficiency: 1.1, buff_strength: 0.9, ), diff --git a/assets/common/items/modular/weapon/secondary/sword/long.ron b/assets/common/items/modular/weapon/secondary/sword/long.ron index 1a2d93094b..17e2598332 100644 --- a/assets/common/items/modular/weapon/secondary/sword/long.ron +++ b/assets/common/items/modular/weapon/secondary/sword/long.ron @@ -6,11 +6,11 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 1.0, - power: 1.1, + power: 1.25, effect_power: 1.1, - speed: 0.9, + speed: 0.8, crit_chance: 0.9, - range: 1.0, + range: 1.2, energy_efficiency: 0.9, buff_strength: 1.1, ), diff --git a/assets/common/items/modular/weapon/secondary/sword/short.ron b/assets/common/items/modular/weapon/secondary/sword/short.ron index fed62845e6..aaaca99aa2 100644 --- a/assets/common/items/modular/weapon/secondary/sword/short.ron +++ b/assets/common/items/modular/weapon/secondary/sword/short.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Sword, stats: ( equip_time_secs: 1.0, - power: 0.9, + power: 0.8, effect_power: 0.9, - speed: 1.0, - crit_chance: 1.0, - range: 1.0, - energy_efficiency: 1.0, + speed: 1.8, + crit_chance: 1.1, + range: 0.85, + energy_efficiency: 1.1, buff_strength: 0.9, ), hand_restriction: Some(One), diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index c3475fc8c1..7d26a4d733 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -6,13 +6,13 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.4, - power: 0.5, + power: 0.45, effect_power: 1.0, - speed: 1.0, + speed: 0.95, crit_chance: 0.09375, - range: 1.0, + range: 0.95, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.9, ), )), quality: Low, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index b3945f744e..dbb1d71a2c 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -6,13 +6,13 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.4, - power: 0.5, + power: 0.45, effect_power: 0.3, - speed: 1.0, + speed: 0.95, crit_chance: 0.09375, range: 1.0, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.9, ), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index eaa782393c..0c6b34643c 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -6,13 +6,13 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 0.5, + power: 0.45, effect_power: 1.0, - speed: 1.0, + speed: 0.95, crit_chance: 0.09375, - range: 1.0, + range: 0.95, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.9, ), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index 11099c0297..5db32fd4e9 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -6,13 +6,13 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.4, - power: 0.5, + power: 0.45, effect_power: 0.1, - speed: 1.0, + speed: 0.95, crit_chance: 0.09375, - range: 1.0, + range: 0.95, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.9, ), )), quality: Low, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index 51840b564f..690a516ba5 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -6,13 +6,13 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.3, - power: 0.5, + power: 0.45, effect_power: 1.0, - speed: 1.0, + speed: 0.95, crit_chance: 0.09375, - range: 1.0, + range: 0.95, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.95, ), )), quality: Low, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index 0cf9ff040c..83d59533fb 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -6,13 +6,13 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.3, - power: 0.5, + power: 0.45, effect_power: 1.0, - speed: 1.0, + speed: 0.95, crit_chance: 0.09375, - range: 1.0, + range: 0.95, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.9, ), )), quality: Low, diff --git a/assets/common/items/weapons/sword_1h/starter.ron b/assets/common/items/weapons/sword_1h/starter.ron index e4764c2c37..3b908f66b6 100644 --- a/assets/common/items/weapons/sword_1h/starter.ron +++ b/assets/common/items/weapons/sword_1h/starter.ron @@ -6,13 +6,13 @@ ItemDef( hands: One, stats: ( equip_time_secs: 0.3, - power: 0.5, + power: 0.45, effect_power: 1.0, - speed: 1.0, + speed: 0.95, crit_chance: 0.16, - range: 1.0, + range: 0.95, energy_efficiency: 1.0, - buff_strength: 1.0, + buff_strength: 0.9, ), )), quality: Low, diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron index 2d001e0875..7ebd14770e 100644 --- a/assets/voxygen/i18n/en/common.ron +++ b/assets/voxygen/i18n/en/common.ron @@ -104,7 +104,7 @@ Is the client up to date?"#, "common.stats.poise": "Poise", "common.stats.range": "Range", "common.stats.energy_efficiency": "Energy Efficiency", - "common.stats.buff_strength": "Buff Strength", + "common.stats.buff_strength": "Buff/Debuff Strength", "common.stats.crit_chance": "Crit Chance", "common.stats.crit_mult": "Crit Mult", "common.stats.armor": "Armor", diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index e527866de7..87947b2ed9 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -174,7 +174,7 @@ ModularWeapon(("common.items.modular.weapon.primary.sword.ornate", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.sword.ornate.orichalcum-1h", ModularWeapon(("common.items.modular.weapon.primary.sword.sabre", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.sword.sabre.orichalcum-1h", ModularWeapon(("common.items.modular.weapon.primary.sword.sawblade", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.sword.sawblade.orichalcum-1h", - Simple("common.items.weapons.sword_1h.starter"): "voxel.weapon.sword_1h.starter", + Simple("common.items.weapons.sword_1h.starter"): "voxel.weapon.sword.starter_1h", // Axes ModularWeapon(("common.items.modular.weapon.primary.axe.axe", "common.items.mineral.ingot.bronze", Two)): "voxel.weapon.axe.axe.bronze-2h", ModularWeapon(("common.items.modular.weapon.primary.axe.battleaxe", "common.items.mineral.ingot.bronze", Two)): "voxel.weapon.axe.battleaxe.bronze-2h", diff --git a/assets/world/wildlife/spawn/tundra/core.ron b/assets/world/wildlife/spawn/tundra/core.ron index 5c7cebec47..788f93421a 100644 --- a/assets/world/wildlife/spawn/tundra/core.ron +++ b/assets/world/wildlife/spawn/tundra/core.ron @@ -6,7 +6,7 @@ SpawnEntry ( groups: [ (15, (1, 1, "common.entity.wild.aggressive.snow_raptor")), (1, (1, 1, "common.entity.wild.aggressive.wendigo")), - (1, (1, 1, "common.entity.wild.aggressive.mammoth")), + (1, (2, 6, "common.entity.wild.passive.mammoth")), (1, (1, 1, "common.entity.wild.aggressive.mountain_troll")), ], spawn_mode: Land,