From 517b2b4fcfbdeacc32f9795c285620e84711fc66 Mon Sep 17 00:00:00 2001
From: MWKane <96324339+MWKane@users.noreply.github.com>
Date: Fri, 24 Mar 2023 11:50:28 +1000
Subject: [PATCH] Remove BoxerComponent (#13935)

---
 .../Abilities/Boxer/Boxer/BoxerComponent.cs   | 23 -----------
 .../Boxer/Boxer/BoxingGlovesComponent.cs      | 11 ------
 .../Abilities/Boxer/BoxingSystem.cs           | 39 -------------------
 .../Entities/Clothing/Hands/gloves.yml        |  1 -
 .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 10 -----
 5 files changed, 84 deletions(-)
 delete mode 100644 Content.Server/Abilities/Boxer/Boxer/BoxerComponent.cs
 delete mode 100644 Content.Server/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs
 delete mode 100644 Content.Server/Abilities/Boxer/BoxingSystem.cs

diff --git a/Content.Server/Abilities/Boxer/Boxer/BoxerComponent.cs b/Content.Server/Abilities/Boxer/Boxer/BoxerComponent.cs
deleted file mode 100644
index cd3f5de0a7..0000000000
--- a/Content.Server/Abilities/Boxer/Boxer/BoxerComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Server.Abilities.Boxer
-{
-    /// <summary>
-    /// Added to the boxer on spawn.
-    /// </summary>
-    [RegisterComponent]
-    public sealed class BoxerComponent : Component
-    {
-        [DataField("modifiers", required: true)]
-        public DamageModifierSet UnarmedModifiers = default!;
-
-        [DataField("rangeBonus")]
-        public float RangeBonus = 1.5f;
-
-        /// <summary>
-        /// Damage modifier with boxing glove stam damage.
-        /// </summary>
-        [DataField("boxingGlovesModifier")]
-        public float BoxingGlovesModifier = 1.75f;
-    }
-}
diff --git a/Content.Server/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs b/Content.Server/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs
deleted file mode 100644
index 92a9626013..0000000000
--- a/Content.Server/Abilities/Boxer/Boxer/BoxingGlovesComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Server.Abilities.Boxer
-{
-    /// <summary>
-    /// Boxer gets a bonus for these, and their fists, but not other unarmed weapons.
-    /// </summary>
-    [RegisterComponent]
-    public sealed class BoxingGlovesComponent : Component
-    {}
-}
diff --git a/Content.Server/Abilities/Boxer/BoxingSystem.cs b/Content.Server/Abilities/Boxer/BoxingSystem.cs
deleted file mode 100644
index 031c248a65..0000000000
--- a/Content.Server/Abilities/Boxer/BoxingSystem.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Damage.Events;
-using Content.Shared.Weapons.Melee;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Containers;
-
-namespace Content.Server.Abilities.Boxer
-{
-    public sealed class BoxingSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<BoxerComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<BoxerComponent, MeleeHitEvent>(OnMeleeHit);
-            SubscribeLocalEvent<BoxingGlovesComponent, StaminaMeleeHitEvent>(OnStamHit);
-        }
-
-        private void OnInit(EntityUid uid, BoxerComponent component, ComponentInit args)
-        {
-            if (TryComp<MeleeWeaponComponent>(uid, out var meleeComp))
-                meleeComp.Range *= component.RangeBonus;
-        }
-        private void OnMeleeHit(EntityUid uid, BoxerComponent component, MeleeHitEvent args)
-        {
-            args.ModifiersList.Add(component.UnarmedModifiers);
-        }
-
-        private void OnStamHit(EntityUid uid, BoxingGlovesComponent component, StaminaMeleeHitEvent args)
-        {
-            if (!_containerSystem.TryGetContainingContainer(uid, out var equipee))
-                return;
-
-            if (TryComp<BoxerComponent>(equipee.Owner, out var boxer))
-                args.Multiplier *= boxer.BoxingGlovesModifier;
-        }
-    }
-}
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index cea116c388..849b9496a5 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -8,7 +8,6 @@
     sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi
-  - type: BoxingGloves
   - type: StaminaDamageOnHit
     damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
     # This needs to be moved to boxinggloves
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
index 52396a1be5..19437047e4 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
@@ -9,16 +9,6 @@
   supervisors: job-supervisors-hop
   access:
   - Service
-  special:
-  - !type:AddComponentSpecial
-    components:
-    - type: Boxer
-      modifiers:
-        coefficients: #Remember these only apply to unarmed
-          Blunt: 1.5
-          Slash: 1.5
-          Piercing: 1.5
-
 - type: startingGear
   id: BoxerGear
   equipment:
-- 
2.51.2