[Feature] [Balance] Mood Traits & Things

Content.Server/Backmen/Mood/MoodComponent.cs

@@ -34,7 +34,7 @@ public sealed partial class MoodComponent : Component
     ///     The lowest point that low morale can multiply our movement speed by. Lowering speed follows a linear curve, rather than geometric.
     /// </summary>
     [DataField]
-    public float MinimumSpeedModifier = 0.75f;
+    public float MinimumSpeedModifier = 0.90f;
 
     /// <summary>
     ///     The maximum amount that high morale can multiply our movement speed by. This follows a significantly slower geometric sequence.
@@ -48,6 +48,24 @@ public sealed partial class MoodComponent : Component
     [DataField]
     public float DecreaseCritThreshold = 0.9f;
 
+    /// <summary>
+    ///     Multiplier for positive mood effects.
+    /// </summary>
+    [DataField]
+    public float GoodMoodMultiplier = 1.0f;
+
+    /// <summary>
+    ///     Multiplier for negative mood effects.
+    /// </summary>
+    [DataField]
+    public float BadMoodMultiplier = 1.0f;
+
+    [DataField]
+    public MoodThreshold BuffsMoodThreshold = MoodThreshold.Good;
+
+    [DataField]
+    public MoodThreshold ConsMoodThreshold = MoodThreshold.Bad;
+
     [ViewVariables(VVAccess.ReadOnly)]
     public FixedPoint2 CritThresholdBeforeModify;
 

Content.Server/Backmen/Mood/MoodSystem.cs

@@ -155,8 +155,12 @@ private void OnRefreshMoveSpeed(EntityUid uid, MoodComponent component, RefreshM
 
     private void OnTraitStartup(EntityUid uid, MoodModifyTraitComponent component, ComponentStartup args)
     {
-        if (component.MoodId != null)
-            RaiseLocalEvent(uid, new MoodEffectEvent($"{component.MoodId}"));
+        if (!TryComp<MoodComponent>(uid, out var mood))
+            return;
+
+        mood.GoodMoodMultiplier = component.GoodMoodMultiplier;
+        mood.BadMoodMultiplier = component.BadMoodMultiplier;
+        RaiseLocalEvent(uid, new MoodEffectEvent($"{component.MoodId}"));
     }
 
     private void OnMoodEffect(EntityUid uid, MoodComponent component, MoodEffectEvent args)
@@ -308,12 +312,18 @@ private void RefreshMood(EntityUid uid, MoodComponent component)
             if (!_prototypeManager.TryIndex<MoodEffectPrototype>(protoId, out var prototype))
                 continue;
 
-            amount += prototype.MoodChange;
+            if (prototype.MoodChange > 0)
+                amount += prototype.MoodChange * component.GoodMoodMultiplier;
+            else
+                amount += prototype.MoodChange * component.BadMoodMultiplier;
         }
 
         foreach (var (_, value) in component.UncategorisedEffects)
         {
-            amount += value;
+            if (value > 0)
+                amount += value * component.GoodMoodMultiplier;
+            else
+                amount += value * component.BadMoodMultiplier;
         }
 
         SetMood(uid, amount, component, refresh: true);
@@ -388,10 +398,10 @@ private void DoMoodThresholdsEffects(EntityUid uid, MoodComponent? component = n
             || component.CurrentMoodThreshold == component.LastThreshold && !force)
             return;
 
-        var modifier = GetMovementThreshold(component.CurrentMoodThreshold);
+        var modifier = GetMovementThreshold(component.CurrentMoodThreshold, component);
 
         // Modify mob stats
-        if (modifier != GetMovementThreshold(component.LastThreshold))
+        if (modifier != GetMovementThreshold(component.LastThreshold, component))
         {
             _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
             SetCritThreshold(uid, component, modifier);
@@ -451,14 +461,15 @@ private MoodThreshold GetMoodThreshold(MoodComponent component, float? moodLevel
         return result;
     }
 
-    private int GetMovementThreshold(MoodThreshold threshold)
+    private int GetMovementThreshold(MoodThreshold threshold, MoodComponent component)
     {
-        return threshold switch
-        {
-            >= MoodThreshold.Good => 1,
-            <= MoodThreshold.Meh => -1,
-            _ => 0
-        };
+        if (threshold >= component.BuffsMoodThreshold)
+            return 1;
+
+        if (threshold <= component.ConsMoodThreshold)
+            return -1;
+
+        return 0;
     }
 
     private string GetMoodName(MoodThreshold threshold)

Content.Server/Backmen/Traits/Assorted/ModifyMoodTraitComponent.cs

@@ -7,5 +7,11 @@ namespace Content.Server.Backmen.Traits.Assorted;
 public sealed partial class MoodModifyTraitComponent : Component
 {
     [DataField]
-    public string? MoodId = null;
+    public string? MoodId;
+
+    [DataField]
+    public float GoodMoodMultiplier = 1.0f;
+
+    [DataField]
+    public float BadMoodMultiplier = 1.0f;
 }

Resources/Locale/ru-RU/backmen/mood/mood.ftl

@@ -34,6 +34,8 @@ mood-effect-MobHighPressure = Я чувствую будто воздух сжи
 
 mood-effect-TraitSaturnine = Тут всё очень скучное. Ненавижу эту работу.
 
+mood-effect-TraitFortitude = Мне уже на всё плевать.
+
 mood-effect-Dead = Вы мертвы.
 
 mood-effect-BeingHugged = Люблю когда меня обнимают.

Resources/Locale/ru-RU/backmen/trait/OwOAccent.ftl

@@ -1,3 +1,10 @@
-
+trait-category-mood = Настроение
+
 OwOAccent-name = OwO акцент
 OwOAccent-desc = Вы не можете перестать говорить как неко!
+trait-fortitude-name = Моральная стойкость
+trait-fortitude-desc = Вы не такой эмоциональный человек как остальные, вам плевать на все трудности и радости жизни.
+trait-hypomania-name = Гипомания
+trait-hypomania-desc = Обычно вам чертвоски весело, но любой негатив вас сильно расстраивает!
+trait-depression-name = Депрессия
+trait-depression-desc = Чувак, эта вечеринка отстой. Я, блин, ненавижу этих людей.

Resources/Prototypes/_Backmen/Mood/genericNegativeEffects.yml

@@ -41,6 +41,10 @@
   id: TraitSaturnine
   moodChange: -20
 
+- type: moodEffect
+  id: TraitFortitude
+  moodChange: -10
+
 - type: moodEffect
   id: Dead
   moodChange: -1000
@@ -59,5 +63,5 @@
 
 - type: moodEffect
   id: SurgeryPain
-  moodChange: -15
-  timeout: 180
+  moodChange: -30
+  timeout: 90

Resources/Prototypes/_Backmen/Traits/categories.yml

@@ -0,0 +1,4 @@
+- type: traitCategory
+  id: MoodTraits
+  name: trait-category-mood
+  maxTraitPoints: 1

Resources/Prototypes/_Backmen/Traits/disabilities.yml

@@ -1,4 +1,3 @@
-
 - type: trait
   id: Monolingual
   name: trait-monolingual-name

Resources/Prototypes/_Backmen/Traits/neutral.yml

@@ -1,8 +1,9 @@
-
-- type: trait
+- type: trait
   id: OwOAccent
   name: OwOAccent-name
   description: OwOAccent-desc
+  category: SpeechTraits
+  cost: 1
   blacklist:
     components:
     - BSSDrone #backmen: bssdrone
@@ -13,3 +14,37 @@
     - Felinid
   components:
   - type: OwOAccent
+
+# for mood haters
+- type: trait
+  id: Fortitude
+  name: trait-fortitude-name
+  description: trait-fortitude-desc
+  category: MoodTraits
+  cost: 1
+  components:
+  - type: MoodModifyTrait
+    moodId: TraitFortitude
+    goodMoodMultiplier: 0.5
+    badMoodMultiplier: 0.5
+
+- type: trait
+  id: Hypomania
+  name: trait-hypomania-name
+  description: trait-hypomania-desc
+  category: MoodTraits
+  cost: 1
+  components:
+  - type: MoodModifyTrait
+    moodId: TraitSanguine
+    badMoodMultiplier: 1.5 # Everything comes with a price.
+
+- type: trait
+  id: Depression
+  name: trait-depression-name
+  description: trait-depression-desc
+  category: MoodTraits
+  cost: 1
+  components:
+  - type: MoodModifyTrait
+    moodId: TraitSaturnine