From fdf941308831e2f32b7d28b2b73096fc6d47e5f2 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:59:53 +0300
Subject: [PATCH] sharpened fix (#209)

---
 Content.Server/_CP14/MeleeWeapon/CP14SharpenedComponent.cs    | 2 +-
 Content.Server/_CP14/MeleeWeapon/CP14SharpeningSystem.cs      | 2 +-
 .../_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Content.Server/_CP14/MeleeWeapon/CP14SharpenedComponent.cs b/Content.Server/_CP14/MeleeWeapon/CP14SharpenedComponent.cs
index 4a2d54ae6d..09ec1f000d 100644
--- a/Content.Server/_CP14/MeleeWeapon/CP14SharpenedComponent.cs
+++ b/Content.Server/_CP14/MeleeWeapon/CP14SharpenedComponent.cs
@@ -11,5 +11,5 @@ public sealed partial class CP14SharpenedComponent : Component
     public float Sharpness = 1f;
 
     [DataField]
-    public float SharpnessDamageByHit = 0.01f;
+    public float SharpnessDamageBy1Damage = 0.002f; //500 damage
 }
diff --git a/Content.Server/_CP14/MeleeWeapon/CP14SharpeningSystem.cs b/Content.Server/_CP14/MeleeWeapon/CP14SharpeningSystem.cs
index a96341f38f..37793d11dc 100644
--- a/Content.Server/_CP14/MeleeWeapon/CP14SharpeningSystem.cs
+++ b/Content.Server/_CP14/MeleeWeapon/CP14SharpeningSystem.cs
@@ -33,7 +33,7 @@ public sealed class CP14SharpeningSystem : EntitySystem
         if (!args.HitEntities.Any())
             return;
 
-        sharpened.Comp.Sharpness = MathHelper.Clamp(sharpened.Comp.Sharpness - sharpened.Comp.SharpnessDamageByHit, 0.1f, 1f);
+        sharpened.Comp.Sharpness = MathHelper.Clamp(sharpened.Comp.Sharpness - args.BaseDamage.GetTotal().Float() * sharpened.Comp.SharpnessDamageBy1Damage, 0.1f, 1f);
     }
 
     private void OnInteract(Entity<CP14SharpeningStoneComponent> stone, ref ActivateInWorldEvent args)
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
index 7cc0b957b9..620ce86714 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
@@ -43,6 +43,4 @@
   - type: ClothingSpeedModifier
     walkModifier: 0.9
     sprintModifier: 0.8
-  - type: HeldSpeedModifier
-  - type: CP14Sharpened
-    sharpnessDamageByHit: 0.02
\ No newline at end of file
+  - type: HeldSpeedModifier
\ No newline at end of file