From 25d4a26c8e4a7008b71cef0bfefaf53e267e58fd Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Sat, 2 Sep 2023 15:54:05 +1000 Subject: [PATCH] More Petting Sounds and Popups (#19686) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../interaction-popup-component.ftl | 5 +++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 34 ++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index 9c6324f39e..67d727dc53 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -14,8 +14,10 @@ petting-success-dog = You pet {THE($target)} on {POSS-ADJ($target)} soft floofy petting-success-frog = You pet {THE($target)} on {POSS-ADJ($target)} slippery little head. petting-success-goat = You pet {THE($target)} on {POSS-ADJ($target)} horned floofy head. petting-success-goose = Against all odds, you manage to pet {THE($target)} on {POSS-ADJ($target)} horrible little head. +petting-success-kangaroo = You pet {THE($target)} on {POSS-ADJ($target)} Strayan head. petting-success-possum = You pet {THE($target)} on {POSS-ADJ($target)} horrible little head. petting-success-pig = You pet {THE($target)} on {POSS-ADJ($target)} hairy head. +petting-success-raccoon = You pet {THE($target)} on {POSS-ADJ($target)} trash eating little head. petting-success-reptile = You pet {THE($target)} on {POSS-ADJ($target)} scaly little head. petting-success-sloth = You pet {THE($target)} on {POSS-ADJ($target)} slow moving head. petting-success-space-cat = You pet {THE($target)} on {POSS-ADJ($target)} glass domed head. @@ -34,7 +36,10 @@ petting-failure-crab = You reach out to pet {THE($target)}, but {SUBJECT($target petting-failure-dehydrated-carp = You pet {THE($target)} on {POSS-ADJ($target)} dry little head. petting-failure-goat = You reach out to pet {THE($target)}, but {SUBJECT($target)} stubbornly refuses! petting-failure-goose = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too horrible! +petting-failure-goose = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too australian! petting-failure-possum = You reach out to pet {THE($target)}, but are met with hisses and snarls! +petting-success-pig = You reach out to pet {THE($target)}, but are met with irritated oinks and squeals! +petting-failure-raccoon = You reach out to pet {THE($target)}, but {THE($target)} is busy raccooning around. petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($target)} somehow dodge with ludicrous speed! petting-failure-holo = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} spikes almost impale your hand! petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you decide you'd rather not be toasty carp food. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index da914312c9..f401a75fae 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -381,6 +381,10 @@ components: - type: InteractionPopup successChance: 1.0 # Hey, c'mon, this is Morty we're talking about here. + interactSuccessString: petting-success-possum + interactFailureString: petting-failure-possum + interactSuccessSound: + path: /Audio/Animals/snake_hiss.ogg - type: Grammar attributes: proper: true @@ -398,6 +402,10 @@ components: - type: InteractionPopup successChance: 0.7 + interactSuccessString: petting-success-raccoon + interactFailureString: petting-failure-raccoon + interactSuccessSound: + path: /Audio/Animals/raccoon_chatter.ogg - type: Grammar attributes: proper: true @@ -413,6 +421,12 @@ id: MobAlexander description: Chef's finest colleague. components: + - type: InteractionPopup + successChance: 1 + interactSuccessString: petting-success-pig + interactFailureString: petting-failure-pig + interactSuccessSound: + path: /Audio/Animals/pig_oink.ogg - type: Grammar attributes: gender: male @@ -429,6 +443,10 @@ components: - type: InteractionPopup successChance: 1 + interactSuccessString: petting-success-soft-floofy + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg - type: Butcherable spawned: - id: FoodMeat @@ -465,6 +483,10 @@ - type: GhostTakeoverAvailable - type: InteractionPopup successChance: 1 + interactSuccessString: petting-success-hamster + interactFailureString: petting-failure-hamster + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg - type: Butcherable spawned: - id: FoodMeat @@ -485,6 +507,12 @@ id: MobSpiderShiva description: The first defender of the station. components: + - type: InteractionPopup + successChance: 0.5 # spider is mean + interactSuccessString: petting-success-tarantula + interactFailureString: petting-failure-hamster + interactSuccessSound: + path: /Audio/Animals/snake_hiss.ogg - type: NpcFactionMember factions: - PetsNT @@ -555,7 +583,11 @@ description: Willow the boxing kangaroo. components: - type: InteractionPopup - successChance: 1 + successChance: 0.8 + interactSuccessString: petting-success-kangaroo + interactFailureString: petting-failure-kangaroo + interactSuccessSound: + path: /Audio/Animals/kangaroo_grunt.ogg - type: Grammar attributes: proper: true