(5c35a640e) Update tutorial-rework with dev

Barotrauma/BarotraumaClient/Source/Characters/AI/AITarget.cs

@@ -13,13 +13,39 @@ namespace Barotrauma
             var pos = new Vector2(WorldPosition.X, -WorldPosition.Y);
             if (soundRange > 0.0f)
             {
-                Color color = Entity is Character ? Color.Yellow : Color.Orange;
+                Color color;
+                if (Entity is Character)
+                {
+                    color = Color.Yellow;
+                }
+                else if (Entity is Item)
+                {
+                    color = Color.Orange;
+                }
+                else
+                {
+                    color = Color.OrangeRed;
+                }
                 ShapeExtensions.DrawCircle(spriteBatch, pos, SoundRange, 100, color, thickness: 1 / Screen.Selected.Cam.Zoom);
+                ShapeExtensions.DrawCircle(spriteBatch, pos, 3, 8, color, thickness: 2 / Screen.Selected.Cam.Zoom);
             }
             if (sightRange > 0.0f)
             {
-                Color color = Entity is Character ? Color.CornflowerBlue : Color.CadetBlue;
+                Color color;
+                if (Entity is Character)
+                {
+                    color = Color.CornflowerBlue;
+                }
+                else if (Entity is Item)
+                {
+                    color = Color.CadetBlue;
+                }
+                else
+                {
+                    color = Color.WhiteSmoke;
+                }
                 ShapeExtensions.DrawCircle(spriteBatch, pos, SightRange, 100, color, thickness: 1 / Screen.Selected.Cam.Zoom);
+                ShapeExtensions.DrawCircle(spriteBatch, pos, 6, 8, color, thickness: 2 / Screen.Selected.Cam.Zoom);
             }
         }
     }

Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs

@@ -21,13 +21,11 @@ namespace Barotrauma
                 if (wallTarget != null)
                 {
                     Vector2 wallTargetPos = wallTarget.Position;
-                    if (wallTarget.Structure.Submarine != null) wallTargetPos += wallTarget.Structure.Submarine.Position;
                     wallTargetPos.Y = -wallTargetPos.Y;
                     GUI.DrawRectangle(spriteBatch, wallTargetPos - new Vector2(10.0f, 10.0f), new Vector2(20.0f, 20.0f), Color.Red, false);
-                GUI.DrawLine(spriteBatch, pos, wallTargetPos, Color.Orange * 0.5f, 0, 5);
+                    GUI.DrawLine(spriteBatch, pos, wallTargetPos, Color.Orange * 0.5f, 0, 5);
                 }
-
-                GUI.Font.DrawString(spriteBatch, $"{SelectedAiTarget.Entity.ToString()} ({targetValue.ToString()})", pos - Vector2.UnitY * 20.0f, Color.Red);
+                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 60.0f, $"{SelectedAiTarget.Entity.ToString()} ({targetValue.FormatZeroDecimal()})", Color.Red, Color.Black);
             }
 
             /*GUI.Font.DrawString(spriteBatch, targetValue.ToString(), pos - Vector2.UnitY * 80.0f, Color.Red);
@@ -70,29 +68,34 @@ namespace Barotrauma
 
             GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Steering.X, -Steering.Y)), Color.Blue, width: 3);
 
-                if (latchOntoAI.WallAttachPos.HasValue)
-                {
-                    GUI.DrawLine(spriteBatch, pos,
-                        ConvertUnits.ToDisplayUnits(new Vector2(latchOntoAI.WallAttachPos.Value.X, -latchOntoAI.WallAttachPos.Value.Y)), Color.Green, 0, 3);
-                }
-            }
-
-            GUI.DrawLine(spriteBatch,
-                new Vector2(Character.DrawPosition.X, -Character.DrawPosition.Y),
-                new Vector2(pathSteering.CurrentPath.CurrentNode.DrawPosition.X, -pathSteering.CurrentPath.CurrentNode.DrawPosition.Y),
-                Color.Orange * 0.6f, 0, 3);
-            
-            for (int i = 1; i < pathSteering.CurrentPath.Nodes.Count; i++)
+            if (steeringManager is IndoorsSteeringManager pathSteering)
             {
-                GUI.DrawLine(spriteBatch,
-                    new Vector2(pathSteering.CurrentPath.Nodes[i].DrawPosition.X, -pathSteering.CurrentPath.Nodes[i].DrawPosition.Y),
-                    new Vector2(pathSteering.CurrentPath.Nodes[i - 1].DrawPosition.X, -pathSteering.CurrentPath.Nodes[i - 1].DrawPosition.Y),
-                    Color.Orange * 0.6f, 0, 3);
+                var path = pathSteering.CurrentPath;
+                if (path != null)
+                {
+                    if (path.CurrentNode != null)
+                    {
+                        GUI.DrawLine(spriteBatch, pos,
+                            new Vector2(path.CurrentNode.DrawPosition.X, -path.CurrentNode.DrawPosition.Y),
+                            Color.DarkViolet, 0, 3);
 
-                GUI.SmallFont.DrawString(spriteBatch,
-                    pathSteering.CurrentPath.Nodes[i].ID.ToString(),
-                    new Vector2(pathSteering.CurrentPath.Nodes[i].DrawPosition.X, -pathSteering.CurrentPath.Nodes[i].DrawPosition.Y - 10),
-                    Color.LightGreen);
+                        GUI.DrawString(spriteBatch, pos - new Vector2(0, 100), "Path cost: " + path.Cost.FormatZeroDecimal(), Color.White, Color.Black * 0.5f);
+                    }
+                    for (int i = 1; i < path.Nodes.Count; i++)
+                    {
+                        var previousNode = path.Nodes[i - 1];
+                        var currentNode = path.Nodes[i];
+                        GUI.DrawLine(spriteBatch,
+                            new Vector2(currentNode.DrawPosition.X, -currentNode.DrawPosition.Y),
+                            new Vector2(previousNode.DrawPosition.X, -previousNode.DrawPosition.Y),
+                            Color.Red * 0.5f, 0, 3);
+
+                        GUI.SmallFont.DrawString(spriteBatch,
+                            currentNode.ID.ToString(),
+                            new Vector2(currentNode.DrawPosition.X + 20, -currentNode.DrawPosition.Y - 20),
+                            Color.Red);
+                    }
+                }
             }
             GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Character.AnimController.TargetMovement.X, -Character.AnimController.TargetMovement.Y)), Color.SteelBlue, width: 2);
             GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Steering.X, -Steering.Y)), Color.Blue, width: 3);

Barotrauma/BarotraumaClient/Source/Characters/AI/HumanAIController.cs

@@ -75,11 +75,12 @@ namespace Barotrauma
 
                         GUI.SmallFont.DrawString(spriteBatch,
                             currentNode.ID.ToString(),
-                            new Vector2(currentNode.DrawPosition.X, -currentNode.DrawPosition.Y - 10),
-                            Color.LightGreen);
+                            new Vector2(currentNode.DrawPosition.X + 20, -currentNode.DrawPosition.Y - 20),
+                            Color.SkyBlue);
                     }
                 }
             }
+            GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Character.AnimController.TargetMovement.X, -Character.AnimController.TargetMovement.Y)), Color.SteelBlue, width: 2);
             GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Steering.X, -Steering.Y)), Color.Blue, width: 3);
 
             //if (Character.IsKeyDown(InputType.Aim))

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -210,7 +210,9 @@ namespace Barotrauma
                     else
                     {
                         Vector2 positionError = serverPos.Position - localPos.Position;
-                        float rotationError = serverPos.Rotation - localPos.Rotation;
+                        float rotationError = serverPos.Rotation.HasValue && localPos.Rotation.HasValue ?
+                            serverPos.Rotation.Value - localPos.Rotation.Value :
+                            0.0f;
 
                         for (int i = localPosIndex; i < character.MemLocalState.Count; i++)
                         {

Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs

@@ -214,8 +214,8 @@ namespace Barotrauma
                         msg.ReadRangedSingle(-MaxVel, MaxVel, 12));
 
                     bool fixedRotation = msg.ReadBoolean();
-                    float rotation = AnimController.Collider.Rotation;
-                    float angularVelocity = AnimController.Collider.AngularVelocity;
+                    float? rotation = null;
+                    float? angularVelocity = null;
                     if (!fixedRotation)
                     {
                         rotation = msg.ReadFloat();