From a166cfaa8728c8333b35c292d8de2ed11440b481 Mon Sep 17 00:00:00 2001 From: Leonardo Date: Fri, 19 Jul 2024 11:21:27 +1000 Subject: [PATCH 1/2] 1984 hugs replaces the hugging action with the looking action --- .../en-US/interaction/interaction-popup-component.ftl | 8 ++++---- .../Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml | 4 ++-- .../Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/Species/base.yml | 4 ++-- .../Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml | 4 ++-- .../Nyanotrasen/Entities/Mobs/Player/felinid.yml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl index bb56233ff14..b63ac594ef1 100644 --- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl @@ -77,11 +77,11 @@ comp-window-knock = *knock knock* fence-rattle-success = *rattle* -## Hugging players +## Looking at players -hugging-success-generic = You hug {THE($target)}. -hugging-success-generic-others = { CAPITALIZE(THE($user)) } hugs {THE($target)}. -hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you. +looking-success-generic = You look at {THE($target)}. +looking-success-generic-others = { CAPITALIZE(THE($user)) } looks at {THE($target)}. +looking-success-generic-target = { CAPITALIZE(THE($user)) } looks at you. ## Other diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml index 1f4eb696c65..65eeab5b3a6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml @@ -7,9 +7,9 @@ - type: CombatMode - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: looking-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index 06abe8c45fa..a03be47bfba 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -7,9 +7,9 @@ - type: CombatMode - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: looking-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index bf41f2dda6e..0ce0e714784 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -5,9 +5,9 @@ components: - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: looking-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: looking-success-generic-others - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 1b9e9674f44..8647751ae52 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -182,9 +182,9 @@ showExamineInfo: true - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: looking-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: looking-success-generic-others - type: CanHostGuardian - type: NpcFactionMember factions: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml index 562b9c564ec..fcf3735e439 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml @@ -7,9 +7,9 @@ - type: CombatMode - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: looking-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true - type: Input diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml index db7936cc5b4..fefbf059df8 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml @@ -7,9 +7,9 @@ - type: CombatMode - type: InteractionPopup successChance: 1 - interactSuccessString: hugging-success-generic + interactSuccessString: looking-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others + messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true - type: Input From 664bc053edb77e8986f1847011f5babc16b65828 Mon Sep 17 00:00:00 2001 From: Leonardo Date: Fri, 19 Jul 2024 11:28:38 +1000 Subject: [PATCH 2/2] remove hugging sound effect hehe i forgor --- Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml | 1 - Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml | 1 - Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 1 - Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 - Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml | 1 - .../Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml | 1 - 6 files changed, 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml index 65eeab5b3a6..32f26021baa 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml @@ -8,7 +8,6 @@ - type: InteractionPopup successChance: 1 interactSuccessString: looking-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index a03be47bfba..e2a068c26cd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -8,7 +8,6 @@ - type: InteractionPopup successChance: 1 interactSuccessString: looking-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index 0ce0e714784..42bbf8304e3 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -6,7 +6,6 @@ - type: InteractionPopup successChance: 1 interactSuccessString: looking-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: looking-success-generic-others - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 8647751ae52..174f7370ad5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -183,7 +183,6 @@ - type: InteractionPopup successChance: 1 interactSuccessString: looking-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: looking-success-generic-others - type: CanHostGuardian - type: NpcFactionMember diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml index fcf3735e439..ccc0eb26006 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml @@ -8,7 +8,6 @@ - type: InteractionPopup successChance: 1 interactSuccessString: looking-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml index fefbf059df8..1de4f357b53 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml @@ -8,7 +8,6 @@ - type: InteractionPopup successChance: 1 interactSuccessString: looking-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: looking-success-generic-others - type: MindContainer showExamineInfo: true