From c395add21c6efe40c9c32381be7d427aa3f9b236 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 11:44:41 -0400 Subject: [PATCH 1/9] Everybody needs a kiss added kiss added lick --- .../floofstation/interaction/verbs/noop.ftl | 11 +++++++ .../Floof/Interactions/noop_interactions.yml | 29 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl create mode 100644 Resources/Prototypes/Floof/Interactions/noop_interactions.yml diff --git a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl new file mode 100644 index 00000000000..a206d9c95dc --- /dev/null +++ b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl @@ -0,0 +1,11 @@ +interaction-Kiss-name = Kiss +interaction-Kiss-description = A kiss melts the pains away. +interaction-Kiss-success-self-popup = You kiss {THE($target)}. +interaction-Kiss-success-target-popup = {THE($user)} Kisss you. +interaction-Kiss-success-others-popup = {THE($user)} Kisss {THE($target)}. + +interaction-Lick-name = Lick +interaction-Lick-description = Lick your co-worker, what HR?. +interaction-Lick-success-self-popup = You lick {THE($target)}. +interaction-Lick-success-target-popup = {THE($user)} Licks you. +interaction-Lick-success-others-popup = {THE($user)} Licks {THE($target)}. diff --git a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml new file mode 100644 index 00000000000..f1016a08f9d --- /dev/null +++ b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml @@ -0,0 +1,29 @@ +- type: Interaction + id: Kiss + parent: [BaseGlobal, BaseHands] + priority: 2 + #icon: /Textures/Interface/Actions/hug.png + delay: 0.7 + range: {max: 1} + hideByRequirement: true + requirement: + !type:MobStateRequirement + inverted: true + action: + # TODO: this should pull the target closer or sumth, but I need to code that action first + !type:NoOpAction + +- type: Interaction + id: Lick + parent: [BaseGlobal, BaseHands] + priority: 1 + #icon: /Textures/Interface/Actions/hug.png + delay: 0.4 + range: {max: 1} + hideByRequirement: true + requirement: + !type:MobStateRequirement + inverted: true + action: + !type:NoOpAction + From b202a818b71e9bb10a576348a84d37e80f4227f7 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 15:15:38 -0400 Subject: [PATCH 2/9] Update Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- .../Locale/en-US/floofstation/interaction/verbs/noop.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl index a206d9c95dc..82cfe07f579 100644 --- a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl +++ b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl @@ -1,11 +1,11 @@ interaction-Kiss-name = Kiss interaction-Kiss-description = A kiss melts the pains away. interaction-Kiss-success-self-popup = You kiss {THE($target)}. -interaction-Kiss-success-target-popup = {THE($user)} Kisss you. -interaction-Kiss-success-others-popup = {THE($user)} Kisss {THE($target)}. +interaction-Kiss-success-target-popup = {THE($user)} kisses you. +interaction-Kiss-success-others-popup = {THE($user)} kisses {THE($target)}. interaction-Lick-name = Lick interaction-Lick-description = Lick your co-worker, what HR?. interaction-Lick-success-self-popup = You lick {THE($target)}. -interaction-Lick-success-target-popup = {THE($user)} Licks you. -interaction-Lick-success-others-popup = {THE($user)} Licks {THE($target)}. +interaction-Lick-success-target-popup = {THE($user)} licks you. +interaction-Lick-success-others-popup = {THE($user)} licks {THE($target)}. From 6bbdf76b7af1d98695d9aa4b14aad1f90a44d70c Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 15:15:54 -0400 Subject: [PATCH 3/9] Update Resources/Prototypes/Floof/Interactions/noop_interactions.yml Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Prototypes/Floof/Interactions/noop_interactions.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml index f1016a08f9d..e6b2f20ee7e 100644 --- a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml @@ -1,8 +1,7 @@ - type: Interaction id: Kiss parent: [BaseGlobal, BaseHands] - priority: 2 - #icon: /Textures/Interface/Actions/hug.png + priority: 0 delay: 0.7 range: {max: 1} hideByRequirement: true From 0358154a3d8557516d51309269b7d75690162934 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Fri, 13 Sep 2024 21:33:16 -0400 Subject: [PATCH 4/9] Updated to add mood modifiers and moved to appropriate files --- Resources/Locale/en-US/Floof/mood/mood.ftl | 3 +++ ...{noop_interactions.yml => mood_interactions.yml} | 13 ++++++++----- .../Floof/Mood/genericPositiveEffects.yml | 12 ++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 Resources/Locale/en-US/Floof/mood/mood.ftl rename Resources/Prototypes/Floof/Interactions/{noop_interactions.yml => mood_interactions.yml} (73%) create mode 100644 Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml diff --git a/Resources/Locale/en-US/Floof/mood/mood.ftl b/Resources/Locale/en-US/Floof/mood/mood.ftl new file mode 100644 index 00000000000..203f3911a39 --- /dev/null +++ b/Resources/Locale/en-US/Floof/mood/mood.ftl @@ -0,0 +1,3 @@ +mood-effect-BeingKissed = That kiss was delightful. + +mood-effect-BeingLicked = I've been Licked! diff --git a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml similarity index 73% rename from Resources/Prototypes/Floof/Interactions/noop_interactions.yml rename to Resources/Prototypes/Floof/Interactions/mood_interactions.yml index e6b2f20ee7e..4c2102e443a 100644 --- a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -2,7 +2,7 @@ id: Kiss parent: [BaseGlobal, BaseHands] priority: 0 - delay: 0.7 + delay: 0.4 range: {max: 1} hideByRequirement: true requirement: @@ -10,19 +10,22 @@ inverted: true action: # TODO: this should pull the target closer or sumth, but I need to code that action first - !type:NoOpAction + !type:MoodAction + effect: BeingHugged - type: Interaction id: Lick parent: [BaseGlobal, BaseHands] - priority: 1 + priority: 0 #icon: /Textures/Interface/Actions/hug.png - delay: 0.4 + delay: 0.7 range: {max: 1} hideByRequirement: true requirement: !type:MobStateRequirement inverted: true action: - !type:NoOpAction + # TODO: this should pull the target closer or sumth, but I need to code that action first + !type:MoodAction + effect: BeingHugged diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml new file mode 100644 index 00000000000..4ce5bb3e1f1 --- /dev/null +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -0,0 +1,12 @@ +- type: moodEffect + id: BeingKissed + moodChange: 4 + timeout: 120 + category: PositiveInteraction + + - type: moodEffect + id: BeingLicked + moodChange: 4 + timeout: 120 + category: PositiveInteraction + \ No newline at end of file From 1a3c42280e3ed33d9d920784c1dc62505a4aa7ad Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 14 Sep 2024 00:52:06 -0400 Subject: [PATCH 5/9] fixing a yml white space issue --- Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml index 4ce5bb3e1f1..98fb16133a8 100644 --- a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -4,7 +4,7 @@ timeout: 120 category: PositiveInteraction - - type: moodEffect +- type: moodEffect id: BeingLicked moodChange: 4 timeout: 120 From 0123900512e65fb48f5351bace098e8aa321419c Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 14 Sep 2024 09:08:14 -0400 Subject: [PATCH 6/9] maybe this white space. --- Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml index 98fb16133a8..9646bf40f83 100644 --- a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -3,10 +3,9 @@ moodChange: 4 timeout: 120 category: PositiveInteraction - + - type: moodEffect id: BeingLicked moodChange: 4 timeout: 120 category: PositiveInteraction - \ No newline at end of file From fb9928a9ebb7afb3ff5eef8583f71cdb462897e2 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Mon, 16 Sep 2024 16:38:28 -0400 Subject: [PATCH 7/9] Update mood_interactions.yml --- Resources/Prototypes/Floof/Interactions/mood_interactions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml index 4c2102e443a..1f23901090e 100644 --- a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -11,7 +11,7 @@ action: # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction - effect: BeingHugged + effect: BeingKissed - type: Interaction id: Lick @@ -27,5 +27,5 @@ action: # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction - effect: BeingHugged + effect: BeingLicked From 2af2cb82501a78896434acb9d0bfc9a2c9746da9 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Thu, 19 Sep 2024 18:32:11 -0400 Subject: [PATCH 8/9] adding audio for kiss and lick --- Resources/Audio/Floof/Lewd/kiss.ogg | Bin 0 -> 7039 bytes Resources/Audio/Floof/Lewd/lick.ogg | Bin 0 -> 6808 bytes .../Prototypes/Floof/Interactions/base.yml | 29 ++++++++++++++++++ .../Floof/Interactions/mood_interactions.yml | 4 +-- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Resources/Audio/Floof/Lewd/kiss.ogg create mode 100644 Resources/Audio/Floof/Lewd/lick.ogg create mode 100644 Resources/Prototypes/Floof/Interactions/base.yml diff --git a/Resources/Audio/Floof/Lewd/kiss.ogg b/Resources/Audio/Floof/Lewd/kiss.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3a342a33570dac98953bef83b7e11a7a63ef5533 GIT binary patch literal 7039 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/Floof/Lewd/lick.ogg b/Resources/Audio/Floof/Lewd/lick.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8aee9bb0443e6c967ebb7c9cd829c4686e0e3f64 GIT binary patch literal 6808 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 Date: Sat, 28 Sep 2024 00:01:29 -0400 Subject: [PATCH 9/9] applying requested changes from PR --- .../Prototypes/Floof/Interactions/base.yml | 29 ------------------- .../Floof/Interactions/mood_interactions.yml | 15 ++++++---- 2 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 Resources/Prototypes/Floof/Interactions/base.yml diff --git a/Resources/Prototypes/Floof/Interactions/base.yml b/Resources/Prototypes/Floof/Interactions/base.yml deleted file mode 100644 index 0f890eac22f..00000000000 --- a/Resources/Prototypes/Floof/Interactions/base.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Base interaction that involves hands -- type: Interaction - id: BaseLips - abstract: true - requiresCanInteract: true - contactInteraction: true - range: - max: 1.2 - effectSuccess: - popup: Obvious - sound: {path: /Audio/Floof/Lewd/kiss.ogg} - effectFailure: - popup: Fail - sound: {path: /Audio/Floof/Lewd/kiss.ogg} - -# Base interaction that involves hands -- type: Interaction - id: BaseTongue - abstract: true - requiresCanInteract: true - contactInteraction: true - range: - max: 1.2 - effectSuccess: - popup: Obvious - sound: {path: /Audio/Floof/Lewd/lick.ogg} - effectFailure: - popup: Fail - sound: {path: /Audio/Floof/Lewd/lick.ogg} diff --git a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml index 97527b875c7..ec43dd4564d 100644 --- a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -1,7 +1,7 @@ - type: Interaction id: Kiss - parent: [BaseGlobal, BaseLips] - priority: 0 + parent: [BaseGlobal, BaseHands] + priority: -1 delay: 0.4 range: {max: 1} hideByRequirement: true @@ -12,11 +12,14 @@ # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction effect: BeingKissed + effectSuccess: + popup: Obvious + sound: {path: /Audio/Floof/Lewd/kiss.ogg} - type: Interaction id: Lick - parent: [BaseGlobal, BaseTongue] - priority: 0 + parent: [BaseGlobal, BaseHands] + priority: -2 #icon: /Textures/Interface/Actions/hug.png delay: 0.7 range: {max: 1} @@ -28,4 +31,6 @@ # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction effect: BeingLicked - + effectSuccess: + popup: Obvious + sound: {path: /Audio/Floof/Lewd/lick.ogg}