From bf20e5090b7804e52d8a08cdda1a8824ecbc3f7c Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 25 Sep 2020 16:33:47 -0500 Subject: [PATCH] Addressed comments --- common/src/sys/combat.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/common/src/sys/combat.rs b/common/src/sys/combat.rs index d190083b34..ba622ffa5b 100644 --- a/common/src/sys/combat.rs +++ b/common/src/sys/combat.rs @@ -125,15 +125,10 @@ impl<'a> System<'a> for Sys { } // Weapon gives base damage - let source = if is_heal { - DamageSource::Healing + let (source, healthchange) = if is_heal { + (DamageSource::Healing, attack.base_heal as f32) } else { - DamageSource::Melee - }; - let healthchange = if is_heal { - attack.base_heal as f32 - } else { - -(attack.base_damage as f32) + (DamageSource::Melee, -(attack.base_damage as f32)) }; let mut damage = Damage { healthchange,