From 9b3ae4ee56c3b7ee8180ba92d1d6913986e7f74b Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Sat, 31 Aug 2024 19:05:41 +0300 Subject: [PATCH 1/3] tweak --- Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs | 9 +++++++-- Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 2 +- .../Objects/Fun/Instruments/instruments_string.yml | 2 -- .../Prototypes/Entities/Objects/Misc/briefcases.yml | 4 ++-- .../Prototypes/Entities/Objects/Misc/broken_bottle.yml | 2 -- .../Entities/Objects/Misc/fire_extinguisher.yml | 4 ++-- .../Entities/Objects/Specific/Chapel/bibles.yml | 2 -- .../Entities/Objects/Specific/Hydroponics/tools.yml | 6 +++--- .../Entities/Objects/Specific/Janitorial/janitor.yml | 6 +++--- .../Entities/Objects/Specific/Medical/surgery.yml | 4 ---- .../Prototypes/Entities/Objects/Tools/gas_tanks.yml | 4 ++-- .../Prototypes/Entities/Objects/Tools/jaws_of_life.yml | 4 ++-- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 4 ---- .../Entities/Objects/Weapons/Melee/baseball_bat.yml | 4 ++-- .../Entities/Objects/Weapons/Melee/chainsaw.yml | 2 -- .../Prototypes/Entities/Objects/Weapons/Melee/cult.yml | 3 --- .../Entities/Objects/Weapons/Melee/fireaxe.yml | 5 ++--- .../Entities/Objects/Weapons/Melee/home_run_bat.yml | 4 ++-- .../Prototypes/Entities/Objects/Weapons/Melee/knife.yml | 2 -- .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml | 2 -- .../Entities/Objects/Weapons/Melee/pickaxe.yml | 2 -- .../Entities/Objects/Weapons/Melee/sledgehammer.yml | 4 ++-- .../Prototypes/Entities/Objects/Weapons/Melee/spear.yml | 4 ++-- .../Prototypes/Entities/Objects/Weapons/Melee/sword.yml | 4 ---- .../Entities/Objects/Weapons/Melee/white_cane.yml | 4 ++-- .../Prototypes/Entities/Objects/Weapons/security.yml | 6 ++---- 26 files changed, 36 insertions(+), 63 deletions(-) diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 2708a07c6e..5fb03b3d45 100644 --- 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 /// [DataField, AutoNetworkedField] - public float HeavyDamageBaseModifier = 1.2f; + public float HeavyDamageBaseModifier = 0.6f; // WD EDIT /// /// 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 + /// /// 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 = 12f; // WD EDIT [DataField, AutoNetworkedField] public int MaxTargets = 5; diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index b5a537b7e1..a27eab1eed 100644 --- 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 index 947a973bbf..39f9589b58 100644 --- 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 index 760a0bafb6..48a6b790f2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -18,8 +18,8 @@ Blunt: 3.5 heavyRateModifier: 0.8 heavyRangeModifier: 0.8 - heavyDamageBaseModifier: 2 - heavyStaminaCost: 5 + heavyDamageBaseModifier: 1 # WD EDIT + heavyStaminaCost: 15 # WD EDIT 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 index f8dbabd07a..b0bf5cdd31 100644 --- 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 index f1802e426f..7990823ee8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -45,8 +45,8 @@ types: Blunt: 8 heavyRateModifier: 0.8 - heavyDamageBaseModifier: 2 - heavyStaminaCost: 15 + heavyDamageBaseModifier: 1.2 + heavyStaminaCost: 20 # WD EDIT 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 index 9ab53cebc9..78f04163bb 100644 --- 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 index 37b8daddc2..515633c61e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -20,7 +20,7 @@ Blunt: 3 heavyRateModifier: 1 heavyRangeModifier: 1 - heavyDamageBaseModifier: 1.2 + heavyDamageBaseModifier: 1 # WD EDIT heavyStaminaCost: 5 maxTargets: 5 angle: 100 @@ -47,8 +47,8 @@ Pierce: 7 heavyRateModifier: 0.9 heavyRangeModifier: 1.25 - heavyDamageBaseModifier: 1.2 - heavyStaminaCost: 5 + heavyDamageBaseModifier: 1 # WD EDIT + heavyStaminaCost: 15 # WD EDIT maxTargets: 1 angle: 20 - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index de5c33671a..58c301352a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -15,8 +15,8 @@ bluntStaminaDamageFactor: 3 heavyRateModifier: 0.8 heavyRangeModifier: 1.25 - heavyDamageBaseModifier: 1.25 - heavyStaminaCost: 10 + heavyDamageBaseModifier: 1 # WD EDIT + heavyStaminaCost: 15 # WD EDIT maxTargets: 2 angle: 180 soundHit: @@ -63,7 +63,7 @@ bluntStaminaDamageFactor: 3 heavyRateModifier: 0.8 heavyRangeModifier: 1.25 - heavyDamageBaseModifier: 1.25 + heavyDamageBaseModifier: 1 # WD EDIT heavyStaminaCost: 10 maxTargets: 2 angle: 180 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index c81768da4d..b0784907db 100644 --- 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 index f739de251c..31ab59d2c7 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -40,8 +40,8 @@ Blunt: 8 bluntStaminaDamageFactor: 2.5 heavyRateModifier: 0.8 - heavyDamageBaseModifier: 1.5 - heavyStaminaCost: 15 + 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 index 36d2f1308f..25062f4a32 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -52,8 +52,8 @@ Slash: 2 bluntStaminaDamageFactor: 2.0 heavyRateModifier: 0.8 - heavyDamageBaseModifier: 1.5 - heavyStaminaCost: 10 + heavyDamageBaseModifier: 1 # WD EDIT + heavyStaminaCost: 20 # WD EDIT maxTargets: 1 angle: 20 soundHit: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index a6926f1d8c..395958bd01 100644 --- 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 index 8780d377e0..b8e0e4eca6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -16,8 +16,8 @@ Structural: 5 bluntStaminaDamageFactor: 2.0 heavyRateModifier: 0.5 - heavyDamageBaseModifier: 1.75 - heavyStaminaCost: 15 + heavyDamageBaseModifier: 0.8 # WD EDIT + heavyStaminaCost: 15 # WD EDIT 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 index b2727b334c..eece504be4 100644 --- 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 index 5e9d789b65..593ba2b282 100644 --- 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 - heavyDamageBaseModifier: 1.2 heavyStaminaCost: 5 - type: Item size: Normal @@ -43,8 +42,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 index b30a285579..fa9bad55c7 100644 --- 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 - heavyDamageBaseModifier: 1.0 heavyStaminaCost: 10 angle: 100 soundHit: @@ -30,8 +29,8 @@ - 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 index 5cb5795c8a..2d37d3e385 100644 --- 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,8 @@ Blunt: 11 bluntStaminaDamageFactor: 2.0 heavyRateModifier: 0.5 - heavyDamageBaseModifier: 1.75 - heavyStaminaCost: 25 + heavyDamageBaseModifier: 0.8 # WD EDIT + heavyStaminaCost: 15 # WD EDIT 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 index 68f8863d11..2412079a1e 100644 --- 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 index a1addba262..bee206723b 100644 --- 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 index 6ba659ccb4..eb0635c2f0 100644 --- 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 index ecc84e5007..73437894c9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml @@ -17,8 +17,8 @@ Structural: 10 bluntStaminaDamageFactor: 2.0 heavyRateModifier: 0.75 - heavyDamageBaseModifier: 1.75 - heavyStaminaCost: 15 + 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 index 576d0b2a0c..a59d836600 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -42,8 +42,8 @@ Slash: 1 heavyRateModifier: 0.75 heavyRangeModifier: 1.25 - heavyDamageBaseModifier: 1.0 - heavyStaminaCost: 5 + heavyDamageBaseModifier: 1 + heavyStaminaCost: 20 # WD EDIT 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 index 82b99ce37e..e370e47f42 100644 --- 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 index 123de813cb..bbb7878b0f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml @@ -20,8 +20,8 @@ bluntStaminaDamageFactor: 2.5 heavyRateModifier: 0.5 heavyRangeModifier: 1.75 - heavyDamageBaseModifier: 1.2 - heavyStaminaCost: 0 + 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 index a952713dd5..2cb0d3dd0b 100644 --- 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,8 @@ collection: MetalThud bluntStaminaDamageFactor: 2 heavyRateModifier: 1 - heavyDamageBaseModifier: 1.2 - heavyStaminaCost: 10 + heavyDamageBaseModifier: 0.8 # WD EDIT + heavyStaminaCost: 15 # WD EDIT - type: Item size: Normal - type: Clothing From 41f672358ee0334a7a76d3b95d1d5cddc78be56a Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Sat, 31 Aug 2024 21:01:43 +0300 Subject: [PATCH 2/3] test From 871aaaf23513d6b333158035b1dc1a6c354bfcb8 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Sun, 1 Sep 2024 12:17:44 +0300 Subject: [PATCH 3/3] tweak --- Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs | 4 ++-- .../Prototypes/Entities/Objects/Misc/briefcases.yml | 2 -- .../Entities/Objects/Misc/fire_extinguisher.yml | 2 -- .../Entities/Objects/Specific/Hydroponics/tools.yml | 10 ---------- .../Entities/Objects/Specific/Janitorial/janitor.yml | 4 ---- .../Prototypes/Entities/Objects/Tools/gas_tanks.yml | 2 -- .../Prototypes/Entities/Objects/Tools/jaws_of_life.yml | 2 -- .../Entities/Objects/Weapons/Melee/baseball_bat.yml | 2 -- .../Prototypes/Entities/Objects/Weapons/Melee/cult.yml | 1 - .../Entities/Objects/Weapons/Melee/fireaxe.yml | 1 - .../Entities/Objects/Weapons/Melee/home_run_bat.yml | 2 -- .../Entities/Objects/Weapons/Melee/sledgehammer.yml | 2 -- .../Entities/Objects/Weapons/Melee/spear.yml | 2 -- .../Entities/Objects/Weapons/Melee/white_cane.yml | 2 -- .../Prototypes/Entities/Objects/Weapons/security.yml | 2 -- 15 files changed, 2 insertions(+), 38 deletions(-) diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 5fb03b3d45..db72393b56 100644 --- 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 /// [DataField, AutoNetworkedField] - public float HeavyDamageBaseModifier = 0.6f; // WD EDIT + public float HeavyDamageBaseModifier = 1f; // WD EDIT /// /// 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 index 48a6b790f2..0acae2efb9 100644 --- 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 index 7990823ee8..1eec04ece6 100644 --- 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 index 515633c61e..3690727ec4 100644 --- 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 index 58c301352a..1a86cdf32c 100644 --- 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 index 31ab59d2c7..abde29cb74 100644 --- 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 index 25062f4a32..bdbf1eb6c7 100644 --- 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 index b8e0e4eca6..ade0657ada 100644 --- 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 index 593ba2b282..19f1cac19c 100644 --- 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 index fa9bad55c7..086551dda7 100644 --- 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 index 2d37d3e385..4aa9f4529c 100644 --- 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 index 73437894c9..d12cb8f6a9 100644 --- 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 index a59d836600..776d165503 100644 --- 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 index bbb7878b0f..13b7cab67b 100644 --- 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 index 2cb0d3dd0b..a13dcd3f07 100644 --- 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