From 205edfe6d74c14b288fae27db7530e3bed4f5511 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:25:38 -0400 Subject: [PATCH] Fix blunt melee weapon hitsound (#26286) * ok * Update welders.yml --- Resources/Prototypes/Entities/Mobs/base.yml | 2 ++ .../Entities/Objects/Specific/Hydroponics/tools.yml | 2 ++ .../Prototypes/Entities/Objects/Specific/Mech/mechs.yml | 2 ++ .../Prototypes/Entities/Objects/Tools/flashlights.yml | 2 ++ .../Prototypes/Entities/Objects/Tools/jaws_of_life.yml | 2 ++ Resources/Prototypes/Entities/Objects/Tools/tools.yml | 8 ++++++++ Resources/Prototypes/Entities/Objects/Tools/welders.yml | 4 ++++ .../Entities/Objects/Weapons/Melee/baseball_bat.yml | 2 ++ .../Prototypes/Entities/Objects/Weapons/Melee/cult.yml | 2 ++ .../Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml | 2 ++ .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml | 2 ++ .../Entities/Objects/Weapons/Melee/sledgehammer.yml | 2 ++ .../Prototypes/Entities/Objects/Weapons/security.yml | 2 ++ .../Prototypes/Entities/Structures/Furniture/chairs.yml | 2 ++ 14 files changed, 36 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index d4e9a561c5..ac9aabbead 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -102,6 +102,8 @@ - type: CombatMode - type: MeleeWeapon hidden: true + soundHit: + collection: MetalThud damage: groups: Brute: 5 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index 00224fd318..727c75c879 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -106,6 +106,8 @@ types: Blunt: 8 Piercing: 2 # I guess you can stab it into them? + soundHit: + collection: MetalThud - type: Item sprite: Objects/Tools/Hydroponics/spade.rsi - type: Shovel diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 0e132541e1..5a2587ff71 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -48,6 +48,8 @@ types: Blunt: 25 #thwack Structural: 20 + soundHit: + collection: MetalThud - type: Puller needsHands: false - type: InputMover diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 39809b31b6..d22e919092 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -111,6 +111,8 @@ damage: types: Blunt: 10 + soundHit: + collection: MetalThud - type: Item sprite: Objects/Tools/seclite.rsi - type: PointLight diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index bb8545d91f..8e2b759797 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -47,6 +47,8 @@ damage: types: Blunt: 10 + soundHit: + collection: MetalThud - type: entity name: syndicate jaws of life diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index c56c322b74..b46eded7d8 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -114,6 +114,8 @@ damage: types: Blunt: 4.5 + soundHit: + collection: MetalThud - type: Tool qualities: - Anchoring @@ -151,6 +153,8 @@ damage: types: Blunt: 8 + soundHit: + collection: MetalThud - type: Tool qualities: - Prying @@ -492,6 +496,8 @@ damage: types: Blunt: 14 + soundHit: + collection: MetalThud - type: Item size: Normal sprite: Objects/Tools/shovel.rsi @@ -525,6 +531,8 @@ damage: types: Blunt: 7 + soundHit: + collection: MetalThud - type: Tool qualities: - Rolling diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 42b16ba053..9bf3f2e2cb 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -47,6 +47,8 @@ params: variation: 0.250 volume: -12 + deactivatedSoundOnHitNoDamage: + collection: MetalThud activatedDamage: types: Heat: 8 @@ -70,6 +72,8 @@ damage: types: Blunt: 5 #i mean... i GUESS you could use it like that + soundHit: + collection: MetalThud - type: RefillableSolution solution: Welder - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index b7fae7aced..8ba643a115 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -13,6 +13,8 @@ types: Blunt: 10 Structural: 5 + soundHit: + collection: MetalThud - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index db24d3e2cd..ecb6479de7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -67,6 +67,8 @@ Blunt: 10 Slash: 10 Structural: 5 + soundHit: + collection: MetalThud - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index b46ee09633..93765ec40c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -21,6 +21,8 @@ Blunt: 5 Slash: 10 Structural: 10 + soundHit: + collection: MetalThud - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index eee65a1ca7..ccf45bf59a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -49,6 +49,8 @@ types: Blunt: 10 Slash: 5 + soundHit: + collection: MetalThud - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml index e566f90968..0c75015d9a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml @@ -13,6 +13,8 @@ types: Blunt: 10 Structural: 10 + soundHit: + collection: MetalThud - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 082a8a956c..6df6ae7b4b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -97,6 +97,8 @@ damage: types: Blunt: 20 + soundHit: + collection: MetalThud bluntStaminaDamageFactor: 1.5 - type: Item size: Normal diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 59782c9585..0b3c291af2 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -343,6 +343,8 @@ damage: types: Blunt: 8 + soundHit: + collection: MetalThud - type: Construction graph: Seat node: chairFolding