From 461ad6e3391aabfffa89cb8b9126d6e365583cc2 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 15 Mar 2021 00:36:07 -0400 Subject: [PATCH] Rebalanced explosion strengths --- assets/common/abilities/staff/firebomb.ron | 2 +- assets/common/abilities/staffsimple/firebomb.ron | 2 +- assets/common/abilities/unique/quadlowranged/firebomb.ron | 2 +- assets/common/abilities/unique/wendigomagic/frostbomb.ron | 2 +- server/src/events/entity_manipulation.rs | 4 +--- server/src/sys/object.rs | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/assets/common/abilities/staff/firebomb.ron b/assets/common/abilities/staff/firebomb.ron index 7b4724217d..48a5827527 100644 --- a/assets/common/abilities/staff/firebomb.ron +++ b/assets/common/abilities/staff/firebomb.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.35, projectile: Fireball( - damage: 100.0, + damage: 80.0, radius: 5.0, energy_regen: 50, ), diff --git a/assets/common/abilities/staffsimple/firebomb.ron b/assets/common/abilities/staffsimple/firebomb.ron index 7b4724217d..48a5827527 100644 --- a/assets/common/abilities/staffsimple/firebomb.ron +++ b/assets/common/abilities/staffsimple/firebomb.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.35, projectile: Fireball( - damage: 100.0, + damage: 80.0, radius: 5.0, energy_regen: 50, ), diff --git a/assets/common/abilities/unique/quadlowranged/firebomb.ron b/assets/common/abilities/unique/quadlowranged/firebomb.ron index 4470e21596..c9661c5d0b 100644 --- a/assets/common/abilities/unique/quadlowranged/firebomb.ron +++ b/assets/common/abilities/unique/quadlowranged/firebomb.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.8, recover_duration: 0.35, projectile: Fireball( - damage: 100.0, + damage: 80.0, radius: 5.0, energy_regen: 0, ), diff --git a/assets/common/abilities/unique/wendigomagic/frostbomb.ron b/assets/common/abilities/unique/wendigomagic/frostbomb.ron index 6ba4652208..b09592ebca 100644 --- a/assets/common/abilities/unique/wendigomagic/frostbomb.ron +++ b/assets/common/abilities/unique/wendigomagic/frostbomb.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.35, projectile: Frostball( - damage: 100.0, + damage: 80.0, radius: 5.0, ), projectile_body: Object(BoltFire), // TODO: Get ice projectile model diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index e6bc846d03..92a847a73c 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -616,9 +616,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 - let strength = ((horiz_dist.max(vert_distance).max(0.0) / radius).min(1.0) - 1.0).powi(2); - dbg!(strength); - strength + ((horiz_dist.max(vert_distance).max(0.0) / radius).min(1.0) - 1.0).powi(2) } for effect in explosion.effects { diff --git a/server/src/sys/object.rs b/server/src/sys/object.rs index bf87673c78..1ab72bec9a 100644 --- a/server/src/sys/object.rs +++ b/server/src/sys/object.rs @@ -56,7 +56,7 @@ impl<'a> System<'a> for Sys { effects: vec![ RadiusEffect::Entity(Effect::Damage(Damage { source: DamageSource::Explosion, - value: 500.0, + value: 400.0, })), RadiusEffect::Entity(Effect::PoiseChange(PoiseChange { source: PoiseSource::Explosion,