From 0358154a3d8557516d51309269b7d75690162934 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Fri, 13 Sep 2024 21:33:16 -0400 Subject: [PATCH] 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