diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 20b04e42f3..3e70c5c6c2 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -2,7 +2,7 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 11.0, + base_damage: 12.0, damage_increase: 1.0, base_poise_damage: 0, poise_damage_increase: 0, @@ -24,7 +24,7 @@ ComboMelee( ), ( stage: 2, - base_damage: 13.0, + base_damage: 15.0, damage_increase: 1.5, base_poise_damage: 0, poise_damage_increase: 0, @@ -46,8 +46,8 @@ ComboMelee( ), ], initial_energy_gain: 2.5, - max_energy_gain: 17.5, - energy_increase: 3.0, + max_energy_gain: 12.5, + energy_increase: 2.5, speed_increase: 0.1, max_speed_increase: 0.6, scales_from_combo: 2, diff --git a/assets/common/abilities/axe/leap.ron b/assets/common/abilities/axe/leap.ron index 1bd6fd8977..98685cb174 100644 --- a/assets/common/abilities/axe/leap.ron +++ b/assets/common/abilities/axe/leap.ron @@ -1,12 +1,12 @@ LeapMelee( - energy_cost: 45.0, - buildup_duration: 0.2, - movement_duration: 0.2, + energy_cost: 30.0, + buildup_duration: 0.3, + movement_duration: 0.25, swing_duration: 0.2, recover_duration: 0.2, melee_constructor: ( kind: Slash( - damage: 30.0, + damage: 25.0, poise: 0.0, knockback: 12.0, energy_regen: 0.0, diff --git a/assets/common/abilities/axe/spin.ron b/assets/common/abilities/axe/spin.ron index 6461f99b1b..a48020290f 100644 --- a/assets/common/abilities/axe/spin.ron +++ b/assets/common/abilities/axe/spin.ron @@ -1,6 +1,6 @@ SpinMelee( buildup_duration: 0.2, - swing_duration: 0.6, + swing_duration: 0.4, recover_duration: 0.2, melee_constructor: ( kind: Slash( diff --git a/assets/common/abilities/bow/charged.ron b/assets/common/abilities/bow/charged.ron index 43393bb32a..1dcd986eb9 100644 --- a/assets/common/abilities/bow/charged.ron +++ b/assets/common/abilities/bow/charged.ron @@ -1,18 +1,18 @@ ChargedRanged( energy_cost: 0, energy_drain: 0, - initial_regen: 0.5, - scaled_regen: 12.0, - initial_damage: 0.5, - scaled_damage: 12.0, - initial_knockback: 0.0, - scaled_knockback: 10.0, - buildup_duration: 0.2, - charge_duration: 1.0, - recover_duration: 0.3, + initial_regen: 4, + scaled_regen: 16, + initial_damage: 3, + scaled_damage: 15, + initial_knockback: 0, + scaled_knockback: 15, + buildup_duration: 0.3, + charge_duration: 0.9, + recover_duration: 0.4, projectile_body: Object(Arrow), projectile_light: None, - initial_projectile_speed: 100.0, - scaled_projectile_speed: 150.0, + initial_projectile_speed: 50.0, + scaled_projectile_speed: 200.0, move_speed: 0.6, ) diff --git a/assets/common/abilities/bow/repeater.ron b/assets/common/abilities/bow/repeater.ron index ca19187e91..7a39f420d5 100644 --- a/assets/common/abilities/bow/repeater.ron +++ b/assets/common/abilities/bow/repeater.ron @@ -1,13 +1,13 @@ RepeaterRanged( energy_cost: 5.0, buildup_duration: 0.2, - shoot_duration: 0.5, - recover_duration: 0.8, - max_speed: 2.0, - half_speed_at: 1, + shoot_duration: 0.3, + recover_duration: 0.5, + max_speed: 4.0, + half_speed_at: 3, projectile: Arrow( - damage: 3.0, - knockback: 2.0, + damage: 5.0, + knockback: 0, energy_regen: 0, ), projectile_body: Object(Arrow), diff --git a/assets/common/abilities/bow/shotgun.ron b/assets/common/abilities/bow/shotgun.ron index de5111aa40..a3ce87a906 100644 --- a/assets/common/abilities/bow/shotgun.ron +++ b/assets/common/abilities/bow/shotgun.ron @@ -1,15 +1,15 @@ BasicRanged( - energy_cost: 30.0, - buildup_duration: 0.4, + energy_cost: 25.0, + buildup_duration: 0.3, recover_duration: 0.3, projectile_spread: 0.05, projectile: Arrow( - damage: 4.0, - knockback: 5.0, + damage: 6, + knockback: 5, energy_regen: 0, ), projectile_body: Object(Arrow), projectile_light: None, - projectile_speed: 60.0, - num_projectiles: 4, + projectile_speed: 80.0, + num_projectiles: 5, ) diff --git a/assets/common/abilities/custom/stonegolemfist/spin.ron b/assets/common/abilities/custom/stonegolemfist/spin.ron index a06ddca64c..5880f210e1 100644 --- a/assets/common/abilities/custom/stonegolemfist/spin.ron +++ b/assets/common/abilities/custom/stonegolemfist/spin.ron @@ -14,7 +14,7 @@ SpinMelee( ), energy_cost: 0, is_infinite: false, - movement_behavior: GolemHover, + movement_behavior: Stationary, is_interruptible: false, forward_speed: 0.0, num_spins: 1, diff --git a/assets/common/abilities/hammer/charged.ron b/assets/common/abilities/hammer/charged.ron index 1b74473c3e..0388906a16 100644 --- a/assets/common/abilities/hammer/charged.ron +++ b/assets/common/abilities/hammer/charged.ron @@ -17,7 +17,7 @@ ChargedMelee( range: 3.5, angle: 30.0, ), - charge_duration: 1.2, + charge_duration: 1.0, swing_duration: 0.12, hit_timing: 0.2, recover_duration: 0.3, diff --git a/assets/common/abilities/hammer/leap.ron b/assets/common/abilities/hammer/leap.ron index f1e0c23ce0..e9df3820ca 100644 --- a/assets/common/abilities/hammer/leap.ron +++ b/assets/common/abilities/hammer/leap.ron @@ -1,7 +1,7 @@ LeapMelee( - energy_cost: 50.0, + energy_cost: 35.0, buildup_duration: 0.1, - movement_duration: 0.8, + movement_duration: 0.6, swing_duration: 0.15, recover_duration: 0.2, melee_constructor: ( diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index 625b220624..4d08b20ab4 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -16,8 +16,8 @@ ComboMelee( damage_kind: Crushing, )], initial_energy_gain: 5.0, - max_energy_gain: 15.0, - energy_increase: 5.0, + max_energy_gain: 12.5, + energy_increase: 2.5, speed_increase: 0.1, max_speed_increase: 0.4, scales_from_combo: 2, diff --git a/assets/common/abilities/sceptre/healingaura.ron b/assets/common/abilities/sceptre/healingaura.ron index a9b387c4d5..3c4707e5f0 100644 --- a/assets/common/abilities/sceptre/healingaura.ron +++ b/assets/common/abilities/sceptre/healingaura.ron @@ -1,13 +1,13 @@ BasicAura( - buildup_duration: 0.25, - cast_duration: 0.5, - recover_duration: 0.25, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: InGroup, auras: [ ( kind: Regeneration, - strength: 0.2, - duration: Some(10.0), + strength: 1, + duration: Some(5), category: Magical, ), ], diff --git a/assets/common/abilities/sceptre/lifestealbeam.ron b/assets/common/abilities/sceptre/lifestealbeam.ron index 4c739da0a6..5eff354cd0 100644 --- a/assets/common/abilities/sceptre/lifestealbeam.ron +++ b/assets/common/abilities/sceptre/lifestealbeam.ron @@ -2,13 +2,13 @@ BasicBeam( buildup_duration: 0.20, recover_duration: 0.20, beam_duration: 1.0, - damage: 3.0, - tick_rate: 2.0, + damage: 4, + tick_rate: 4, range: 25.0, max_angle: 1.0, - damage_effect: Some(Lifesteal(0.125)), - energy_regen: 5.0, + damage_effect: Some(Lifesteal(0.05)), + energy_regen: 7.5, energy_drain: 0, - ori_rate: 0.3, + ori_rate: 0.4, specifier: LifestealBeam ) diff --git a/assets/common/abilities/sceptre/wardingaura.ron b/assets/common/abilities/sceptre/wardingaura.ron index f05bbd0bc9..5c908408e8 100644 --- a/assets/common/abilities/sceptre/wardingaura.ron +++ b/assets/common/abilities/sceptre/wardingaura.ron @@ -1,19 +1,19 @@ BasicAura( - buildup_duration: 0.25, - cast_duration: 0.5, - recover_duration: 0.25, + buildup_duration: 0.4, + cast_duration: 0.6, + recover_duration: 0.2, targets: InGroup, auras: [ ( kind: ProtectingWard, - strength: 0.15, - duration: Some(10.0), + strength: 0.25, + duration: Some(8), category: Magical, ), ], aura_duration: 1.0, range: 25.0, - energy_cost: 40.0, + energy_cost: 35.0, scales_with_combo: false, specifier: Some(WardingAura), ) diff --git a/assets/common/abilities/staff/firebomb.ron b/assets/common/abilities/staff/firebomb.ron index b06b67dca5..94696d0a6e 100644 --- a/assets/common/abilities/staff/firebomb.ron +++ b/assets/common/abilities/staff/firebomb.ron @@ -1,11 +1,11 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.5, + buildup_duration: 0.35, recover_duration: 0.4, projectile: Fireball( - damage: 9.0, - radius: 4.0, - energy_regen: 10.0, + damage: 12.0, + radius: 3.0, + energy_regen: 12.0, min_falloff: 0.5, ), projectile_body: Object(BoltFire), diff --git a/assets/common/abilities/staff/fireshockwave.ron b/assets/common/abilities/staff/fireshockwave.ron index f52f693179..eac4f3f5d2 100644 --- a/assets/common/abilities/staff/fireshockwave.ron +++ b/assets/common/abilities/staff/fireshockwave.ron @@ -1,14 +1,14 @@ Shockwave( - energy_cost: 50.0, - buildup_duration: 0.5, + energy_cost: 40.0, + buildup_duration: 0.4, swing_duration: 0.1, - recover_duration: 0.2, - damage: 15.0, + recover_duration: 0.4, + damage: 18, poise_damage: 0, - knockback: ( strength: 25.0, direction: Away), + knockback: ( strength: 30, direction: Away), shockwave_angle: 360.0, shockwave_vertical_angle: 90.0, - shockwave_speed: 20.0, + shockwave_speed: 30.0, shockwave_duration: 0.5, requires_ground: false, move_efficiency: 0.1, diff --git a/assets/common/abilities/staff/flamethrower.ron b/assets/common/abilities/staff/flamethrower.ron index bc9b9b5e78..244273901c 100644 --- a/assets/common/abilities/staff/flamethrower.ron +++ b/assets/common/abilities/staff/flamethrower.ron @@ -2,18 +2,18 @@ BasicBeam( buildup_duration: 0.25, recover_duration: 0.25, beam_duration: 1.0, - damage: 3.5, + damage: 4, tick_rate: 3.0, - range: 20.0, + range: 15, max_angle: 15.0, damage_effect: Some(Buff(( kind: Burning, dur_secs: 10.0, - strength: DamageFraction(0.5), + strength: DamageFraction(1), chance: 0.25, ))), energy_regen: 0, - energy_drain: 35.0, + energy_drain: 40, ori_rate: 0.3, specifier: Flamethrower, ) diff --git a/assets/common/abilities/sword/dash.ron b/assets/common/abilities/sword/dash.ron index 422098a52f..32c0e0ef23 100644 --- a/assets/common/abilities/sword/dash.ron +++ b/assets/common/abilities/sword/dash.ron @@ -2,7 +2,7 @@ DashMelee( energy_cost: 10.0, melee_constructor: ( kind: Stab( - damage: 8.0, + damage: 4.0, poise: 0.0, knockback: 8.0, energy_regen: 0.0, @@ -17,8 +17,8 @@ DashMelee( angle: 60.0, ), energy_drain: 30.0, - forward_speed: 3.0, - buildup_duration: 0.25, + forward_speed: 2.5, + buildup_duration: 0.2, charge_duration: 1.2, swing_duration: 0.1, recover_duration: 0.5, diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index 52dcf61e72..ff27a3190b 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -68,7 +68,7 @@ ComboMelee( ), ], initial_energy_gain: 0, - max_energy_gain: 20.0, + max_energy_gain: 12.5, energy_increase: 2.5, speed_increase: 0.1, max_speed_increase: 0.8, diff --git a/common/src/combat.rs b/common/src/combat.rs index 7fd95ca688..b636e9cf07 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -774,7 +774,7 @@ pub enum DamageKind { Energy, } -const PIERCING_PENETRATION_FRACTION: f32 = 1.0; +const PIERCING_PENETRATION_FRACTION: f32 = 1.5; const SLASHING_ENERGY_FRACTION: f32 = 0.5; const CRUSHING_POISE_FRACTION: f32 = 1.0; diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index 95be90faeb..4e74959cd5 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -1302,7 +1302,7 @@ impl CharacterAbility { *movement_behavior = if skillset.has_skill(Axe(SHelicopter)) { spin_melee::MovementBehavior::AxeHover } else { - spin_melee::MovementBehavior::ForwardGround + spin_melee::MovementBehavior::Walking }; if let MeleeConstructorKind::Slash { ref mut damage, .. } = melee_constructor.kind { if let Ok(level) = skillset.skill_level(Axe(SDamage)) { diff --git a/common/src/states/basic_aura.rs b/common/src/states/basic_aura.rs index bc0aeb82ae..133464e5a2 100644 --- a/common/src/states/basic_aura.rs +++ b/common/src/states/basic_aura.rs @@ -89,8 +89,8 @@ impl CharacterBehavior for Data { category: _, source: _, } => { - data.strength *= 1.0 - + (self.static_data.combo_at_cast.max(1) as f32).log(2.0); + data.strength *= + (self.static_data.combo_at_cast.max(1) as f32).sqrt(); }, } output_events.emit_server(ServerEvent::ComboChange { diff --git a/common/src/states/spin_melee.rs b/common/src/states/spin_melee.rs index 74e3e6d018..a3edd9b480 100644 --- a/common/src/states/spin_melee.rs +++ b/common/src/states/spin_melee.rs @@ -65,8 +65,8 @@ impl CharacterBehavior for Data { let new_vel_z = update.vel.0.z + GRAVITY * data.dt.0 * 0.5; update.vel.0 = Vec3::new(0.0, 0.0, new_vel_z) + data.inputs.move_dir * 5.0; }, - MovementBehavior::GolemHover => { - update.vel.0 = Vec3::new(0.0, 0.0, 20.0) + *data.inputs.look_dir * 25.0; + MovementBehavior::Walking => { + handle_move(data, &mut update, 0.2); }, } @@ -180,7 +180,7 @@ pub enum MovementBehavior { Stationary, ForwardGround, AxeHover, - GolemHover, + Walking, } #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)] diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 5d1cde28ba..5a95138f4d 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -409,7 +409,7 @@ pub fn handle_forced_movement( }) { update.vel.0 += Vec2::broadcast(data.dt.0) * accel - * (data.inputs.move_dir + Vec2::from(update.ori)) + * (data.inputs.move_dir * 0.5 + Vec2::from(update.ori) * 1.5) * strength; } },