diff --git a/assets/common/abilities/staff/firebomb.ron b/assets/common/abilities/staff/firebomb.ron index 926755af35..4766bf9765 100644 --- a/assets/common/abilities/staff/firebomb.ron +++ b/assets/common/abilities/staff/firebomb.ron @@ -3,9 +3,9 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.4, projectile: Fireball( - damage: 120.0, + damage: 90.0, radius: 4.0, - energy_regen: 80, + energy_regen: 60, ), projectile_body: Object(BoltFire), projectile_speed: 60.0, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 91fe9325dc..78b14d3517 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -689,7 +689,7 @@ pub fn handle_explosion(server: &Server, pos: Vec3, explosion: Explosion, o // Compare both checks, take whichever gives weaker effect, sets minimum of 0 so // that explosions reach a max strength on edge of entity - ((horiz_dist.max(vert_distance).max(0.0) / radius).min(1.0) - 1.0).powi(2) + ((horiz_dist.max(vert_distance).max(0.0) / radius).min(1.0) - 1.0).abs() } for effect in explosion.effects {