tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HealingSystem: check blood restoration, staunching (#33526)

Browse Source 
* HealingSystem: check blood restoration, staunching

* Milon's suggestions

* beck-thompson's requests
This commit is contained in:
Whatstone
2025-02-04 22:23:30 -05:00
committed by GitHub
parent f52116ba3b
commit 5092681729
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/Medical/HealingSystem.cs
View File

@@ -118,15 +118,15 @@ public sealed class HealingSystem : EntitySystem
_audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(1f)); _audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(1f));
// Logic to determine the whether or not to repeat the healing action // Logic to determine the whether or not to repeat the healing action
args.Repeat = (HasDamage(entity.Comp, healing) && !dontRepeat); args.Repeat = (HasDamage(entity, healing) && !dontRepeat);
if (!args.Repeat && !dontRepeat) if (!args.Repeat && !dontRepeat)
_popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User); _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User);
args.Handled = true; args.Handled = true;
} }
private bool HasDamage(DamageableComponent component, HealingComponent healing) private bool HasDamage(Entity<DamageableComponent> ent, HealingComponent healing)
{ {
var damageableDict = component.Damage.DamageDict; var damageableDict = ent.Comp.Damage.DamageDict;
var healingDict = healing.Damage.DamageDict; var healingDict = healing.Damage.DamageDict;
foreach (var type in healingDict) foreach (var type in healingDict)
{ {
@@ -136,6 +136,23 @@ public sealed class HealingSystem : EntitySystem
} }
} }
if (TryComp<BloodstreamComponent>(ent, out var bloodstream))
{
// Is ent missing blood that we can restore?
if (healing.ModifyBloodLevel > 0
&& _solutionContainerSystem.ResolveSolution(ent.Owner, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
&& bloodSolution.Volume < bloodSolution.MaxVolume)
{
return true;
}
// Is ent bleeding and can we stop it?
if (healing.BloodlossModifier < 0 && bloodstream.BleedAmount > 0)
{
return true;
}
}
return false; return false;
} }
@@ -175,14 +192,7 @@ public sealed class HealingSystem : EntitySystem
if (TryComp<StackComponent>(uid, out var stack) && stack.Count < 1) if (TryComp<StackComponent>(uid, out var stack) && stack.Count < 1)
return false; return false;
var anythingToDo = if (!HasDamage((target, targetDamage), component))
HasDamage(targetDamage, component) ||
component.ModifyBloodLevel > 0 // Special case if healing item can restore lost blood...
&& TryComp<BloodstreamComponent>(target, out var bloodstream)
&& _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
&& bloodSolution.Volume < bloodSolution.MaxVolume; // ...and there is lost blood to restore.
if (!anythingToDo)
{ {
_popupSystem.PopupEntity(Loc.GetString("medical-item-cant-use", ("item", uid)), uid, user); _popupSystem.PopupEntity(Loc.GetString("medical-item-cant-use", ("item", uid)), uid, user);
return false; return false;