WWhiteDreamProject · Remuchi · Sep 3, 2024 · Aug 31, 2024 · Aug 31, 2024 · Sep 1, 2024
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -103,7 +103,7 @@ public sealed partial class MeleeWeaponComponent : Component
     ///     Weapon damage is multiplied by this amount for heavy swings
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float HeavyDamageBaseModifier = 1.2f;
+    public float HeavyDamageBaseModifier = 1f; // WD EDIT
 
     /// <summary>
     /// Total width of the angle for wide attacks.
@@ -117,6 +117,11 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public EntProtoId WideAnimation = "WeaponArcSlash";
 
+    // WD EDIT START
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public EntProtoId DisarmAnimation = "WeaponArcDisarm";
+    // WD EDIT END
+
     /// <summary>
     /// Rotation of the animation.
     /// 0 degrees means the top faces the attacker.
@@ -128,7 +133,7 @@ public sealed partial class MeleeWeaponComponent : Component
     public bool SwingLeft;
 
     [DataField, AutoNetworkedField]
-    public float HeavyStaminaCost = 20f;
+    public float HeavyStaminaCost = 20f; // WD EDIT
 
     [DataField, AutoNetworkedField]
     public int MaxTargets = 5;

diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -414,7 +414,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
                     if (!DoDisarm(user, disarm, weaponUid, weapon, session))
                         return false;
 
-                    animation = weapon.Animation;
+                    animation = weapon.DisarmAnimation; // WD EDIT
                     break;
                 case HeavyAttackEvent heavy:
                     if (!DoHeavyAttack(user, heavy, weaponUid, weapon, session))

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -24,8 +24,6 @@
         Shock: 1
     bluntStaminaDamageFactor: 1.5
     heavyRateModifier: 0.75
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
     angle: 75
   - type: Item
     size: Normal

diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -18,8 +18,6 @@
         Blunt: 3.5
     heavyRateModifier: 0.8
     heavyRangeModifier: 0.8
-    heavyDamageBaseModifier: 2
-    heavyStaminaCost: 5
     maxTargets: 8
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -13,8 +13,6 @@
         Slash: 4
     heavyRateModifier: 0.8
     heavyRangeModifier: 0.8
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 5
     maxTargets: 3
     angle: 75
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -45,8 +45,6 @@
       types:
         Blunt: 8
     heavyRateModifier: 0.8
-    heavyDamageBaseModifier: 2
-    heavyStaminaCost: 15
     maxTargets: 8
     soundHit:
       path: /Audio/Weapons/smash.ogg

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -48,8 +48,6 @@
         Blunt: 4
         Holy: 20
     heavyRateModifier: 0.8
-    heavyDamageBaseModifier: 1
-    heavyStaminaCost: 5
     maxTargets: 3
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -20,8 +20,6 @@
         Blunt: 3
     heavyRateModifier: 1
     heavyRangeModifier: 1
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 5
     angle: 100
   - type: Item
@@ -47,8 +45,6 @@
         Pierce: 7
     heavyRateModifier: 0.9
     heavyRangeModifier: 1.25
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
   - type: Item
@@ -73,8 +69,6 @@
         Slash: 7
     heavyRateModifier: 0.8
     heavyRangeModifier: 1.25
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 120
   - type: Item
@@ -107,8 +101,6 @@
     damage:
       types:
         Slash: 10
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
 
@@ -132,8 +124,6 @@
         Slash: 2 # I guess you can stab it into them?
     heavyRateModifier: 0.8
     heavyRangeModifier: 1.25
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     angle: 80
     soundHit:
       collection: MetalThud

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -15,8 +15,6 @@
     bluntStaminaDamageFactor: 3
     heavyRateModifier: 0.8
     heavyRangeModifier: 1.25
-    heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 10
     maxTargets: 2
     angle: 180
     soundHit:
@@ -63,8 +61,6 @@
       bluntStaminaDamageFactor: 3
       heavyRateModifier: 0.8
       heavyRangeModifier: 1.25
-      heavyDamageBaseModifier: 1.25
-      heavyStaminaCost: 10
       maxTargets: 2
       angle: 180
       soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -55,8 +55,6 @@
     damage:
       types:
         Piercing: 8
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:
@@ -92,8 +90,6 @@
       types:
         Slash: 7.5
     heavyRateModifier: 0.8
-    heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -40,8 +40,6 @@
         Blunt: 8
     bluntStaminaDamageFactor: 2.5
     heavyRateModifier: 0.8
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 15
     maxTargets: 1
     angle: 140
   - type: PhysicalComposition

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -52,8 +52,6 @@
         Slash: 2
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.8
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 10
     maxTargets: 1
     angle: 20
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -37,8 +37,6 @@
       types:
         Blunt: 6.5
     heavyRateModifier: 0.9
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 4
     angle: 60
     soundHit:
@@ -102,8 +100,6 @@
       types:
         Piercing: 6
     heavyRateModifier: 0.75
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -16,8 +16,6 @@
         Structural: 5
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.5
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 15
     maxTargets: 2
     angle: 120
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -23,8 +23,6 @@
         Blunt: 2
         Structural: 4
     heavyRateModifier: 0.5
-    heavyDamageBaseModifier: 1.0
-    heavyStaminaCost: 15
     maxTargets: 20
     angle: 160
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -16,8 +16,6 @@
       types:
         Slash: 8
     heavyRateModifier: 0.9
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
   - type: Item
     size: Normal
   - type: Clothing
@@ -43,8 +41,6 @@
     damage:
       types:
         Slash: 12
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
     maxTargets: 6
     angle: 90
   - type: Item

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -21,17 +21,15 @@
         Blunt: 4
         Slash: 6
         Structural: 10
-    heavyDamageBaseModifier: 1.0
-    heavyStaminaCost: 10
     angle: 100
     soundHit:
       collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2
-        Slash: 5
+        Blunt: 2.5 # WD EDIT
+        Slash: 7.5 # WD EDIT
         Structural: 40
   - type: Item
     size: Ginormous

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
@@ -13,8 +13,6 @@
         Blunt: 11
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.5
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 25
     maxTargets: 2
     angle: 120
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -18,8 +18,6 @@
       types:
         Slash: 8
     heavyRateModifier: 0.8
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 3
     angle: 40
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -52,8 +52,6 @@
         Slash: 4
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.75
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
     angle: 120
     soundHit:
       collection: MetalThud

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -23,8 +23,6 @@
         Blunt: 6
         Pierce: 3
     bluntStaminaDamageFactor: 2.0
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 5
     maxTargets: 2
     angle: 60
   - type: Wieldable

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -17,8 +17,6 @@
         Structural: 10
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.75
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 15
     maxTargets: 10
     angle: 120
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -42,8 +42,6 @@
         Slash: 1
     heavyRateModifier: 0.75
     heavyRangeModifier: 1.25
-    heavyDamageBaseModifier: 1.0
-    heavyStaminaCost: 5
     maxTargets: 3
     angle: 20
     animation: WeaponArcThrust

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -19,8 +19,6 @@
         Slash: 17 #cmon, it has to be at least BETTER than the rest.
     heavyRateModifier: 0.8
     heavyRangeModifier: 1
-    heavyDamageBaseModifier: 1
-    heavyStaminaCost: 5
     maxTargets: 7
     angle: 80
   - type: Reflect
@@ -58,8 +56,6 @@
         Slash: 12
     heavyRateModifier: 0.5
     heavyRangeModifier: 3 #Superior Japanese folded steel
-    heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 10
     maxTargets: 1
     angle: 20
   - type: Item

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml
@@ -20,8 +20,6 @@
     bluntStaminaDamageFactor: 2.5
     heavyRateModifier: 0.5
     heavyRangeModifier: 1.75
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 0
     maxTargets: 1
     angle: 20
   - type: Wieldable

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -36,8 +36,6 @@
         Blunt: 7
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.75
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 5
     maxTargets: 3
     angle: 60
     animation: WeaponArcSlash
@@ -105,8 +103,6 @@
       collection: MetalThud
     bluntStaminaDamageFactor: 2
     heavyRateModifier: 1
-    heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
   - type: Item
     size: Normal
   - type: Clothing