Refactor/wounds

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -73,6 +73,16 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
+    <ui:MenuButton
+        Name="MedicalButton"
+        Access="Internal"
+        Icon="{xe:Tex '/Textures/Interface/fist.svg.192dpi.png'}"
+        BoundKey = "{x:Static is:ContentKeyFunctions.OpenActionsMenu}"
+        ToolTip="Open Medical Menu"
+        MinSize="42 64"
+        HorizontalExpand="True"
+        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+    />
     <ui:MenuButton
         Name="AdminButton"
         Access="Internal"

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -10,6 +10,8 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.GhostKick;
 using Content.Server.Medical;
+using Content.Server.Medical.Bloodstream.Components;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Pointing.Components;
 using Content.Server.Polymorph.Systems;

Content.Server/Body/Components/MetabolizerComponent.cs

@@ -1,4 +1,5 @@
 using Content.Server.Body.Systems;
+using Content.Server.Medical.Bloodstream.Components;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

Content.Server/Body/Components/StomachComponent.cs

@@ -1,5 +1,6 @@
 using Content.Server.Body.Systems;
 using Content.Server.Nutrition.EntitySystems;
+using Content.Server.Medical.Bloodstream.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Whitelist;
 

Content.Server/Body/Systems/BodySystem.cs

@@ -80,7 +80,7 @@ public override bool AttachPart(
         BodyPartSlot slot,
         [NotNullWhen(true)] BodyPartComponent? part = null)
     {
-        if (!base.AttachPart(partId, slot, part))
+        if (partId == null || !Resolve(partId.Value, ref part, false) || !base.AttachPart(partId, slot, part))
             return false;
 
         if (part.Body is { } body &&
@@ -102,7 +102,7 @@ public override bool DropPart(EntityUid? partId, BodyPartComponent? part = null)
         if (partId == null || !Resolve(partId.Value, ref part))
             return false;
 
-        if (!base.DropPart(partId, part))
+        if (partId == null || !Resolve(partId.Value, ref part, false) || !base.DropPart(partId, part))
             return false;
 
         var oldBody = part.Body;

Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs

@@ -1,7 +1,6 @@
-using Content.Server.Body.Components;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry;
+using Content.Server.Medical.Bloodstream.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;

Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs

@@ -1,6 +1,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Systems;
 using Content.Server.Interaction;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Server.Popups;
 using Content.Shared.CombatMode;
 using Content.Shared.Chemistry;

Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs

@@ -2,6 +2,8 @@
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Medical.Bloodstream.Components;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.Physics.Dynamics;

Content.Server/Chemistry/ReagentEffects/ChemCleanBoodstream.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Content.Server.Body.Systems;
-using Robust.Shared.Prototypes;
+using Content.Server.Medical.Bloodstream.Systems;
 
 namespace Content.Server.Chemistry.ReactionEffects
 {

Content.Server/Chemistry/ReagentEffects/ModifyBleedAmount.cs

@@ -1,5 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Server.Medical.Bloodstream.Components;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
 

Content.Server/Chemistry/ReagentEffects/ModifyBloodLevel.cs

@@ -1,5 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Server.Medical.Bloodstream.Components;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;

Content.Server/Dragon/DragonSystem.cs

@@ -7,6 +7,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Server.NPC;
 using Content.Shared.Damage;
 using Content.Shared.Dragon;

Content.Server/Fluids/EntitySystems/SmokeSystem.cs

@@ -6,6 +6,8 @@
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Chemistry.ReactionEffects;
 using Content.Server.Coordinates.Helpers;
+using Content.Server.Medical.Bloodstream.Components;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;

Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs

@@ -14,6 +14,7 @@
 using Content.Server.Climbing;
 using Content.Server.Construction;
 using Content.Server.Materials;
+using Content.Server.Medical.Bloodstream.Components;
 using Content.Server.Mind.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Humanoid;

Content.Server/Medical/Bloodstream/Components/BleedInflicterComponent.cs

@@ -0,0 +1,12 @@
+using Content.Server.Medical.Bloodstream.Systems;
+using Content.Shared.FixedPoint;
+
+namespace Content.Server.Medical.Bloodstream.Components;
+
+[RegisterComponent, Access(typeof(BloodstreamSystem))]
+public sealed class BleedInflicterComponent : Component
+{
+    //How much bloodloss to apply
+    [DataField("bloodloss", required: true)]
+    public FixedPoint2 Bloodloss;
+}

Content.Server/Body/Components/BloodstreamComponent.cs → Content.Server/Medical/Bloodstream/Components/BloodstreamComponent.cs

@@ -1,13 +1,13 @@
-using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
+using Content.Server.Medical.Bloodstream.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Body.Components
+namespace Content.Server.Medical.Bloodstream.Components
 {
     [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)))]
     public sealed class BloodstreamComponent : Component
@@ -29,7 +29,7 @@ public sealed class BloodstreamComponent : Component
         ///     This generally corresponds to an amount of damage and can't go above 100.
         /// </remarks>
         [ViewVariables(VVAccess.ReadWrite)]
-        public float BleedAmount;
+        public FixedPoint2 BleedAmount;
 
         /// <summary>
         ///     How much should bleeding should be reduced every update interval?
@@ -47,7 +47,7 @@ public sealed class BloodstreamComponent : Component
         ///     What percentage of current blood is necessary to avoid dealing blood loss damage?
         /// </summary>
         [DataField("bloodlossThreshold")]
-        public float BloodlossThreshold = 0.9f;
+        public FixedPoint2 BloodlossThreshold = 0.9f;
 
         /// <summary>
         ///     The base bloodloss damage to be incurred if below <see cref="BloodlossThreshold"/>
@@ -74,7 +74,7 @@ public sealed class BloodstreamComponent : Component
         ///     How much reagent of blood should be restored each update interval?
         /// </summary>
         [DataField("bloodRefreshAmount")]
-        public float BloodRefreshAmount = 1.0f;
+        public FixedPoint2 BloodRefreshAmount = 1.0f;
 
         /// <summary>
         ///     How much blood needs to be in the temporary solution in order to create a puddle?

Content.Server/Body/Systems/BloodstreamSystem.cs → Content.Server/Medical/Bloodstream/Systems/BloodstreamSystem.cs

@@ -1,29 +1,31 @@
 using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Chemistry.ReactionEffects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.HealthExaminable;
+using Content.Server.Medical.Bloodstream.Components;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Drunk;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Popups;
-using Content.Shared.Drunk;
+using Content.Shared.Medical.Wounds.Components;
+using Content.Shared.Medical.Wounds.Systems;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Rejuvenate;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Content.Shared.Speech.EntitySystems;
 
-namespace Content.Server.Body.Systems;
+namespace Content.Server.Medical.Bloodstream.Systems;
 
 public sealed class BloodstreamSystem : EntitySystem
 {
@@ -49,6 +51,42 @@ public override void Initialize()
         SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
         SubscribeLocalEvent<BloodstreamComponent, ReactionAttemptEvent>(OnReactionAttempt);
         SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<BloodstreamComponent, WoundAddedEvent>(OnWoundAdded);
+        SubscribeLocalEvent<BloodstreamComponent, WoundSeverityChangedEvent>(OnWoundSeverityUpdate);
+        SubscribeLocalEvent<BloodstreamComponent, WoundCauterizedEvent>(OnWoundCauterizeUpdate);
+    }
+
+    private void OnWoundCauterizeUpdate(EntityUid uid, BloodstreamComponent component, ref WoundCauterizedEvent args)
+    {
+        if (!TryComp(args.WoundEntity, out BleedInflicterComponent? bleed))
+            return;
+
+        if (args.OldState)
+        {
+            //Add bleeding back if we are reopening a wound
+            TryModifyBleedAmount(uid, bleed.Bloodloss*args.WoundComponent.Severity, component);
+        }
+        else
+        {
+            //Remove bleeding if we are cauterizing
+            TryModifyBleedAmount(uid, - bleed.Bloodloss*args.WoundComponent.Severity, component);
+        }
+    }
+
+    private void OnWoundSeverityUpdate(EntityUid uid, BloodstreamComponent component, ref WoundSeverityChangedEvent args)
+    {
+        if (!TryComp(args.WoundEntity, out BleedInflicterComponent? bleed) || args.WoundComponent.CanBleed)
+            return;
+        var severityDelta = args.WoundComponent.Severity - args.OldSeverity;
+        var bleedDelta = severityDelta * bleed.Bloodloss;
+        TryModifyBleedAmount(uid, bleedDelta, component);
+    }
+
+    private void OnWoundAdded(EntityUid uid, BloodstreamComponent component, ref WoundAddedEvent args)
+    {
+        if (!TryComp(args.WoundEntity, out BleedInflicterComponent? bleed) ||  args.WoundComponent.CanBleed)
+            return;
+        TryModifyBleedAmount(uid, bleed.Bloodloss*args.WoundComponent.Severity, component);
     }
 
     private void OnReactionAttempt(EntityUid uid, BloodstreamComponent component, ReactionAttemptEvent args)
@@ -102,9 +140,7 @@ public override void Update(float frameTime)
             // as well as stop their bleeding to a certain extent.
             if (bloodstream.BleedAmount > 0)
             {
-                // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
-                TryModifyBloodLevel(uid, (-bloodstream.BleedAmount), bloodstream);
-                // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
+                TryModifyBloodLevel(uid, (-bloodstream.BleedAmount) / 10, bloodstream);
                 TryModifyBleedAmount(uid, -bloodstream.BleedReductionAmount, bloodstream);
             }
 
@@ -173,26 +209,19 @@ private void OnDamageChanged(EntityUid uid, BloodstreamComponent component, Dama
         if (bloodloss.Empty)
             return;
 
-        // Does the calculation of how much bleed rate should be added/removed, then applies it
         var oldBleedAmount = component.BleedAmount;
         var total = bloodloss.Total;
         var totalFloat = total.Float();
         TryModifyBleedAmount(uid, totalFloat, component);
 
-        /// <summary>
-        ///     Critical hit. Causes target to lose blood, using the bleed rate modifier of the weapon, currently divided by 5
-        ///     The crit chance is currently the bleed rate modifier divided by 25.
-        ///     Higher damage weapons have a higher chance to crit!
-        /// </summary>
-        var prob = Math.Clamp(totalFloat / 25, 0, 1);
+        var prob = Math.Clamp(totalFloat / 50, 0, 1);
+        var healPopupProb = Math.Clamp(Math.Abs(totalFloat) / 25, 0, 1);
         if (totalFloat > 0 && _robustRandom.Prob(prob))
         {
             TryModifyBloodLevel(uid, (-total) / 5, component);
             _audio.PlayPvs(component.InstantBloodSound, uid);
         }
-
-        // Heat damage will cauterize, causing the bleed rate to be reduced.
-        else if (totalFloat < 0 && oldBleedAmount > 0)
+        else if (totalFloat < 0 && oldBleedAmount > 0 && _robustRandom.Prob(healPopupProb))
         {
             // Magically, this damage has healed some bleeding, likely
             // because it's burn damage that cauterized their wounds.
@@ -203,25 +232,20 @@ private void OnDamageChanged(EntityUid uid, BloodstreamComponent component, Dama
                 uid, PopupType.Medium);
         }
     }
-    /// <summary>
-    ///     Shows text on health examine, based on bleed rate and blood level.
-    /// </summary>
+
     private void OnHealthBeingExamined(EntityUid uid, BloodstreamComponent component, HealthBeingExaminedEvent args)
     {
-        // Shows profusely bleeding at half the max bleed rate.
-        if (component.BleedAmount > component.MaxBleedAmount / 2)
+        if (component.BleedAmount > 10)
         {
             args.Message.PushNewline();
             args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", Identity.Entity(uid, EntityManager))));
         }
-        // Shows bleeding message when bleeding, but less than profusely.
         else if (component.BleedAmount > 0)
         {
             args.Message.PushNewline();
             args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", Identity.Entity(uid, EntityManager))));
         }
 
-        // If the mob's blood level is below the damage threshhold, the pale message is added.
         if (GetBloodLevelPercentage(uid, component) < component.BloodlossThreshold)
         {
             args.Message.PushNewline();
@@ -336,13 +360,13 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo
     /// <summary>
     ///     Tries to make an entity bleed more or less
     /// </summary>
-    public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamComponent? component = null)
+    public bool TryModifyBleedAmount(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null)
     {
         if (!Resolve(uid, ref component, false))
             return false;
 
         component.BleedAmount += amount;
-        component.BleedAmount = Math.Clamp(component.BleedAmount, 0, component.MaxBleedAmount);
+        component.BleedAmount = FixedPoint2.Clamp(component.BleedAmount, 0, component.MaxBleedAmount);
 
         return true;
     }
@@ -375,4 +399,16 @@ public void SpillAllSolutions(EntityUid uid, BloodstreamComponent? component = n
             }
         }
     }
+
+    public void ModifyBleedInflicter(EntityUid inflicterId, EntityUid bloodstreamId, FixedPoint2 delta, BleedInflicterComponent? inflicter = null, WoundComponent? wound = null, BloodstreamComponent? bloodstream = null)
+    {
+        if (!Resolve(inflicterId, ref inflicter, ref wound))
+            return;
+
+        var oldBleed = inflicter.Bloodloss * wound.Severity;
+
+        inflicter.Bloodloss += delta;
+        var newBleed = inflicter.Bloodloss * wound.Severity;
+        TryModifyBleedAmount(bloodstreamId, newBleed - oldBleed, bloodstream);
+    }
 }