damageModifierSet (#1688)

2025-08-20 20:51:07 +03:00
parent 046847b6e5
commit 0d976a80b3
24 changed files with 44 additions and 34 deletions
--- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml
@@ -18,7 +18,7 @@
    anchored: true
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml
@@ -12,7 +12,7 @@
    sprite: _CP14/Structures/Decoration/flags_wallmount.rsi
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml
@@ -32,7 +32,7 @@
        - MachineLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Rock
+    damageModifierSet: CP14Rock
  - type: Destructible
    thresholds:
    - trigger:
@@ -143,7 +143,7 @@
        - MachineLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Rock
+    damageModifierSet: CP14Rock
  - type: Destructible
    thresholds:
    - trigger:
@@ -210,7 +210,7 @@
        - MachineLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Rock
+    damageModifierSet: CP14Rock
  - type: Destructible
    thresholds:
    - trigger:
@@ -268,7 +268,7 @@
  - type: SpriteFade
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Rock
+    damageModifierSet: CP14Rock
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml
@@ -33,7 +33,7 @@
        - Opaque
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageModifierSet: CP14Rock
  - type: Destructible
    thresholds:
    - trigger:
@@ -42,6 +42,11 @@
      behaviors:
        - !type:DoActsBehavior
          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            path: /Audio/Effects/break_stone.ogg
+            params:
+              volume: -4
        - !type:SpawnEntitiesBehavior
          spawn:
            CP14StoneBlock1:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
@@ -70,7 +70,7 @@
        - WallLayer
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml
@@ -13,7 +13,7 @@
      - state: barrel
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Physics
    bodyType: Static
  - type: Transform
@@ -231,7 +231,7 @@
        - TabletopMachineLayer
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml
@@ -34,7 +34,7 @@
    placeCentered: true
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -43,6 +43,9 @@
      behaviors:
      - !type:DoActsBehavior
        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
      - !type:SpawnEntitiesBehavior
        spawn:
          CP14WoodenPlanks1:
@@ -73,6 +76,9 @@
      behaviors:
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
      - !type:SpawnEntitiesBehavior
        spawn:
          CP14BirchWoodenPlanks1:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml
@@ -9,6 +9,9 @@
  components:
  - type: Transform
    anchored: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: CP14Wood
  - type: Rotatable
  - type: Sprite
    sprite: _CP14/Structures/Furniture/bench.rsi
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml
@@ -18,7 +18,7 @@
    node: CP14Bonfire
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml
@@ -56,7 +56,7 @@
        - MachineLayer
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
@@ -60,7 +60,7 @@
    state: icons
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -89,7 +89,7 @@
    state: icons
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
+    damageModifierSet: CP14Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml
@@ -9,7 +9,7 @@
  components:
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Sprite
    sprite: _CP14/Structures/Furniture/chairs.rsi
    state: wooden
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
@@ -66,7 +66,7 @@
    state: icons
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml
@@ -42,7 +42,7 @@
  - type: Appearance
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/furnace.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/furnace.yml
@@ -79,7 +79,7 @@
        map: ["fuel"]
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
+    damageModifierSet: CP14Metallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml
@@ -24,7 +24,7 @@
        - WallLayer
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: MeleeSound
    soundGroups:
      Brute:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml
@@ -47,7 +47,7 @@
    node: CP14mannequin
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml
@@ -31,7 +31,7 @@
      collection: FootstepWood
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/safe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/safe.yml
@@ -11,7 +11,7 @@
    state: base
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: CP14MetallicStructural
  - type: Fixtures
    fixtures:
      fix1:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
@@ -43,7 +43,7 @@
  components:
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -262,7 +262,7 @@
  components:
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
+    damageModifierSet: CP14Rock
  - type: Sprite
    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
  - type: Icon
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml
@@ -7,7 +7,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
      - trigger:
@@ -182,4 +182,3 @@
    range: 5
    sound:
      path: /Audio/Ambience/Objects/fireplace.ogg
-
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml
@@ -21,8 +21,8 @@
  - type: InteractionOutline
  - type: Clickable
  - type: Damageable
-    damageModifierSet: Wood
    damageContainer: StructuralInorganic
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -56,4 +56,3 @@
  - type: Construction
    graph: CP14WallmountOrdersBorder
    node: CP14WallmountOrdersBorder
-
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml
@@ -27,7 +27,7 @@
        type: CP14WorkbenchBoundUserInterface
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -171,4 +171,3 @@
      collection: CP14Sawing # TODO CP14Leather?
    recipeTags:
    - CP14RecipeLeatherWorking
-
--- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
@@ -78,7 +78,7 @@
    sprite: _CP14/Structures/Storage/Crates/large_wooden_crate.rsi
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -111,7 +111,7 @@
    sprite: _CP14/Structures/Storage/Crates/small_wooden_crate.rsi
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood
+    damageModifierSet: CP14Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -131,4 +131,3 @@
  - type: Construction
    graph: CP14SmallWoodenCrate
    node: CP14SmallWoodenCrate
-