Addressed comments

2024-08-30 18:12:32 +00:00 · 2020-09-25 16:33:47 -05:00 · 2020-09-25 16:33:47 -05:00 · 5f889773b5
commit 5f889773b5
parent 51141b2c1a
1 changed files with 3 additions and 8 deletions
--- 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,