From 0d976a80b3b6bd8de40dd437873e0e0b7482b78f Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Wed, 20 Aug 2025 20:51:07 +0300 Subject: [PATCH] damageModifierSet (#1688) --- .../_CP14/Entities/Structures/Decorations/cobwebs.yml | 2 +- .../Entities/Structures/Decorations/flags_wallmount.yml | 2 +- .../_CP14/Entities/Structures/Decorations/statues.yml | 8 ++++---- .../_CP14/Entities/Structures/Decorations/tombstones.yml | 7 ++++++- .../_CP14/Entities/Structures/Furniture/barrel.yml | 2 +- .../_CP14/Entities/Structures/Furniture/barrel_crane.yml | 4 ++-- .../_CP14/Entities/Structures/Furniture/beds.yml | 8 +++++++- .../_CP14/Entities/Structures/Furniture/bench.yml | 3 +++ .../_CP14/Entities/Structures/Furniture/bonfire.yml | 2 +- .../_CP14/Entities/Structures/Furniture/bookshelf.yml | 2 +- .../_CP14/Entities/Structures/Furniture/cabinets.yml | 4 ++-- .../_CP14/Entities/Structures/Furniture/chairs.yml | 2 +- .../_CP14/Entities/Structures/Furniture/closets.yml | 2 +- .../_CP14/Entities/Structures/Furniture/curtains.yml | 2 +- .../_CP14/Entities/Structures/Furniture/furnace.yml | 2 +- .../_CP14/Entities/Structures/Furniture/lamppost.yml | 2 +- .../_CP14/Entities/Structures/Furniture/mannequin.yml | 2 +- .../_CP14/Entities/Structures/Furniture/pallets.yml | 2 +- .../_CP14/Entities/Structures/Furniture/safe.yml | 2 +- .../_CP14/Entities/Structures/Furniture/tables.yml | 4 ++-- .../_CP14/Entities/Structures/Furniture/torch.yml | 3 +-- .../Structures/Furniture/wallmount_order_border.yml | 3 +-- .../_CP14/Entities/Structures/Furniture/workbenchs.yml | 3 +-- .../_CP14/Entities/Structures/Storage/Crates/crates.yml | 5 ++--- 24 files changed, 44 insertions(+), 34 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml index d49f592a0f..bbd2610bb9 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml index bbe43f58db..15e8a6f064 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml index b31f540030..cce5ea0d7a 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/tombstones.yml index d7690d1874..cac24763e6 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml index 27da6effeb..af40d910cb 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml index 5c6273b355..a4e8b24146 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml index c75f905075..8480c0c0ac 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml index 5440378cd3..40c3934497 100644 --- 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 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml index 2d8fb46883..1fb23b7ab7 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml index 375505f2ea..14e2804593 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml index 19569c5d7f..494ae26ddf 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml index c58653ee81..8255a5fd77 100644 --- 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 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml index cd0f511871..8275fba32c 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml index bbaface861..2730486953 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/furnace.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/furnace.yml index 5fd02cb8ef..9fa34f32a9 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml index 0a8e9d9dfa..ce4ceddc85 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml index e5951deeb2..3d44f5521a 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml index 62208591dc..d4ee8cad75 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/safe.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/safe.yml index c6687d27af..5f58d71e60 100644 --- 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: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml index 9fee116023..a6c8f5d817 100644 --- 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 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml index 6ad26c1e5d..0d699d3919 100644 --- 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 - diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml index 1075a1f2c9..6caab0fd6a 100644 --- 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 - diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 43cdf833b0..3b21a1c62e 100644 --- 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 - diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index 3ee2f627e0..9c34d97e69 100644 --- 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 -