From 99981338bb72eb87d1727e4633cb2e4301944ea4 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 15 Sep 2021 08:20:55 -0400 Subject: [PATCH] Fixed exp fix mistake and fixed lava, campfire, and bomb damage. --- common/src/combat.rs | 4 ++-- common/systems/src/buff.rs | 4 ++-- server/src/cmd.rs | 2 +- server/src/events/entity_creation.rs | 2 +- server/src/sys/object.rs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/combat.rs b/common/src/combat.rs index 8b87860671..104d65a206 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -905,13 +905,13 @@ pub fn combat_rating( msm: &MaterialStatManifest, ) -> f32 { const WEAPON_WEIGHT: f32 = 1.0; - const HEALTH_WEIGHT: f32 = 5.0; + const HEALTH_WEIGHT: f32 = 0.5; const ENERGY_WEIGHT: f32 = 0.5; const SKILLS_WEIGHT: f32 = 1.0; const POISE_WEIGHT: f32 = 0.5; const CRIT_WEIGHT: f32 = 0.6; // Assumes a "standard" max health of 100 - let health_rating = health.base_max() + let health_rating = 10.0 * health.base_max() / 100.0 / (1.0 - Damage::compute_damage_reduction(Some(inventory), None, None)).max(0.00001); diff --git a/common/systems/src/buff.rs b/common/systems/src/buff.rs index 42bf1280d1..76f5927757 100644 --- a/common/systems/src/buff.rs +++ b/common/systems/src/buff.rs @@ -113,7 +113,7 @@ impl<'a> System<'a> for Sys { entity, buff_change: BuffChange::Add(Buff::new( BuffKind::Burning, - BuffData::new(200.0, None), + BuffData::new(20.0, None), vec![BuffCategory::Natural], BuffSource::World, )), @@ -199,7 +199,7 @@ impl<'a> System<'a> for Sys { *accumulated += *rate * dt; // Apply health change only once per second, per health, or // when a buff is removed - if accumulated.abs() > rate.abs().min(10.0) + if accumulated.abs() > rate.abs().min(1.0) || buff.time.map_or(false, |dur| dur == Duration::default()) { let (cause, by) = if *accumulated < 0.0 { diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 0bc34eefcd..3554d12ac9 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -1317,7 +1317,7 @@ fn handle_spawn_campfire( Aura::new( AuraKind::Buff { kind: BuffKind::Burning, - data: BuffData::new(20.0, Some(Duration::from_secs(10))), + data: BuffData::new(2.0, Some(Duration::from_secs(10))), category: BuffCategory::Natural, source: BuffSource::World, }, diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs index c0000b2024..67ecf150c3 100644 --- a/server/src/events/entity_creation.rs +++ b/server/src/events/entity_creation.rs @@ -271,7 +271,7 @@ pub fn handle_create_waypoint(server: &mut Server, pos: Vec3) { Aura::new( AuraKind::Buff { kind: BuffKind::Burning, - data: BuffData::new(20.0, Some(Duration::from_secs(10))), + data: BuffData::new(2.0, Some(Duration::from_secs(10))), category: BuffCategory::Natural, source: BuffSource::World, }, diff --git a/server/src/sys/object.rs b/server/src/sys/object.rs index 9cdc1d4953..dc99af33c6 100644 --- a/server/src/sys/object.rs +++ b/server/src/sys/object.rs @@ -54,7 +54,7 @@ impl<'a> System<'a> for Sys { RadiusEffect::Entity(Effect::Damage(Damage { source: DamageSource::Explosion, kind: DamageKind::Energy, - value: 400.0, + value: 40.0, })), RadiusEffect::Entity(Effect::PoiseChange(PoiseChange { source: PoiseSource::Explosion, @@ -148,7 +148,7 @@ impl<'a> System<'a> for Sys { RadiusEffect::Entity(Effect::Damage(Damage { source: DamageSource::Explosion, kind: DamageKind::Energy, - value: 50.0, + value: 5.0, })), RadiusEffect::Entity(Effect::PoiseChange(PoiseChange { source: PoiseSource::Explosion,