diff --git a/assets/common/abilities/custom/arthropods/antlion/charge.ron b/assets/common/abilities/custom/arthropods/antlion/charge.ron index b30662dd84..0cc8c7035d 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 3.0, - buildup_duration: 0.3, - charge_duration: 4.0, + buildup_duration: 0.6, + charge_duration: 8.0, swing_duration: 0.1, - recover_duration: 0.4, + recover_duration: 0.8, ori_modifier: 0.1, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron b/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron index 7a406cc784..894d933fcc 100644 --- a/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 1.0, damage_kind: Crushing, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron index 0cf8078f70..faad0f0faa 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron @@ -1,10 +1,10 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.6, - recover_duration: 0.35, + buildup_duration: 1.2, + recover_duration: 0.7, projectile: Poisonball( - damage: 25.0, - radius: 3.0, + damage: 70.0, + radius: 3.5, energy_regen: 0, min_falloff: 0.2, ), @@ -14,6 +14,6 @@ BasicRanged( ..Default::default() }),*/ projectile_speed: 260.0, - num_projectiles: 3, + num_projectiles: 1, projectile_spread: 0.3, ) \ No newline at end of file diff --git a/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron b/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron index f93dc5f540..22c9e9cb68 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 1.0, damage_kind: Piercing, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron b/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron index fd676b982e..13f0bbcada 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, - movement_duration: 0.4, + buildup_duration: 1.0, + movement_duration: 0.8, swing_duration: 0.075, - recover_duration: 0.2, + recover_duration: 0.4, 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..ca5fde82f5 100644 --- a/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/arthropods/tarantula/leap.ron b/assets/common/abilities/custom/arthropods/tarantula/leap.ron index f556131d65..054e3da70c 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, - movement_duration: 0.4, + buildup_duration: 1.0, + movement_duration: 0.8, swing_duration: 0.075, - recover_duration: 0.2, + recover_duration: 0.4, 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..beecea26cb 100644 --- a/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 1.0, damage_kind: Piercing, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron b/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron index 891fba2e05..bf8c3376f4 100644 --- a/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron index cc8938deb0..df2e9ee30e 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, - recover_duration: 0.2, + buildup_duration: 0.4, + recover_duration: 0.4, 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..27e06879f4 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, - recover_duration: 0.35, + buildup_duration: 1.6, + recover_duration: 0.7, 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..e67747b071 100644 --- a/assets/common/abilities/custom/asp/singlestrike.ron +++ b/assets/common/abilities/custom/asp/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.4, forward_movement: 2.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/basilisk/dash.ron b/assets/common/abilities/custom/basilisk/dash.ron index 34a1b77bc3..ef6cf6b01f 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 4.0, - buildup_duration: 0.8, - charge_duration: 1.0, + buildup_duration: 1.6, + charge_duration: 2.0, swing_duration: 0.1, - recover_duration: 1.0, + recover_duration: 2.0, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/basilisk/petrify.ron b/assets/common/abilities/custom/basilisk/petrify.ron index d5914137d3..dc48f20b3f 100644 --- a/assets/common/abilities/custom/basilisk/petrify.ron +++ b/assets/common/abilities/custom/basilisk/petrify.ron @@ -1,9 +1,9 @@ BasicBeam( - buildup_duration: 0.9, + buildup_duration: 1.8, recover_duration: 1.0, - beam_duration: 1.0, - damage: 42.0, - tick_rate: 0.5, + beam_duration: 1.15, + damage: 64.0, + tick_rate: 0.35, range: 22.0, max_angle: 5.0, damage_effect: Some(Buff(( 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..4829d1aa99 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, + recover_duration: 0.5, 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..91d68c93a3 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 1.9, - buildup_duration: 0.5, - charge_duration: 3.0, + buildup_duration: 1.0, + charge_duration: 6.0, swing_duration: 0.1, - recover_duration: 0.7, + recover_duration: 1.4, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/birdlargebasic/summontornadoes.ron b/assets/common/abilities/custom/birdlargebasic/summontornadoes.ron index 3eb2a494d6..16183d10b5 100644 --- a/assets/common/abilities/custom/birdlargebasic/summontornadoes.ron +++ b/assets/common/abilities/custom/birdlargebasic/summontornadoes.ron @@ -1,7 +1,7 @@ BasicSummon( - buildup_duration: 0.5, + buildup_duration: 0.75, cast_duration: 0.2, - recover_duration: 0.2, + recover_duration: 0.3, summon_amount: 12, summon_distance: (4, 9), summon_info: ( diff --git a/assets/common/abilities/custom/birdlargebasic/triplestrike.ron b/assets/common/abilities/custom/birdlargebasic/triplestrike.ron index 5fc9b43899..03bba2f8d8 100644 --- a/assets/common/abilities/custom/birdlargebasic/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebasic/triplestrike.ron @@ -2,49 +2,49 @@ 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, + base_recover_duration: 0.6, forward_movement: 3.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 3.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 3.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/birdlargebreathe/firebomb.ron b/assets/common/abilities/custom/birdlargebreathe/firebomb.ron index a3708e2740..c94ac890ba 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, - recover_duration: 0.35, + buildup_duration: 1.0, + recover_duration: 0.7, 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..50c9cec231 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, - recover_duration: 0.25, + buildup_duration: 0.8, + recover_duration: 0.5, 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..5875d42e14 100644 --- a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 2.0, damage_kind: Slashing, damage_effect: Some(Buff(( @@ -24,17 +24,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Slashing, damage_effect: Some(Buff(( @@ -46,17 +46,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Slashing, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/birdlargefire/firebomb.ron b/assets/common/abilities/custom/birdlargefire/firebomb.ron index a3708e2740..c94ac890ba 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, - recover_duration: 0.35, + buildup_duration: 1.0, + recover_duration: 0.7, 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..9989b39290 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, + recover_duration: 0.4, + 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..50c9cec231 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, - recover_duration: 0.25, + buildup_duration: 0.8, + recover_duration: 0.5, 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..bcfd0cd2bd 100644 --- a/assets/common/abilities/custom/birdlargefire/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargefire/triplestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 2.0, damage_kind: Slashing, damage_effect: Some(Buff(( @@ -24,17 +24,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Slashing, damage_effect: Some(Buff(( @@ -46,17 +46,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Slashing, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/claygolem/laser.ron b/assets/common/abilities/custom/claygolem/laser.ron index cb07b26331..f4879337d7 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, - recover_duration: 0.4, + buildup_duration: 0.75, + recover_duration: 0.8, 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..b077118f29 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, - recover_duration: 0.5, + buildup_duration: 1.2, + recover_duration: 1.0, 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..ec82804242 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, + recover_duration: 2.4, + 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..3656a04d84 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, + recover_duration: 1.0, 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..7d76336e98 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 3, - buildup_duration: 0.5, - charge_duration: 1.0, + buildup_duration: 1.0, + charge_duration: 2.0, swing_duration: 0.1, - recover_duration: 1.0, + recover_duration: 2.0, ori_modifier: 0.1, charge_through: true, is_interruptible: false, diff --git a/assets/common/abilities/custom/deadwood/lifestealbeam.ron b/assets/common/abilities/custom/deadwood/lifestealbeam.ron index 9f3964953a..32f44e4c63 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, - recover_duration: 0.25, + buildup_duration: 0.5, + recover_duration: 0.5, 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..95f1404eba 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, - recover_duration: 0.8, + buildup_duration: 0.75, + recover_duration: 1.6, 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..21659fa41f 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.9, 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..18d22ccfc9 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, + recover_duration: 1.2, 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..c1cb3fcb03 100644 --- a/assets/common/abilities/custom/husk/singlestrike.ron +++ b/assets/common/abilities/custom/husk/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.5, forward_movement: 0.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/husk/triplestrike.ron b/assets/common/abilities/custom/husk/triplestrike.ron index 56d2ecc260..9dd54c69e3 100644 --- a/assets/common/abilities/custom/husk/triplestrike.ron +++ b/assets/common/abilities/custom/husk/triplestrike.ron @@ -2,49 +2,49 @@ 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, + base_recover_duration: 0.4, forward_movement: 1.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.4, forward_movement: 0.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.4, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/husk_brute/chargedmelee.ron b/assets/common/abilities/custom/husk_brute/chargedmelee.ron index 68c9bb8a50..5d664c2217 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, @@ -17,8 +17,8 @@ ChargedMelee( range: 3.5, angle: 45.0, ), - charge_duration: 1.5, + charge_duration: 3.0, 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..3671cc3c19 100644 --- a/assets/common/abilities/custom/husk_brute/singlestrike.ron +++ b/assets/common/abilities/custom/husk_brute/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 1.0, forward_movement: 0.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/mandragora/basic.ron b/assets/common/abilities/custom/mandragora/basic.ron index cf44dd6b25..17a7d9ecd7 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, + recover_duration: 0.6, 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..2918f7caa5 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, + recover_duration: 1.0, 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..d36d3902b9 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, - recover_duration: 0.35, + buildup_duration: 1.6, + recover_duration: 0.7, 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..0d6865c74b 100644 --- a/assets/common/abilities/custom/maneater/singlestrike.ron +++ b/assets/common/abilities/custom/maneater/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.4, forward_movement: 2.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/mindflayer/cursedflames.ron b/assets/common/abilities/custom/mindflayer/cursedflames.ron index 122d85f834..c1085dd0b9 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, - recover_duration: 0.50, + buildup_duration: 0.3, + recover_duration: 1.0, 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..3327dc170d 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, - recover_duration: 0.4, + buildup_duration: 1.125, + recover_duration: 0.8, 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..ab8458e42a 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, + recover_duration: 1.2, 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..69169c86dc 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,10 +24,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 5.0, - buildup_duration: 0.4, - charge_duration: 4.0, + buildup_duration: 0.6, + charge_duration: 8.0, swing_duration: 0.1, - recover_duration: 1.7, + recover_duration: 3.4, ori_modifier: 0.1, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/minotaur/cleave.ron b/assets/common/abilities/custom/minotaur/cleave.ron index 8724657bd8..e7705d0bed 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,9 +17,9 @@ ChargedMelee( range: 5.0, angle: 45.0, ), - charge_duration: 1.5, + charge_duration: 4.5, swing_duration: 0.1, hit_timing: 0.8, - recover_duration: 0.5, + recover_duration: 1.0, specifier: Some(GroundCleave), ) diff --git a/assets/common/abilities/custom/minotaur/cripplingstrike.ron b/assets/common/abilities/custom/minotaur/cripplingstrike.ron index 490be6f94f..7023af4d94 100644 --- a/assets/common/abilities/custom/minotaur/cripplingstrike.ron +++ b/assets/common/abilities/custom/minotaur/cripplingstrike.ron @@ -1,8 +1,8 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.3, + buildup_duration: 0.45, swing_duration: 0.1, - recover_duration: 0.6, + recover_duration: 1.2, melee_constructor: ( kind: Slash( damage: 15.0, diff --git a/assets/common/abilities/custom/oni/dash.ron b/assets/common/abilities/custom/oni/dash.ron index f5f7c9fa0e..ec5b8559df 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 3.0, - buildup_duration: 0.5, - charge_duration: 3.0, + buildup_duration: 1.0, + charge_duration: 6.0, swing_duration: 0.35, - recover_duration: 1.2, + recover_duration: 2.4, ori_modifier: 0.3, charge_through: false, is_interruptible: true, diff --git a/assets/common/abilities/custom/oni/doublestrike.ron b/assets/common/abilities/custom/oni/doublestrike.ron index 3f39a42911..964c17d7d7 100644 --- a/assets/common/abilities/custom/oni/doublestrike.ron +++ b/assets/common/abilities/custom/oni/doublestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 1.2, forward_movement: 3.5, damage_kind: Slashing, damage_effect: Some(Buff(( @@ -24,17 +24,17 @@ 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, + base_recover_duration: 2.4, forward_movement: 4.5, damage_kind: Slashing, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron index cf0349d12c..029d76c5c3 100644 --- a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 3.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron index 308860f0ee..8ec5e213aa 100644 --- a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron @@ -2,49 +2,49 @@ 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, + base_recover_duration: 0.6, forward_movement: 2.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadlowbeam/lifestealbeam.ron b/assets/common/abilities/custom/quadlowbeam/lifestealbeam.ron index ca19726b1e..aa79163362 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, - recover_duration: 0.25, + buildup_duration: 0.5, + recover_duration: 0.5, 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..1da1da9b23 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 4.0, - buildup_duration: 0.5, - charge_duration: 1.0, + buildup_duration: 1.0, + charge_duration: 2.0, swing_duration: 0.1, - recover_duration: 1.0, + recover_duration: 2.0, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron index 3b89fcec4a..c27b2c6d41 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, - recover_duration: 0.25, + buildup_duration: 0.8, + recover_duration: 0.5, 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..09afac5aa1 100644 --- a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron @@ -2,49 +2,49 @@ 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, + base_recover_duration: 0.6, forward_movement: 2.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadlowquick/dash.ron b/assets/common/abilities/custom/quadlowquick/dash.ron index 4a8a65b283..3bd8252e9c 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 0.5, - charge_duration: 0.8, + buildup_duration: 1.0, + charge_duration: 1.6, swing_duration: 0.1, - recover_duration: 1.0, + recover_duration: 2.0, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/quadlowquick/quadstrike.ron b/assets/common/abilities/custom/quadlowquick/quadstrike.ron index b8575523ff..86105bad1f 100644 --- a/assets/common/abilities/custom/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/custom/quadlowquick/quadstrike.ron @@ -2,65 +2,65 @@ 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, + base_recover_duration: 0.2, forward_movement: 1.5, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.2, forward_movement: 0.8, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.2, forward_movement: 0.8, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.2, forward_movement: 0.8, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadlowranged/firebomb.ron b/assets/common/abilities/custom/quadlowranged/firebomb.ron index 7b4fe7b0f0..4c5bd4ae78 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, - recover_duration: 0.35, + buildup_duration: 1.6, + recover_duration: 0.7, 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..921492fd75 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: 3.2, 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..e29963745f 100644 --- a/assets/common/abilities/custom/quadlowtail/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowtail/triplestrike.ron @@ -2,39 +2,39 @@ 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, + base_recover_duration: 0.4, forward_movement: 2.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.4, forward_movement: 1.0, damage_kind: Crushing, ), ( stage: 3, - base_damage: 8.0, + base_damage: 16.0, damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, @@ -44,7 +44,7 @@ ComboMelee( base_buildup_duration: 0.2, base_swing_duration: 0.1, hit_timing: 0.5, - base_recover_duration: 0.2, + base_recover_duration: 0.4, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron index 2b654ced93..83187d3a6f 100644 --- a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadmedbasic/triplestrike.ron b/assets/common/abilities/custom/quadmedbasic/triplestrike.ron index c0ce86171f..b44794f5e0 100644 --- a/assets/common/abilities/custom/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/triplestrike.ron @@ -2,49 +2,49 @@ 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, + base_recover_duration: 0.4, forward_movement: 1.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.4, forward_movement: 0.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.4, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadmedcharge/dash.ron b/assets/common/abilities/custom/quadmedcharge/dash.ron index f8cdd68571..cabbaabe49 100644 --- a/assets/common/abilities/custom/quadmedcharge/dash.ron +++ b/assets/common/abilities/custom/quadmedcharge/dash.ron @@ -2,15 +2,15 @@ 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, - poise: 40.0, - knockback: 17.0, + damage: 65.0, + poise: 35.0, + knockback: 14.0, energy_regen: 0.0, )), range: 2.5, @@ -18,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 0.5, - charge_duration: 1.2, + buildup_duration: 1.0, + charge_duration: 2.4, swing_duration: 0.1, - recover_duration: 1.1, + recover_duration: 2.2, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron index 73b31feec1..4dd983ac9f 100644 --- a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron @@ -2,33 +2,33 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 0.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadmedhoof/basic.ron b/assets/common/abilities/custom/quadmedhoof/basic.ron index 86baf681b0..b96a88ad48 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.15, swing_duration: 0.3, - recover_duration: 0.35, + recover_duration: 0.85, 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..7be5133c5b 100644 --- a/assets/common/abilities/custom/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedjump/doublestrike.ron @@ -2,33 +2,33 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.0, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 1.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadmedjump/leap.ron b/assets/common/abilities/custom/quadmedjump/leap.ron index db4d7b1bc2..fdae6ece52 100644 --- a/assets/common/abilities/custom/quadmedjump/leap.ron +++ b/assets/common/abilities/custom/quadmedjump/leap.ron @@ -1,19 +1,19 @@ LeapMelee( energy_cost: 0, - buildup_duration: 0.5, - movement_duration: 0.4, + buildup_duration: 1.5, + movement_duration: 0.8, swing_duration: 0.075, - recover_duration: 0.2, + recover_duration: 0.6, melee_constructor: ( kind: Bash( - damage: 12.0, + damage: 36.0, poise: 60.0, knockback: 4.0, energy_regen: 0.0, ), - range: 4.5, + range: 6.75, angle: 180.0, ), - forward_leap_strength: 40.0, + forward_leap_strength: 45.0, vertical_leap_strength: 10.0, ) diff --git a/assets/common/abilities/custom/quadmedjump/quickleap.ron b/assets/common/abilities/custom/quadmedjump/quickleap.ron index 771e8d55a7..2c6757aaec 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, - movement_duration: 0.3, + buildup_duration: 0.8, + movement_duration: 0.6, swing_duration: 0.075, - recover_duration: 0.125, + recover_duration: 0.25, 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..9033f9b256 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, @@ -17,11 +17,11 @@ DashMelee( angle: 45.0, ), energy_drain: 0, - forward_speed: 2.5, - buildup_duration: 1.2, - charge_duration: 1.0, + forward_speed: 1.8, + buildup_duration: 1.5, + charge_duration: 1.2, swing_duration: 0.1, - recover_duration: 1.0, + recover_duration: 2.0, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/quadmedquick/triplestrike.ron b/assets/common/abilities/custom/quadmedquick/triplestrike.ron index 7c2f8980e6..c95d362a9b 100644 --- a/assets/common/abilities/custom/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedquick/triplestrike.ron @@ -2,49 +2,49 @@ 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, + base_recover_duration: 0.8, forward_movement: 0.3, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 0.5, damage_kind: Crushing, ), ( 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, + base_recover_duration: 0.6, forward_movement: 0.5, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron index 73ad450775..13f769b28b 100644 --- a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.6, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/stonegolemfist/shockwave.ron b/assets/common/abilities/custom/stonegolemfist/shockwave.ron index 0f9ac664d1..03b105a6c5 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, + recover_duration: 2.4, + 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..3cab9f4341 100644 --- a/assets/common/abilities/custom/stonegolemfist/singlestrike.ron +++ b/assets/common/abilities/custom/stonegolemfist/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 1.8, forward_movement: 3.0, damage_kind: Crushing, ), 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..cfb2a8b436 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: 20.0, poise: 0.0, knockback: 8.0, energy_regen: 0.0, ), scaled: Some(Bash( - damage: 16.0, + damage: 25.0, poise: 0.0, knockback: 17.0, energy_regen: 0.0, @@ -18,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 0.5, - charge_duration: 1.2, + buildup_duration: 1.0, + charge_duration: 2.4, swing_duration: 0.1, - recover_duration: 1.1, + recover_duration: 1.8, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/theropodbasic/singlestrike.ron b/assets/common/abilities/custom/theropodbasic/singlestrike.ron index 1226876cdd..b7eb76c785 100644 --- a/assets/common/abilities/custom/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 3.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/theropodbasic/triplestrike.ron b/assets/common/abilities/custom/theropodbasic/triplestrike.ron index 7516469eb9..00b8f619c0 100644 --- a/assets/common/abilities/custom/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/triplestrike.ron @@ -2,49 +2,49 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 30.0, + base_damage: 40.0, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 32.5, poise_damage_increase: 0, knockback: 3.0, range: 7.5, angle: 30.0, - base_buildup_duration: 0.7, + base_buildup_duration: 1.3, + base_swing_duration: 0.15, + hit_timing: 0.5, + base_recover_duration: 0.5, + forward_movement: 1.0, + damage_kind: Crushing, + ), + ( + stage: 2, + base_damage: 50.0, + damage_increase: 0, + base_poise_damage: 32.5, + poise_damage_increase: 0, + knockback: 3.0, + range: 5.5, + angle: 30.0, + base_buildup_duration: 0.2, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, forward_movement: 1.0, damage_kind: Crushing, ), - ( - stage: 2, - base_damage: 34.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_swing_duration: 0.15, - hit_timing: 0.5, - base_recover_duration: 0.15, - forward_movement: 1.0, - damage_kind: Crushing, - ), ( stage: 3, - base_damage: 40.0, + base_damage: 60.0, damage_increase: 0, - base_poise_damage: 35, + base_poise_damage: 32.5, poise_damage_increase: 0, knockback: 25.0, range: 5.5, angle: 30.0, - base_buildup_duration: 0.3, + base_buildup_duration: 0.4, base_swing_duration: 0.125, hit_timing: 0.5, - base_recover_duration: 0.9, + base_recover_duration: 1.6, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/theropodbird/singlestrike.ron b/assets/common/abilities/custom/theropodbird/singlestrike.ron index d7932993cc..79386cf00a 100644 --- a/assets/common/abilities/custom/theropodbird/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbird/singlestrike.ron @@ -2,17 +2,17 @@ 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, + base_recover_duration: 0.8, forward_movement: 3.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/theropodbird/triplestrike.ron b/assets/common/abilities/custom/theropodbird/triplestrike.ron index 51d8a24280..8c91bbb8ee 100644 --- a/assets/common/abilities/custom/theropodbird/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbird/triplestrike.ron @@ -2,7 +2,23 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 11.0, + base_damage: 16.5, + damage_increase: 0, + base_poise_damage: 20, + poise_damage_increase: 0, + knockback: 3.0, + range: 3.0, + angle: 15.0, + base_buildup_duration: 0.95, + base_swing_duration: 0.15, + hit_timing: 0.5, + base_recover_duration: 0.50, + forward_movement: 1.0, + damage_kind: Crushing, + ), + ( + stage: 2, + base_damage: 30.0, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, @@ -12,39 +28,23 @@ ComboMelee( base_buildup_duration: 0.65, base_swing_duration: 0.15, hit_timing: 0.5, - base_recover_duration: 0.3, - forward_movement: 1.0, - damage_kind: Crushing, - ), - ( - stage: 2, - base_damage: 15.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_swing_duration: 0.15, - hit_timing: 0.5, - base_recover_duration: 0.15, + base_recover_duration: 0.50, forward_movement: 1.0, damage_kind: Crushing, ), ( 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.525, base_swing_duration: 0.125, hit_timing: 0.5, - base_recover_duration: 0.9, + base_recover_duration: 1.25, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/tidalwarrior/bubbles.ron b/assets/common/abilities/custom/tidalwarrior/bubbles.ron index d0466b356a..0892d87e0b 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, - recover_duration: 0.5, + buildup_duration: 0.75, + recover_duration: 1.0, 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..2fc9d1d32f 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, + recover_duration: 1.2, 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..662abe2d75 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,10 +18,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 10.0, - buildup_duration: 0.4, - charge_duration: 2.0, + buildup_duration: 0.6, + charge_duration: 4.0, swing_duration: 0.1, - recover_duration: 0.5, + recover_duration: 1.0, ori_modifier: 0.3, charge_through: false, is_interruptible: false, diff --git a/assets/common/abilities/custom/tidalwarrior/totem.ron b/assets/common/abilities/custom/tidalwarrior/totem.ron index 0f6ffaac43..3e94c0a1e3 100644 --- a/assets/common/abilities/custom/tidalwarrior/totem.ron +++ b/assets/common/abilities/custom/tidalwarrior/totem.ron @@ -1,7 +1,7 @@ BasicSummon( - buildup_duration: 0.5, + buildup_duration: 0.75, cast_duration: 1.0, - recover_duration: 0.5, + recover_duration: 0.75, summon_amount: 1, summon_distance: (1, 1), summon_info: ( diff --git a/assets/common/abilities/custom/tidalwarrior/totem_wave.ron b/assets/common/abilities/custom/tidalwarrior/totem_wave.ron index 7271a351dd..e384f2f05c 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, + recover_duration: 7.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..5d3bbb1494 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, - recover_duration: 0.3, + buildup_duration: 1.5, + recover_duration: 0.45, projectile: Arrow( - damage: 20.0, + damage: 30.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..e42dfa2fd1 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, - recover_duration: 0.25, - beam_duration: 1.0, - damage: 3.5, + buildup_duration: 0.375, + recover_duration: 0.375, + beam_duration: 2.0, + damage: 5.25, 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..42ac390148 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: 1.4, 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..753baeef8c 100644 --- a/assets/common/abilities/custom/wendigomagic/singlestrike.ron +++ b/assets/common/abilities/custom/wendigomagic/singlestrike.ron @@ -2,17 +2,17 @@ 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_swing_duration: 0.2, + base_buildup_duration: 1.2, + base_swing_duration: 0.4, hit_timing: 0.5, - base_recover_duration: 0.4, + base_recover_duration: 0.8, forward_movement: 5.0, damage_kind: Crushing, ), diff --git a/assets/common/abilities/custom/woodgolem/shockwave.ron b/assets/common/abilities/custom/woodgolem/shockwave.ron index 45e34c9b48..ae016860cb 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: 4.5, swing_duration: 0.12, - recover_duration: 1.2, - damage: 20.0, + recover_duration: 3.6, + damage: 60.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..0d13cecb2d 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: 1.05, swing_duration: 0.3, - recover_duration: 0.2, + recover_duration: 0.6, melee_constructor: ( kind: Bash( - damage: 15.0, + damage: 45.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..4e9f5dedd0 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: 2.4, swing_duration: 0.1, - recover_duration: 0.5, + recover_duration: 1.5, melee_constructor: ( kind: Bash( - damage: 10.0, + damage: 30.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..0574864e5f 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, - recover_duration: 0.25, - beam_duration: 0.25, - damage: 1.0, + buildup_duration: 1.2, + recover_duration: 0.5, + beam_duration: 0.5, + 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..51b0469973 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, + recover_duration: 2.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..f422698a0a 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, - recover_duration: 0.9, + buildup_duration: 0.75, + recover_duration: 1.8, 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..cf3aa1c6c2 100644 --- a/assets/common/abilities/custom/yeti/strike.ron +++ b/assets/common/abilities/custom/yeti/strike.ron @@ -1,8 +1,8 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 1.2, swing_duration: 0.1, - recover_duration: 1.0, + recover_duration: 2.0, melee_constructor: ( kind: Bash( damage: 10.0, diff --git a/assets/common/abilities/gnarling/axe/chop.ron b/assets/common/abilities/gnarling/axe/chop.ron index 9b8c9e8c06..079f32e12e 100644 --- a/assets/common/abilities/gnarling/axe/chop.ron +++ b/assets/common/abilities/gnarling/axe/chop.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.2, + buildup_duration: 0.3, swing_duration: 0.05, - recover_duration: 0.3, + recover_duration: 0.45, melee_constructor: ( kind: Slash( - damage: 6, + damage: 9, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/gnarling/blowgun/dart.ron b/assets/common/abilities/gnarling/blowgun/dart.ron index daaf02bb08..bbc473fdf4 100644 --- a/assets/common/abilities/gnarling/blowgun/dart.ron +++ b/assets/common/abilities/gnarling/blowgun/dart.ron @@ -1,7 +1,7 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.5, - recover_duration: 0.3, + buildup_duration: 0.75, + recover_duration: 0.45, projectile: Arrow( damage: 4, knockback: 0, diff --git a/assets/common/abilities/gnarling/chieftain/firebarrage.ron b/assets/common/abilities/gnarling/chieftain/firebarrage.ron index 86419e2598..bd703b01e9 100644 --- a/assets/common/abilities/gnarling/chieftain/firebarrage.ron +++ b/assets/common/abilities/gnarling/chieftain/firebarrage.ron @@ -1,9 +1,9 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.55, - recover_duration: 0.4, + buildup_duration: 0.825, + recover_duration: 0.6, projectile: Fireball( - damage: 9.0, + damage: 13.5, radius: 2.0, energy_regen: 10.0, min_falloff: 0.5, diff --git a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron index 2ef7625f3d..b1d28fb0dc 100644 --- a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron +++ b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron @@ -1,9 +1,9 @@ Shockwave( energy_cost: 0, - buildup_duration: 0.65, + buildup_duration: 0.975, swing_duration: 0.1, - recover_duration: 0.4, - damage: 20, + recover_duration: 0.6, + damage: 30, poise_damage: 0, knockback: ( strength: 25, direction: Away), shockwave_angle: 360, diff --git a/assets/common/abilities/gnarling/chieftain/flamestrike.ron b/assets/common/abilities/gnarling/chieftain/flamestrike.ron index 5138a43371..13d0f3b7e9 100644 --- a/assets/common/abilities/gnarling/chieftain/flamestrike.ron +++ b/assets/common/abilities/gnarling/chieftain/flamestrike.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.4, + buildup_duration: 0.6, swing_duration: 0.1, - recover_duration: 0.3, + recover_duration: 0.45, melee_constructor: ( kind: Bash( - damage: 8, + damage: 12, poise: 10, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/gnarling/chieftain/greentotem.ron b/assets/common/abilities/gnarling/chieftain/greentotem.ron index a9d412382e..5d3d3ec69c 100644 --- a/assets/common/abilities/gnarling/chieftain/greentotem.ron +++ b/assets/common/abilities/gnarling/chieftain/greentotem.ron @@ -1,7 +1,7 @@ BasicSummon( - buildup_duration: 0.25, + buildup_duration: 0.375, cast_duration: 0.5, - recover_duration: 0.25, + recover_duration: 0.375, summon_amount: 1, summon_distance: (1, 4), summon_info: ( diff --git a/assets/common/abilities/gnarling/chieftain/redtotem.ron b/assets/common/abilities/gnarling/chieftain/redtotem.ron index efa9423cf6..b1e0aa165b 100644 --- a/assets/common/abilities/gnarling/chieftain/redtotem.ron +++ b/assets/common/abilities/gnarling/chieftain/redtotem.ron @@ -1,7 +1,7 @@ BasicSummon( - buildup_duration: 0.25, + buildup_duration: 0.375, cast_duration: 0.5, - recover_duration: 0.25, + recover_duration: 0.375, summon_amount: 1, summon_distance: (1, 4), summon_info: ( diff --git a/assets/common/abilities/gnarling/chieftain/whitetotem.ron b/assets/common/abilities/gnarling/chieftain/whitetotem.ron index b01fd9c5fe..0a6921e2ca 100644 --- a/assets/common/abilities/gnarling/chieftain/whitetotem.ron +++ b/assets/common/abilities/gnarling/chieftain/whitetotem.ron @@ -1,7 +1,7 @@ BasicSummon( - buildup_duration: 0.25, + buildup_duration: 0.375, cast_duration: 0.5, - recover_duration: 0.25, + recover_duration: 0.375, summon_amount: 1, summon_distance: (1, 4), summon_info: ( diff --git a/assets/common/abilities/gnarling/dagger/stab.ron b/assets/common/abilities/gnarling/dagger/stab.ron index 59e77ff8a4..3435cfcf2c 100644 --- a/assets/common/abilities/gnarling/dagger/stab.ron +++ b/assets/common/abilities/gnarling/dagger/stab.ron @@ -1,11 +1,11 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.1, + buildup_duration: 0.15, swing_duration: 0.05, - recover_duration: 0.25, + recover_duration: 0.375, melee_constructor: ( kind: Stab( - damage: 4, + damage: 6, poise: 0, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/gnarling/totem/green.ron b/assets/common/abilities/gnarling/totem/green.ron index f8b1f9d57f..b00647dc59 100644 --- a/assets/common/abilities/gnarling/totem/green.ron +++ b/assets/common/abilities/gnarling/totem/green.ron @@ -1,18 +1,18 @@ BasicAura( - buildup_duration: 0.25, + buildup_duration: 0.375, cast_duration: 0.5, - recover_duration: 0.25, + recover_duration: 0.375, targets: InGroup, auras: [ ( kind: Regeneration, - strength: 5, + strength: 7.5, duration: Some(5), category: Magical, ), ( kind: ProtectingWard, - strength: 0.50, + strength: 0.75, duration: Some(5), category: Magical, ), diff --git a/assets/common/abilities/gnarling/totem/red.ron b/assets/common/abilities/gnarling/totem/red.ron index d81c964356..834f3f2bea 100644 --- a/assets/common/abilities/gnarling/totem/red.ron +++ b/assets/common/abilities/gnarling/totem/red.ron @@ -1,12 +1,12 @@ BasicAura( - buildup_duration: 0.25, + buildup_duration: 0.375, cast_duration: 0.5, - recover_duration: 0.25, + recover_duration: 0.375, targets: OutOfGroup, auras: [ ( kind: Burning, - strength: 0.5, + strength: 0.75, duration: Some(5), category: Magical, ), diff --git a/assets/common/abilities/gnarling/totem/white.ron b/assets/common/abilities/gnarling/totem/white.ron index 45c986c11d..9c55f4c302 100644 --- a/assets/common/abilities/gnarling/totem/white.ron +++ b/assets/common/abilities/gnarling/totem/white.ron @@ -1,12 +1,12 @@ BasicAura( - buildup_duration: 0.25, + buildup_duration: 0.375, cast_duration: 0.5, - recover_duration: 0.25, + recover_duration: 0.375, targets: InGroup, auras: [ ( kind: Hastened, - strength: 0.5, + strength: 0.75, duration: Some(5), category: Magical, ), diff --git a/assets/common/entity/wild/aggressive/mammoth.ron b/assets/common/entity/wild/peaceful/mammoth.ron similarity index 100% rename from assets/common/entity/wild/aggressive/mammoth.ron rename to assets/common/entity/wild/peaceful/mammoth.ron 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/axe/short.ron b/assets/common/items/modular/weapon/secondary/axe/short.ron index b67d9ac192..a94a9bb9eb 100644 --- a/assets/common/items/modular/weapon/secondary/axe/short.ron +++ b/assets/common/items/modular/weapon/secondary/axe/short.ron @@ -6,12 +6,12 @@ ItemDef( toolkind: Axe, 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.5, + 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/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..7e70f6d675 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.5, 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..18a1a322ca 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.5, + 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..b61579a394 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.5, 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..ccf416d08c 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.5, 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..68e06d22c0 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.5, + 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/npc_weapons/biped_small/adlet/hunter.ron b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron index 0d0dce3c3e..b44ff0ba1e 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/hunter.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 0.7, + power: 1.05, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.07589286, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron index 49a079df91..6bce3d66e8 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/tracker.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 0.7, + power: 1.05, effect_power: 0.8, - speed: 0.6, + speed: 0.4, crit_chance: 0.08406594, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/mandragora.ron b/assets/common/items/npc_weapons/biped_small/mandragora.ron index 085daf3c2f..67946c9772 100644 --- a/assets/common/items/npc_weapons/biped_small/mandragora.ron +++ b/assets/common/items/npc_weapons/biped_small/mandragora.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 1.0, + power: 1.5, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.1, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron index 4da27f28a8..33d940b0b3 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 2.0, + power: 3.0, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.04963235, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron index 40df4de085..c8ef00a0b3 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 2.0, + power: 3.0, effect_power: 0.8, - speed: 0.8, + speed: 0.6, crit_chance: 0.095454544, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron index 36319d30eb..d23b085ac4 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 2.0, + power: 3.0, effect_power: 0.8, - speed: 0.9, + speed: 0.6, crit_chance: 0.040873703, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron index a9e2bb3490..9654a74a12 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 1.2, + power: 1.8, effect_power: 0.8, - speed: 0.7, + speed: 1.05, crit_chance: 0.05965909, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron index 2cde364d74..92e3a8bd38 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/sorcerer.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 1.2, + power: 1.8, effect_power: 0.8, - speed: 0.8, + speed: 0.6, crit_chance: 0.066083916, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron index bf8313fd89..a8ac1478d0 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/spearman.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.0, - power: 1.2, + power: 1.8, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.053030305, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 4dd9da164c..fb2181fe46 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.0, + power: 1.5, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron index 87fd13b7d9..87f26c4200 100644 --- a/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.6, + power: 2.4, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron index 91fc080f7e..0b33c49418 100644 --- a/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.3, - power: 1.6, + power: 2.4, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index a3f5000a0b..98406a251a 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.0, + power: 1.5, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron index 2dee1ab04e..76d5147127 100644 --- a/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.6, + power: 3.6, effect_power: 1.0, - speed: 0.8, + speed: 0.6, crit_chance: 0.140625, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 26cc124abb..ccf989ca91 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.0, + power: 1.5, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 8f1f74dd85..d80de6a38e 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.5, - power: 1.0, + power: 1.5, effect_power: 1.0, - speed: 1.0, + speed: 0.75, crit_chance: 0.0625, range: 1.0, energy_efficiency: 1.0, 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..8e4d4a2171 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.90, crit_chance: 0.09375, - range: 1.0, + range: 1.00, 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..04518c8477 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.9, 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/calendar/christmas/tundra/core.ron b/assets/world/wildlife/spawn/calendar/christmas/tundra/core.ron index 9706ece4c2..7e9ae3aca8 100644 --- a/assets/world/wildlife/spawn/calendar/christmas/tundra/core.ron +++ b/assets/world/wildlife/spawn/calendar/christmas/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.peaceful.mammoth")), (1, (1, 1, "common.entity.wild.aggressive.mountain_troll")), (1, (1, 1, "common.entity.calendar.christmas.aggressive.yeti")), ], diff --git a/assets/world/wildlife/spawn/tundra/core.ron b/assets/world/wildlife/spawn/tundra/core.ron index 5c7cebec47..8369474b6c 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.peaceful.mammoth")), (1, (1, 1, "common.entity.wild.aggressive.mountain_troll")), ], spawn_mode: Land, diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index 29030d7a0d..d381b391b1 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -549,18 +549,18 @@ pub fn apply_caves_supplement<'a>( _ => "common.entity.wild.aggressive.batfox", } } else if cave_depth < 120.0 { - match dynamic_rng.gen_range(0..5) { - 0 => "common.entity.wild.aggressive.rocksnapper", - 1 => "common.entity.wild.aggressive.cave_salamander", - 2 => "common.entity.wild.aggressive.cave_spider", - 4 => "common.entity.wild.peaceful.crawler_molten", + match dynamic_rng.gen_range(0..10) { + 2 => "common.entity.wild.aggressive.rocksnapper", + 5 => "common.entity.wild.aggressive.cave_salamander", + 7 => "common.entity.wild.aggressive.cave_spider", + 8 => "common.entity.wild.peaceful.crawler_molten", _ => "common.entity.wild.aggressive.asp", } } else if cave_depth < 190.0 { - match dynamic_rng.gen_range(0..4) { - 0 => "common.entity.wild.aggressive.rocksnapper", - 1 => "common.entity.wild.aggressive.lavadrake", - 2 => "common.entity.wild.aggressive.black_widow", + match dynamic_rng.gen_range(0..5) { + 1 => "common.entity.wild.aggressive.rocksnapper", + 2 => "common.entity.wild.aggressive.lavadrake", + 3 => "common.entity.wild.aggressive.black_widow", _ => "common.entity.wild.aggressive.basilisk", } } else {