Character flipping enhancements

Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterNetworking.cs

@@ -220,7 +220,16 @@ public void ClientReadPosition(IReadMessage msg, float sendingTime)
                 keys[(int)InputType.Ragdoll].Held = ragdollInput;
                 keys[(int)InputType.Ragdoll].SetState(false, ragdollInput);
 
-                facingRight = msg.ReadBoolean();
+            }
+
+            facingRight = msg.ReadBoolean();
+
+            if (AnimController.IsFlipped == facingRight)
+            {
+                if((AnimController is HumanoidAnimController && !CanMove) || AnimController is FishAnimController)
+                {
+                    TryFlipCharacter();
+                }
             }
 
             bool entitySelected = msg.ReadBoolean();

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -386,9 +386,10 @@ public void ServerWritePosition(ReadWriteMessage tempBuffer, Client c)
 
                 tempBuffer.WriteBoolean(IsRagdolled || Stun > 0.0f || IsDead || IsIncapacitated);
 
-                tempBuffer.WriteBoolean(AnimController.Dir > 0.0f);
             }
 
+            tempBuffer.WriteBoolean(AnimController.Dir > 0.0f);
+
             if (SelectedCharacter != null || HasSelectedAnyItem)
             {
                 tempBuffer.WriteBoolean(true);

Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/FishAnimController.cs

@@ -281,7 +281,7 @@ protected override void UpdateAnim(float deltaTime)
                 }
             }
 
-            if (!IsStuck && CurrentFishAnimation.Flip && character.AIController is not { CanFlip: false })
+            if (!IsStuck && CurrentFishAnimation.Flip && character.AIController is not { CanFlip: false } && (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient))
             {
                 flipCooldown -= deltaTime;
                 if (TargetDir != Direction.None && TargetDir != dir)
@@ -296,14 +296,9 @@ protected override void UpdateAnim(float deltaTime)
                     }
                     bool isMovingFastEnough = Math.Abs(MainLimb.LinearVelocity.X) > requiredSpeed;
                     bool isTryingToMoveHorizontally = Math.Abs(TargetMovement.X) > Math.Abs(TargetMovement.Y);
-                    if ((flipTimer > CurrentFishAnimation.FlipDelay && flipCooldown <= 0.0f && ((isMovingFastEnough && isTryingToMoveHorizontally) || IsMovingBackwards))
-                        || character.IsRemotePlayer)
+                    if ((flipTimer > CurrentFishAnimation.FlipDelay && flipCooldown <= 0.0f) && ((isMovingFastEnough && isTryingToMoveHorizontally) || IsMovingBackwards))
                     {
                         Flip();
-                        if (!inWater || (CurrentSwimParams != null && CurrentSwimParams.Mirror))
-                        {
-                            Mirror(CurrentSwimParams != null ? CurrentSwimParams.MirrorLerp : true);
-                        }
                         flipTimer = 0.0f;
                         flipCooldown = CurrentFishAnimation.FlipCooldown;
                     }
@@ -1029,6 +1024,10 @@ public override void Flip()
                 //no need to do anything when flipping vertically oriented limbs
                 //the sprite gets flipped horizontally, which does the job
             }
+            if (!inWater || (CurrentSwimParams != null && CurrentSwimParams.Mirror))
+            {
+                Mirror(CurrentSwimParams != null ? CurrentSwimParams.MirrorLerp : true);
+            }
         }
 
         public void Mirror(bool lerp = true)

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -2111,11 +2111,7 @@ public void Control(float deltaTime, Camera cam)
                 ((!IsClimbing && AnimController.OnGround) || (IsClimbing && IsKeyDown(InputType.Aim))) && 
                 !AnimController.InWater)
             {
-                if (dontFollowCursor)
-                {
-                    AnimController.TargetDir = Direction.Right;
-                }
-                else
+                if (AnimController is not FishAnimController)
                 {
                     if (CursorPosition.X < AnimController.Collider.Position.X - cursorFollowMargin)
                     {
@@ -2126,6 +2122,10 @@ public void Control(float deltaTime, Camera cam)
                         AnimController.TargetDir = Direction.Right;
                     }
                 }
+                if (AnimController is HumanoidAnimController && dontFollowCursor) // For character editor
+                {
+                    AnimController.TargetDir = Direction.Right;
+                }
             }
 
             if (GameMain.NetworkMember != null)
@@ -5808,6 +5808,25 @@ public void StopClimbing()
             AnimController.StopClimbing();
             ReleaseSecondaryItem();
         }
+
+        public void TryFlipCharacter()
+        {
+            if (AnimController is FishAnimController fishAnimController)
+            {
+                if (fishAnimController.CurrentFishAnimation.Flip)
+                {
+                    fishAnimController.Flip();
+                }
+            }
+            else
+            {
+                AnimController.TargetDir = (AnimController.TargetDir == Direction.Left) ? Direction.Right : Direction.Left;
+                if (!CanMove)
+                {
+                    AnimController.Flip();
+                }
+            }
+        }
     }
 
     class ActiveTeamChange

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionHusk.cs

@@ -372,6 +372,10 @@ private IEnumerable<CoroutineStatus> CreateAIHusk()
             }
 
             husk.SetStun(5);
+            if (character.IsFlipped)
+            {
+                husk.TryFlipCharacter();
+            }
             yield return new WaitForSeconds(5, false);
 #if CLIENT
             husk?.PlaySound(CharacterSound.SoundType.Idle);

Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs

@@ -603,7 +603,7 @@ public AITrigger(XElement element)
 
         private readonly int useItemCount;
 
-        private readonly bool removeItem, dropContainedItems, dropItem, removeCharacter, breakLimb, hideLimb;
+        private readonly bool removeItem, dropContainedItems, dropItem, removeCharacter, breakLimb, hideLimb, flipCharacter;
         private readonly float hideLimbTimer;
 
         public readonly ActionType type = ActionType.OnActive;
@@ -968,6 +968,9 @@ protected StatusEffect(ContentXElement element, string parentDebugName)
                     case "removecharacter":
                         removeCharacter = true;
                         break;
+                    case "flipcharacter":
+                        flipCharacter = true;
+                        break;
                     case "breaklimb":
                         breakLimb = true;
                         break;
@@ -1603,6 +1606,9 @@ protected void Apply(float deltaTime, Entity entity, IReadOnlyList<ISerializable
             PhysicsBody parentItemBody = parentItem?.body;
             Hull hull = GetHull(entity);
             Vector2 position = GetPosition(entity, targets, worldPosition);
+
+            bool isNotClient = GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient;
+
             if (useItemCount > 0)
             {
                 Character useTargetCharacter = null;
@@ -1687,6 +1693,17 @@ protected void Apply(float deltaTime, Entity entity, IReadOnlyList<ISerializable
                     }
                 }
             }
+            if (flipCharacter)
+            {
+                for (int i = 0; i < targets.Count; i++)
+                {
+                    var target = CharacterFromTarget(targets[i]);
+                    if (target != null && isNotClient)
+                    {
+                        target.TryFlipCharacter();
+                    }
+                }
+            }
             if (breakLimb || hideLimb)
             {
                 for (int i = 0; i < targets.Count; i++)
@@ -1756,8 +1773,6 @@ protected void Apply(float deltaTime, Entity entity, IReadOnlyList<ISerializable
                 }
             }
 
-            bool isNotClient = GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient;
-
             for (int i = 0; i < targets.Count; i++)
             {
                 var target = targets[i];
@@ -2051,6 +2066,10 @@ entity is Item item &&
                                     foreach (var target in targets)
                                     {
                                         if (target is not Character character) { continue; }
+                                        if (character.IsFlipped)
+                                        {
+                                            newCharacter.TryFlipCharacter();
+                                        }
                                         if (characterSpawnInfo.TransferInventory && character.Inventory != null && newCharacter.Inventory != null)
                                         {
                                             if (character.Inventory.Capacity != newCharacter.Inventory.Capacity) { return; }