Some more traits (Floof-Station#256)

* Small fix for crawling direction inversion

* Stamina traits

* Modify AnimationThreshold too

* Footstep volume modifier and relevant trait

Author: Mnemotechnician

Content.Client/Damage/Systems/StaminaSystem.cs

@@ -108,7 +108,7 @@ private void PlayAnimation(Entity<StaminaComponent, SpriteComponent> entity)
         DebugTools.Assert(entity.Comp1.CritThreshold > entity.Comp1.AnimationThreshold, $"Animation threshold on {ToPrettyString(entity)} was not less than the crit threshold. This will cause errors, animation has been cancelled.");
 
         var step = Math.Clamp((entity.Comp1.StaminaDamage - entity.Comp1.AnimationThreshold) /
-                              (entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold),
+                              MathF.Max((entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold), 1), // Floofstation - ensure this doesn't result in division by 0
             0f,
             1f); // The things I do for project 0 warnings
         var frequency = entity.Comp1.FrequencyMin + step * entity.Comp1.FrequencyMod;

Content.Shared/Damage/Components/StaminaComponent.cs

@@ -70,7 +70,7 @@ public sealed partial class StaminaComponent : Component
     /// This float determines how fast stamina will regenerate after exiting the stamina crit.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float AfterCritDecayMultiplier = 5f;
+    public float AfterCritDecayMultiplier = 2f; // Floofstation - lower value
 
     /// <summary>
     /// This is how much stamina damage a mob takes when it forces itself to stand up before modifiers
@@ -87,7 +87,7 @@ public sealed partial class StaminaComponent : Component
     /// <summary>
     /// Thresholds that determine an entity's slowdown as a function of stamina damage.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField] // Floofstation - made networked because of traits
     public Dictionary<FixedPoint2, float> StunModifierThresholds = new() { {0, 1f }, { 60, 0.7f }, { 80, 0.5f } };
 
     #region Animation Data
@@ -96,7 +96,7 @@ public sealed partial class StaminaComponent : Component
     /// Threshold at which low stamina animations begin playing. This should be set to a value that means something.
     /// At 50, it is aligned so when you hit 60 stun the entity will be breathing once per second (well above hyperventilation).
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField] // Floofstation - networked
     public float AnimationThreshold = 50;
 
     /// <summary>
@@ -127,13 +127,13 @@ public sealed partial class StaminaComponent : Component
     /// Min multipliers for JitterAmplitude in the X and Y directions, animation randomly chooses between these min and max multipliers
     /// </summary>
     [DataField]
-    public Vector2 JitterMin = Vector2.Create(0.5f, 0.125f);
+    public Vector2 JitterMin = Vector2.Create(0.25f, 0.0625f); // Floofstation - lowered because it looks weird.
 
     /// <summary>
     /// Max multipliers for JitterAmplitude in the X and Y directions, animation randomly chooses between these min and max multipliers
     /// </summary>
     [DataField]
-    public Vector2 JitterMax = Vector2.Create(1f, 0.25f);
+    public Vector2 JitterMax = Vector2.Create(0.5f, 0.125f); // Floofstation - lowered because it looks weird.
 
     /// <summary>
     /// Minimum total animations per second

Content.Shared/Movement/Systems/SharedMoverController.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
-using Content.Shared._DV.Movement; // DeltaV
+using Content.Shared._DV.Movement;
+using Content.Shared._Floof.Movement.Footsteps;
 using Content.Shared.ActionBlocker;
 using Content.Shared.CCVar;
 using Content.Shared.Friction;
@@ -63,6 +64,7 @@ public abstract partial class SharedMoverController : VirtualController
     protected EntityQuery<PullableComponent> PullableQuery;
     protected EntityQuery<TransformComponent> XformQuery;
     protected EntityQuery<NoShoesSilentFootstepsComponent> NoShoesSilentQuery; // DeltaV - NoShoesSilentFootstepsComponent
+    protected EntityQuery<FootstepVolumeModifierComponent> FootstepVolumeQuery; // Floofstation
 
     private static readonly ProtoId<TagPrototype> FootstepSoundTag = "FootstepSound";
 
@@ -96,6 +98,7 @@ public override void Initialize()
         FootstepModifierQuery = GetEntityQuery<FootstepModifierComponent>();
         MapGridQuery = GetEntityQuery<MapGridComponent>();
         NoShoesSilentQuery = GetEntityQuery<NoShoesSilentFootstepsComponent>(); // DeltaV - NoShoesSilentFootstepsComponent
+        FootstepVolumeQuery = GetEntityQuery<FootstepVolumeModifierComponent>(); // Floofstation
         MapQuery = GetEntityQuery<MapComponent>();
 
         SubscribeLocalEvent<MovementSpeedModifierComponent, TileFrictionEvent>(OnTileFriction);
@@ -345,6 +348,11 @@ public void HandleMobMovement( // DeltaV - made public
                 var soundModifier = mover.Sprinting ? InputMoverComponent.SprintingSoundModifier
                     : InputMoverComponent.WalkingSoundModifier;
 
+                // Floofstation section - volume modifiers
+                if (FootstepVolumeQuery.TryGetComponent(uid, out var volumeModifier))
+                    soundModifier += volumeModifier.Volume;
+                // Floofstation section end
+
                 var audioParams = sound.Params
                     .WithVolume(sound.Params.Volume + soundModifier)
                     .WithVariation(sound.Params.Variation ?? mobMover.FootstepVariation);

Content.Shared/_Floof/Movement/Footsteps/FootstepVolumeModifierComponent.cs

@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Floof.Movement.Footsteps;
+
+/// <summary>
+///     Changes the volume of the mover's footsteps.<br/>
+///
+///     This component is primarily used in traits, but cannot be made into a simple TraitEffect because SharedMoverController
+///     HARDCODES the footstep volume modifiers. I don't want to change the upstream code and make those constants into properties,
+///     so here we are.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FootstepVolumeModifierComponent : Component
+{
+    /// <summary>
+    ///     Volume change, in decibels.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Volume;
+}

Content.Shared/_Floof/Standing/SharedCrawlingExtensionsSystem.cs

@@ -79,7 +79,7 @@ private void HandleDirectionToggleRequest(ICommonSession? session)
 
         // +90deg = default horizontal rotation, -90deg = opposite
         var rotVisuals = EnsureComp<RotationVisualsComponent>(uid);
-        _rotVisuals.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation + (ext.InvertedCrawlingDirection ? 0 : Angle.FromDegrees(180)));
+        _rotVisuals.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation + (!ext.InvertedCrawlingDirection ? 0 : Angle.FromDegrees(180)));
         // Have to queue an appearance update so the RotationVisualizerSystem can play an animation if the entity is already laying
         Dirty(uid, appearance);
     }

Content.Shared/_Floof/Traits/Effects/ModifyStaminaThresholdEffect.cs

@@ -0,0 +1,35 @@
+using Content.Shared._DV.Traits.Effects;
+using Content.Shared.Damage.Components;
+using Content.Shared.FixedPoint;
+
+namespace Content.Shared._Floof.Traits.Effects;
+
+public sealed partial class ModifyStaminaThresholdEffect : BaseTraitEffect
+{
+    /// <summary>
+    ///     Multiplicative stamina threshold and decay bonus.
+    /// </summary>
+    [DataField]
+    public float Multiplier = 1f;
+
+    public override void Apply(TraitEffectContext ctx)
+    {
+        if (!ctx.EntMan.TryGetComponent<StaminaComponent>(ctx.Player, out var stamina))
+        {
+            Log.Error($"Player {ctx.EntMan.ToPrettyString(ctx.Player)} has no {nameof(StaminaComponent)}!");
+            return;
+        }
+
+        stamina.CritThreshold *= Multiplier;
+        stamina.Decay *= Multiplier;
+        stamina.AnimationThreshold *= Multiplier;
+
+        // There are several stamina thresholds at which the mob is slowed down, all of which need to be updated
+        var newThresholds = new Dictionary<FixedPoint2, float>();
+        foreach (var (threshold, speedMultiplier) in stamina.StunModifierThresholds)
+            newThresholds[threshold * Multiplier] = speedMultiplier;
+
+        stamina.StunModifierThresholds = newThresholds;
+        ctx.EntMan.Dirty(ctx.Player, stamina);
+    }
+}

Resources/Locale/en-US/_Floof/traits/categories.ftl

@@ -1,2 +1,3 @@
 trait-category-languages = Languages
 trait-category-natural-languages = Natural languages
+trait-category-skills = Skills

Resources/Locale/en-US/_Floof/traits/physical_traits.ftl

@@ -7,3 +7,17 @@ trait-weightheavy-name = Heavyweight
 trait-weightheavy-desc =
     You are naturally heavier than other representatives of your species. Your body density is increased to 140% of normal.
     Note: [color=red]this will not display in the character creation menu, and will only have effect in-game.[/color]
+
+trait-vigor-name = Vigor
+trait-vigor-desc =
+    Whether by pure determination, fitness, or bionic augmentations, your endurance is enhanced.
+    Your stamina thresholds are 20% greater than usual.
+
+trait-lethargy-name = Lethargy
+trait-lethargy-desc =
+    You become tired faster than others, making you more vulnerable to exhaustion and fatigue.
+    Your stamina thresholds are 20% lower than usual.
+
+trait-weakness-name = Weakness
+trait-weakness-desc =
+    You are naturally more vulnerable to fatigue. Your stamina pool is halved, making you greately vulnerable to shoving and stunning attacks.

Resources/Locale/en-US/_Floof/traits/skills.ftl

@@ -0,0 +1,2 @@
+trait-light-step-name = Light Step
+trait-light-step-desc = You move with a gentle step, which makes your footsteps quieter.

Resources/Prototypes/_DV/Traits/trait_categories.yml

@@ -28,5 +28,5 @@
   id: Meta
   name: trait-category-meta
   priority: 50
-  maxTraits: 2
+  maxTraits: 2 # Floof
   accentColor: "#eab308"  # Yellow