From 3103a87b6606d31fee0136faac566dd2846f00d6 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Tue, 4 Feb 2025 16:16:41 -0500 Subject: [PATCH] a --- .../_DV/Vampire/BloodSuckerSystem.cs | 70 +++++++++---------- .../_DV/Vampire/BloodSuckerSystem.cs | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Content.Server/_DV/Vampire/BloodSuckerSystem.cs b/Content.Server/_DV/Vampire/BloodSuckerSystem.cs index d66e07c28d7..78f865a7418 100644 --- a/Content.Server/_DV/Vampire/BloodSuckerSystem.cs +++ b/Content.Server/_DV/Vampire/BloodSuckerSystem.cs @@ -122,50 +122,50 @@ public void StartSuckDoAfter(EntityUid bloodsucker, EntityUid victim, BloodSucke public bool TrySuck(EntityUid bloodsucker, EntityUid victim, BloodSuckerComponent? bloodsuckerComp = null) - { - var sharedBloodSuckerSystem = EntitySystem.Get(); +{ + var sharedBloodSuckerSystem = EntitySystem.Get(); - if (!Resolve(bloodsucker, ref bloodsuckerComp)) - return false; - if (!TryValidateVictim(victim)) - return false; + if (!Resolve(bloodsucker, ref bloodsuckerComp)) + return false; + if (!TryValidateVictim(victim)) + return false; - if (!TryGetBloodsuckerStomach(bloodsucker, out var stomach)) - return false; - if (!sharedBloodSuckerSystem.TryValidateSolution(bloodsucker)) - return false; + if (!TryGetBloodsuckerStomach(bloodsucker, out var stomach)) + return false; + if (!sharedBloodSuckerSystem.TryValidateSolution(bloodsucker)) + return false; - sharedBloodSuckerSystem.PlayBloodSuckEffects(bloodsucker, victim); - return CompleteBloodSuck(bloodsucker, victim, stomach, bloodsuckerComp); - } + sharedBloodSuckerSystem.PlayBloodSuckEffects(bloodsucker, victim); + return CompleteBloodSuck(bloodsucker, victim, stomach, bloodsuckerComp); +} - private bool TryValidateVictim(EntityUid victim) - { - if (!TryComp(victim, out var bloodstream) || bloodstream.BloodSolution == null) - return false; - return _bloodstreamSystem.GetBloodLevelPercentage(victim, bloodstream) != 0.0f; - } +private bool TryValidateVictim(EntityUid victim) +{ + if (!TryComp(victim, out var bloodstream) || bloodstream.BloodSolution == null) + return false; + return _bloodstreamSystem.GetBloodLevelPercentage(victim, bloodstream) != 0.0f; +} - private bool TryGetBloodsuckerStomach(EntityUid bloodsucker, out StomachComponent stomach) - { - stomach = _bodySystem.GetBodyOrganEntityComps(bloodsucker).FirstOrDefault(); - return true; - } +private bool TryGetBloodsuckerStomach(EntityUid bloodsucker, out StomachComponent stomach) +{ + stomach = _bodySystem.GetBodyOrganEntityComps(bloodsucker).FirstOrDefault(); + return true; +} - private bool CompleteBloodSuck(EntityUid bloodsucker, EntityUid victim, StomachComponent stomach, BloodSuckerComponent bloodsuckerComp) - { - if (!TryComp(victim, out var bloodstream) || bloodstream.BloodSolution == null) - return false; +private bool CompleteBloodSuck(EntityUid bloodsucker, EntityUid victim, StomachComponent stomach, BloodSuckerComponent bloodsuckerComp) +{ + if (!TryComp(victim, out var bloodstream) || bloodstream.BloodSolution == null) + return false; - var extractedBlood = _solutionSystem.SplitSolution(bloodstream.BloodSolution.Value, bloodsuckerComp.UnitsToSuck); - _stomachSystem.TryTransferSolution(bloodsucker, extractedBlood, stomach); + var extractedBlood = _solutionSystem.SplitSolution(bloodstream.BloodSolution.Value, bloodsuckerComp.UnitsToSuck); + _stomachSystem.TryTransferSolution(bloodsucker, extractedBlood, stomach); - DamageSpecifier damage = new(); - damage.DamageDict.Add("Piercing", 1); - _damageableSystem.TryChangeDamage(victim, damage, true); + DamageSpecifier damage = new(); + damage.DamageDict.Add("Piercing", 1); + _damageableSystem.TryChangeDamage(victim, damage, true); - return true; - } + return true; +} } } diff --git a/Content.Shared/_DV/Vampire/BloodSuckerSystem.cs b/Content.Shared/_DV/Vampire/BloodSuckerSystem.cs index 8e32db925d1..6e57c7b2b79 100644 --- a/Content.Shared/_DV/Vampire/BloodSuckerSystem.cs +++ b/Content.Shared/_DV/Vampire/BloodSuckerSystem.cs @@ -54,7 +54,7 @@ public bool TryValidateSolution(EntityUid bloodsucker) return false; } - public void PlayBloodSuckEffects(EntityUid bloodsucker, EntityUid victim) + private void PlayBloodSuckEffects(EntityUid bloodsucker, EntityUid victim) { _adminLogger.Add(LogType.MeleeHit, LogImpact.Medium, $"{ToPrettyString(bloodsucker):player} sucked blood from {ToPrettyString(victim):target}"); _audio.PlayPvs("/Audio/Items/drink.ogg", bloodsucker);