Unstable 1.8.4.0

2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
@@ -1,6 +1,7 @@
 using Microsoft.Xna.Framework;
 using FarseerPhysics;
 using System;
+using System.Collections.Generic;
 using System.Linq;

 namespace Barotrauma
@@ -11,7 +12,7 @@ namespace Barotrauma
        {
            if (Character == Character.Controlled) { return; }
            if (!DebugAI) { return; }
-            Vector2 pos = Character.WorldPosition;
+            Vector2 pos = Character.DrawPosition;
            pos.Y = -pos.Y;
            Vector2 textOffset = new Vector2(-40, -160);
            textOffset.Y -= Math.Max(ObjectiveManager.CurrentOrders.Count - 1, 0) * 20;
@@ -63,6 +64,25 @@ namespace Barotrauma
                    stringDrawPos += new Vector2(0, 20);
                    GUI.DrawString(spriteBatch, stringDrawPos, $"ACTIVE OBJECTIVE: {activeObjective.DebugTag} ({activeObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                }
+                if (currentObjective is AIObjectiveCombat 
+                    { 
+                        Weapon: Item weapon, 
+                        BlockedPositions: List<Vector2> blockedPositions 
+                    })
+                {
+                    Vector2 weaponPos = weapon.DrawPosition;
+                    weaponPos.Y = -weaponPos.Y; 
+                    foreach (Vector2 blockedPosition in blockedPositions)
+                    {
+                        Vector2 blockedPos = blockedPosition;
+                        if (Character.Submarine != null)
+                        {
+                            blockedPos += Character.Submarine.DrawPosition;
+                        }
+                        blockedPos.Y = -blockedPos.Y;
+                        GUI.DrawLine(spriteBatch, weaponPos, blockedPos, Color.Red);
+                    }
+                }
            }

            Vector2 objectiveStringDrawPos = stringDrawPos + new Vector2(120, 40);