tweak

WWhiteDreamProject · Sep 1, 2024 · 871aaaf · 871aaaf
1 parent 41f6723
commit 871aaaf
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 38 deletions.
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 = 0.6f; // WD EDIT
+    public float HeavyDamageBaseModifier = 1f; // WD EDIT
 
     /// <summary>
     /// Total width of the angle for wide attacks.
@@ -133,7 +133,7 @@ public sealed partial class MeleeWeaponComponent : Component
     public bool SwingLeft;
 
     [DataField, AutoNetworkedField]
-    public float HeavyStaminaCost = 12f; // WD EDIT
+    public float HeavyStaminaCost = 20f; // WD EDIT
 
     [DataField, AutoNetworkedField]
     public int MaxTargets = 5;

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: 1 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
     maxTargets: 8
   - type: Tag
     tags:

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: 1.2
-    heavyStaminaCost: 20 # WD EDIT
     maxTargets: 8
     soundHit:
       path: /Audio/Weapons/smash.ogg

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 # WD EDIT
-    heavyStaminaCost: 5
     maxTargets: 5
     angle: 100
   - type: Item
@@ -47,8 +45,6 @@
         Pierce: 7
     heavyRateModifier: 0.9
     heavyRangeModifier: 1.25
-    heavyDamageBaseModifier: 1 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
     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 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
     maxTargets: 2
     angle: 180
     soundHit:
@@ -63,8 +61,6 @@
       bluntStaminaDamageFactor: 3
       heavyRateModifier: 0.8
       heavyRangeModifier: 1.25
-      heavyDamageBaseModifier: 1 # WD EDIT
-      heavyStaminaCost: 10
       maxTargets: 2
       angle: 180
       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 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
     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 # WD EDIT
-    heavyStaminaCost: 20 # WD EDIT
     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: 0.8 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
     maxTargets: 2
     angle: 120
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -16,7 +16,6 @@
       types:
         Slash: 8
     heavyRateModifier: 0.9
-    heavyStaminaCost: 5
   - type: Item
     size: Normal
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -21,7 +21,6 @@
         Blunt: 4
         Slash: 6
         Structural: 10
-    heavyStaminaCost: 10
     angle: 100
     soundHit:
       collection: MetalThud

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: 0.8 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
     maxTargets: 2
     angle: 120
     soundHit:

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 # WD EDIT
-    heavyStaminaCost: 20 # WD EDIT
     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
-    heavyStaminaCost: 20 # WD EDIT
     maxTargets: 3
     angle: 20
     animation: WeaponArcThrust

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 # WD EDIT
-    heavyStaminaCost: 20 # WD EDIT
     maxTargets: 1
     angle: 20
   - type: Wieldable

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -103,8 +103,6 @@
       collection: MetalThud
     bluntStaminaDamageFactor: 2
     heavyRateModifier: 1
-    heavyDamageBaseModifier: 0.8 # WD EDIT
-    heavyStaminaCost: 15 # WD EDIT
   - type: Item
     size: Normal
   - type: Clothing