More robust bullet impact sounds (#8325)

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -6,6 +6,15 @@
   description: A miserable pile of secrets.
   noSpawn: true
   components:
+  - type: RangedDamageSound
+    soundGroups:
+      Brute:
+        collection:
+          MeatBulletImpact
+    soundTypes:
+      Heat:
+        collection:
+          MeatLaserImpact
   - type: Tag
     tags:
     - CanPilot

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -5,148 +5,148 @@
   description: A miserable pile of slime.
   abstract: true
   components:
-    - type: Icon
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: full
-    - type: Sprite
-      netsync: false
-      drawdepth: Mobs
-      layers:
-        - map: [ "enum.HumanoidVisualLayers.Chest" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: torso_m
-        - map: [ "enum.HumanoidVisualLayers.Head" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: head_m
-        - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-          color: "#008800"
-          sprite: Mobs/Customization/eyes.rsi
-          state: eyes
-        - map: [ "enum.HumanoidVisualLayers.RArm" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: r_arm
-        - map: [ "enum.HumanoidVisualLayers.LArm" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: l_arm
-        - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: r_leg
-        - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: l_leg
-        - shader: StencilClear
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: l_leg
-        - shader: StencilMask
-          map: [ "enum.HumanoidVisualLayers.StencilMask" ]
-          sprite: Mobs/Customization/masking_helpers.rsi
-          state: female_full
-          visible: false
-        - map: [ "jumpsuit" ]
-          shader: StencilDraw
-        - map: [ "enum.HumanoidVisualLayers.LHand" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: l_hand
-        - map: [ "enum.HumanoidVisualLayers.RHand" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: r_hand
-        - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: l_foot
-        - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-          color: "#b8b8b8"
-          sprite: Mobs/Species/Slime/parts.rsi
-          state: r_foot
-        - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-          color: "#ffffff"
-          sprite: Objects/Misc/handcuffs.rsi
-          state: body-overlay-2
-          visible: false
-        - map: [ "id" ]
-        - map: [ "gloves" ]
-        - map: [ "shoes" ]
-        - map: [ "ears" ]
-        - map: [ "outerClothing" ]
-        - map: [ "eyes" ]
-        - map: [ "belt" ]
-        - map: [ "neck" ]
-        - map: [ "back" ]
-        - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-          state: shaved
-          sprite: Mobs/Customization/human_facial_hair.rsi
-        - map: [ "enum.HumanoidVisualLayers.Hair" ]
-          state: bald
-          sprite: Mobs/Customization/human_hair.rsi
-        - map: [ "mask" ]
-        - map: [ "head" ]
-        - map: [ "pocket1" ]
-        - map: [ "pocket2" ]
-    - type: Markings
-      layerPoints:
-       Legs:
-        points: 2
-        required: false
-       Arms:
-        points: 4
-        required: false
-    - type: Body
-      template: HumanoidTemplate
-      preset: SlimePreset
-    - type: HumanoidAppearance
-      hairMatchesSkin: true
-      hairAlpha: 0.5
-    - type: Damageable
-      damageContainer: Biological
-      damageModifierSet: Slime
-    - type: Bloodstream
-      bloodReagent: Slime # TODO Color slime blood based on their slime color or smth
-      bloodlossDamage:
-        types:
-          Bloodloss:
-            1
-      bloodlossHealDamage:
-        types:
-          Bloodloss:
-            -0.25
-    - type: Barotrauma
-      damage:
-        types:
-          Blunt: 1.4 #per second, scales with pressure and other constants. Twice as much as humans.
-    - type: Reactive
-      groups:
-        Flammable: [ Touch ]
-        Extinguish: [ Touch ]
-      reactions:
-      - reagents: [ Water, SpaceCleaner ]
-        methods: [ Touch ]
-        effects:
-        - !type:WashCreamPieReaction
-      - reagents: [ Water ]
-        methods: [ Touch ]
-        effects:
-        - !type:HealthChange
-          scaled: true
-          damage:
-            types:
-              Heat: 2
-        - !type:PopupMessage
-          type: Local
-          messages: [ "slime-hurt-by-water-popup" ]
-          probability: 0.25
-    - type: Butcherable
-      butcheringType: Spike
-      spawned:
-      - id: FoodMeatSlime
-        amount: 5
+  - type: Icon
+    sprite: Mobs/Species/Slime/parts.rsi
+    state: full
+  - type: Sprite
+    netsync: false
+    drawdepth: Mobs
+    layers:
+      - map: [ "enum.HumanoidVisualLayers.Chest" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: torso_m
+      - map: [ "enum.HumanoidVisualLayers.Head" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: head_m
+      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+        color: "#008800"
+        sprite: Mobs/Customization/eyes.rsi
+        state: eyes
+      - map: [ "enum.HumanoidVisualLayers.RArm" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: r_arm
+      - map: [ "enum.HumanoidVisualLayers.LArm" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: l_arm
+      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: r_leg
+      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: l_leg
+      - shader: StencilClear
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: l_leg
+      - shader: StencilMask
+        map: [ "enum.HumanoidVisualLayers.StencilMask" ]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: female_full
+        visible: false
+      - map: [ "jumpsuit" ]
+        shader: StencilDraw
+      - map: [ "enum.HumanoidVisualLayers.LHand" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: l_hand
+      - map: [ "enum.HumanoidVisualLayers.RHand" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: r_hand
+      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: l_foot
+      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+        color: "#b8b8b8"
+        sprite: Mobs/Species/Slime/parts.rsi
+        state: r_foot
+      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: [ "id" ]
+      - map: [ "gloves" ]
+      - map: [ "shoes" ]
+      - map: [ "ears" ]
+      - map: [ "outerClothing" ]
+      - map: [ "eyes" ]
+      - map: [ "belt" ]
+      - map: [ "neck" ]
+      - map: [ "back" ]
+      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+        state: shaved
+        sprite: Mobs/Customization/human_facial_hair.rsi
+      - map: [ "enum.HumanoidVisualLayers.Hair" ]
+        state: bald
+        sprite: Mobs/Customization/human_hair.rsi
+      - map: [ "mask" ]
+      - map: [ "head" ]
+      - map: [ "pocket1" ]
+      - map: [ "pocket2" ]
+  - type: Markings
+    layerPoints:
+     Legs:
+      points: 2
+      required: false
+     Arms:
+      points: 4
+      required: false
+  - type: Body
+    template: HumanoidTemplate
+    preset: SlimePreset
+  - type: HumanoidAppearance
+    hairMatchesSkin: true
+    hairAlpha: 0.5
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Slime
+  - type: Bloodstream
+    bloodReagent: Slime # TODO Color slime blood based on their slime color or smth
+    bloodlossDamage:
+      types:
+        Bloodloss:
+          1
+    bloodlossHealDamage:
+      types:
+        Bloodloss:
+          -0.25
+  - type: Barotrauma
+    damage:
+      types:
+        Blunt: 1.4 #per second, scales with pressure and other constants. Twice as much as humans.
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+    reactions:
+    - reagents: [ Water, SpaceCleaner ]
+      methods: [ Touch ]
+      effects:
+      - !type:WashCreamPieReaction
+    - reagents: [ Water ]
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        scaled: true
+        damage:
+          types:
+            Heat: 2
+      - !type:PopupMessage
+        type: Local
+        messages: [ "slime-hurt-by-water-popup" ]
+        probability: 0.25
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatSlime
+      amount: 5
 
 - type: entity
   save: false

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -147,6 +147,7 @@
         Heat: 5
     soundHit:
       path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
+    soundForce: true
   - type: StunOnCollide
     stunAmount: 5
     knockdownAmount: 5

Resources/Prototypes/Entities/Structures/Walls/base_structurewalls.yml

@@ -9,6 +9,15 @@
     snap:
     - Wall
   components:
+  - type: RangedDamageSound
+    soundGroups:
+      Brute:
+        collection:
+          MetalBulletImpact
+    soundTypes:
+      Heat:
+        collection:
+          MetalLaserImpact
   - type: Tag
     tags:
     - Wall

Resources/Prototypes/SoundCollections/impacts.yml

@@ -0,0 +1,29 @@
+- type: soundCollection
+  id: MeatBulletImpact
+  files:
+  - "/Audio/Weapons/Guns/Hits/bullet_meat1.ogg"
+  - "/Audio/Weapons/Guns/Hits/bullet_meat2.ogg"
+  - "/Audio/Weapons/Guns/Hits/bullet_meat3.ogg"
+  - "/Audio/Weapons/Guns/Hits/bullet_meat4.ogg"
+
+- type: soundCollection
+  id: MeatLaserImpact
+  files:
+  - "/Audio/Weapons/Guns/Hits/energy_meat1.ogg"
+  - "/Audio/Weapons/Guns/Hits/energy_meat2.ogg"
+
+- type: soundCollection
+  id: MetalBulletImpact
+  files:
+  - "/Audio/Weapons/Guns/Hits/ric1.ogg"
+  - "/Audio/Weapons/Guns/Hits/ric2.ogg"
+  - "/Audio/Weapons/Guns/Hits/ric3.ogg"
+  - "/Audio/Weapons/Guns/Hits/ric4.ogg"
+  - "/Audio/Weapons/Guns/Hits/ric5.ogg"
+
+- type: soundCollection
+  id: MetalLaserImpact
+  files:
+  - "/Audio/Weapons/Guns/Hits/energy_metal1.ogg"
+  - "/Audio/Weapons/Guns/Hits/energy_metal2.ogg"
+