From b952e09fd6e8f94d6566642c7979ed20f1731bc6 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 16 Oct 2024 23:55:20 -0400
Subject: [PATCH] Fix Melee Contests

---
 Content.Shared/Contests/ContestsSystem.Utilities.cs  | 12 ++++++------
 Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Content.Shared/Contests/ContestsSystem.Utilities.cs b/Content.Shared/Contests/ContestsSystem.Utilities.cs
index 0278d75e943..2bcb6dcc322 100644
--- a/Content.Shared/Contests/ContestsSystem.Utilities.cs
+++ b/Content.Shared/Contests/ContestsSystem.Utilities.cs
@@ -30,27 +30,27 @@ public float ContestConstructor(EntityUid user, ContestArgs args)
             return 1;
 
         if (!args.DoEveryInteraction)
-            return args.DoMassInteraction ? ((!args.MassDisadvantage
+            return args.DoMassInteraction ? ((args.MassDisadvantage
                         ? MassContest(user, args.MassBypassClamp, args.MassRangeModifier)
                         : 1 / MassContest(user, args.MassBypassClamp, args.MassRangeModifier))
                             + args.MassOffset)
                                 : 1
-                    * (args.DoStaminaInteraction ? ((!args.StaminaDisadvantage
+                    * (args.DoStaminaInteraction ? ((args.StaminaDisadvantage
                         ? StaminaContest(user, args.StaminaBypassClamp, args.StaminaRangeModifier)
                         : 1 / StaminaContest(user, args.StaminaBypassClamp, args.StaminaRangeModifier))
                             + args.StaminaOffset)
                                 : 1)
-                    * (args.DoHealthInteraction ? ((!args.HealthDisadvantage
+                    * (args.DoHealthInteraction ? ((args.HealthDisadvantage
                         ? HealthContest(user, args.HealthBypassClamp, args.HealthRangeModifier)
                         : 1 / HealthContest(user, args.HealthBypassClamp, args.HealthRangeModifier))
                             + args.HealthOffset)
                                 : 1)
-                    * (args.DoMindInteraction ? ((!args.MindDisadvantage
+                    * (args.DoMindInteraction ? ((args.MindDisadvantage
                         ? MindContest(user, args.MindBypassClamp, args.MindRangeModifier)
                         : 1 / MindContest(user, args.MindBypassClamp, args.MindRangeModifier))
                             + args.MindOffset)
                                 : 1)
-                    * (args.DoMoodInteraction ? ((!args.MoodDisadvantage
+                    * (args.DoMoodInteraction ? ((args.MoodDisadvantage
                         ? MoodContest(user, args.MoodBypassClamp, args.MoodRangeModifier)
                         : 1 / MoodContest(user, args.MoodBypassClamp, args.MoodRangeModifier))
                             + args.MoodOffset)
@@ -280,4 +280,4 @@ public sealed partial class ContestArgs
     /// </summary>
     [DataField]
     public bool EveryInteractionSumOrMultiply;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 694273e5bf3..5fc92ce37a9 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -166,10 +166,7 @@ public sealed partial class MeleeWeaponComponent : Component
     {
         DoStaminaInteraction = true,
         StaminaDisadvantage = true,
-        StaminaRangeModifier = 2,
-        StaminaOffset = 0.25f,
         DoHealthInteraction = true,
-        HealthRangeModifier = 1.5f,
     };
 
     /// <summary>