From 644308b26e40d5c6ec90e7f889abd345aa31a5a4 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 16 May 2025 17:19:02 -0400 Subject: [PATCH] Don't group damage in the HealthChange.cs guidebook text (#37507) --- .../EntityEffects/Effects/HealthChange.cs | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs index 71021ce4ac..dd398da5b2 100644 --- a/Content.Server/EntityEffects/Effects/HealthChange.cs +++ b/Content.Server/EntityEffects/Effects/HealthChange.cs @@ -64,48 +64,6 @@ namespace Content.Server.EntityEffects.Effects damageSpec = entSys.GetEntitySystem().ApplyUniversalAllModifiers(damageSpec); - foreach (var group in prototype.EnumeratePrototypes()) - { - if (!damageSpec.TryGetDamageInGroup(group, out var amount)) - continue; - - var relevantTypes = damageSpec.DamageDict - .Where(x => x.Value != FixedPoint2.Zero && group.DamageTypes.Contains(x.Key)).ToList(); - - if (relevantTypes.Count != group.DamageTypes.Count) - continue; - - var sum = FixedPoint2.Zero; - foreach (var type in group.DamageTypes) - { - sum += damageSpec.DamageDict.GetValueOrDefault(type); - } - - // if the total sum of all the types equal the damage amount, - // assume that they're evenly distributed. - if (sum != amount) - continue; - - var sign = FixedPoint2.Sign(amount); - - if (sign < 0) - heals = true; - if (sign > 0) - deals = true; - - damages.Add( - Loc.GetString("health-change-display", - ("kind", group.LocalizedName), - ("amount", MathF.Abs(amount.Float())), - ("deltasign", sign) - )); - - foreach (var type in group.DamageTypes) - { - damageSpec.DamageDict.Remove(type); - } - } - foreach (var (kind, amount) in damageSpec.DamageDict) { var sign = FixedPoint2.Sign(amount); -- 2.51.2