From 023bad8d69409c1acf45ea946a1a581d4c347abf Mon Sep 17 00:00:00 2001 From: marboww <152051971+marboww@users.noreply.github.com> Date: Tue, 20 Feb 2024 05:35:35 +0700 Subject: [PATCH] Moths can eat plushies (#25382) * Update toys.yml * fix * New sound of eating * Increased eating time * New sounds+sorting --- .../Prototypes/Entities/Objects/Fun/toys.yml | 201 ++++++++++++------ 1 file changed, 141 insertions(+), 60 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index f80079b18c..3e1c056419 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -10,6 +10,7 @@ - type: Tag tags: - Payload + - ClothMade - type: EmitSoundOnUse sound: collection: ToySqueak @@ -38,7 +39,19 @@ Cloth: 100 - type: StaticPrice price: 5 - + - type: Food + requiresSpecialDigestion: true + useSound: + collection: ToySqueak + delay: 2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Fiber + Quantity: 10 + - type: entity parent: BasePlushie id: PlushieGhost @@ -114,8 +127,15 @@ solutions: bee: reagents: - - ReagentId: GroundBee - Quantity: 10 + - ReagentId: GroundBee + Quantity: 10 + food: + maxVol: 10 + reagents: + - ReagentId: GroundBee + Quantity: 5 + - ReagentId: Fiber + Quantity: 5 - type: Clothing quickEquip: false sprite: Objects/Fun/toys.rsi @@ -143,6 +163,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Items/Toys/mousesqueek.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: @@ -212,6 +236,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: @@ -237,6 +265,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Items/Toys/weh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/weh.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: @@ -271,6 +303,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Items/Toys/muffled_weh.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/muffled_weh.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: @@ -304,10 +340,20 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/toy_rustle.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/toy_rustle.ogg - type: SolutionContainerManager solutions: plushie: maxVol: 1 + food: + maxVol: 10 + reagents: + - ReagentId: Fiber + Quantity: 10 + - type: RefillableSolution solution: plushie - type: SolutionContainerVisuals @@ -433,6 +479,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Effects/bite.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Effects/bite.ogg - type: MeleeWeapon wideAnimationRotation: -90 soundHit: @@ -463,6 +513,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Items/Toys/rattle.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/rattle.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: @@ -482,6 +536,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Items/Toys/mousesqueek.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg - type: MeleeWeapon wideAnimationRotation: -90 soundHit: @@ -515,6 +573,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Items/Toys/quack.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg - type: entity parent: BasePlushie @@ -533,6 +595,10 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Voice/Vox/shriek1.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Vox/shriek1.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: @@ -569,10 +635,78 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/mousesqueek.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: path: /Audio/Weapons/Xeno/alien_spitacid.ogg +- type: entity + parent: BasePlushie + id: PlushiePenguin + name: penguin plushie + description: I use arch btw! + components: + - type: Sprite + state: plushie_penguin + +- type: entity + parent: BasePlushie + id: PlushieHuman + name: human plushie + description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming. + components: + - type: Sprite + state: plushie_human + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Human/malescream_1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Human/malescream_2.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Human/malescream_3.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Human/malescream_1.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Human/malescream_4.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Human/malescream_5.ogg + +- type: entity + parent: BasePlushie + id: PlushieMoth + name: moth plushie + description: Cute and fluffy moth plushie. Enjoy, bz! + components: + - type: Sprite + state: plushie_moth + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Moth/moth_chitter.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Moth/moth_chitter.ogg ## Cheapo Figurines @@ -654,6 +788,10 @@ - type: MeleeWeapon soundHit: path: /Audio/Items/Toys/ian.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/ian.ogg ## Toyweapons @@ -1237,63 +1375,6 @@ - type: TrashOnSolutionEmpty solution: drink -- type: entity - parent: BasePlushie - id: PlushieMoth - name: moth plushie - description: Cute and fluffy moth plushie. Enjoy, bz! - components: - - type: Sprite - state: plushie_moth - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Moth/moth_chitter.ogg - -- type: entity - parent: BasePlushie - id: PlushiePenguin - name: penguin plushie - description: I use arch btw! - components: - - type: Sprite - state: plushie_penguin - -- type: entity - parent: BasePlushie - id: PlushieHuman - name: human plushie - description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming. - components: - - type: Sprite - state: plushie_human - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Human/malescream_1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Human/malescream_2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Human/malescream_3.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Human/malescream_4.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Human/malescream_5.ogg - - type: entity parent: BaseItem id: NewtonCradle