From 7238698aa3b7fea24c5d4d48120e7a64444dd625 Mon Sep 17 00:00:00 2001 From: paige404 <59348003+paige404@users.noreply.github.com> Date: Fri, 20 Jun 2025 05:51:11 -0400 Subject: [PATCH] Lanterns Can Break (#1450) * Lanterns now break in two swings. I don't wanna see anyone saying that lanterns are a great one handed weapon again. * Lanterns can survive one fireball, as a treat. --- .../Entities/Objects/Tools/flashlight.yml | 26 +++++++++++++++++++ .../Structures/Furniture/wallmount_lamp.yml | 11 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml index 3ad29c1742..2e8945dcfe 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml @@ -19,6 +19,32 @@ breakOnMove: false slots: - belt + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14Metallic + - type: CP14MeleeSelfDamage + damageToSelf: + types: + Structural: 10 #little jank, but Metallic is resistant to Blunt. Breaks in 3 strikes, or 2 fireballs. + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14ScrapCopper: + min: 1 + max: 2 + CP14ScrapIron: + min: 0 + max: 1 - type: MeleeWeapon attackRate: 0.6 wideAnimationRotation: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml index ab563e1994..d9e70c1a03 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml @@ -36,7 +36,8 @@ True: { visible: true } False: { visible: false } - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic + damageModifierSet: CP14Metallic - type: Destructible thresholds: - trigger: @@ -45,6 +46,14 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14ScrapCopper: + min: 1 + max: 3 - type: CP14MagicLantern - type: CP14MagicEnergyDraw energy: -0.1