Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -50,9 +50,9 @@ namespace Barotrauma
}
else if (Entity is Item i)
{
if (i.Submarine != null && i.GetComponent<Items.Components.Door>() == null)
if (i.Submarine != null && i.Container != null)
{
// Don't show items that are inside the submarine, because monsters shouldn't target them when they are inside and the monsters are outside.
// Don't show contained items that are inside the submarine, because they shouldn't attract monsters.
return;
}
color = Color.CadetBlue;
@@ -82,15 +82,20 @@ namespace Barotrauma
{
var previousNode = path.Nodes[i - 1];
var currentNode = path.Nodes[i];
bool isPathActive = !path.Finished && !path.IsAtEndNode;
Color pathColor = isPathActive ? Color.Blue * 0.5f : Color.Gray;
GUI.DrawLine(spriteBatch,
new Vector2(currentNode.DrawPosition.X, -currentNode.DrawPosition.Y),
new Vector2(previousNode.DrawPosition.X, -previousNode.DrawPosition.Y),
Color.Blue * 0.5f, 0, 3);
pathColor, 0, 3);
GUIStyle.SmallFont.DrawString(spriteBatch,
currentNode.ID.ToString(),
new Vector2(currentNode.DrawPosition.X - 10, -currentNode.DrawPosition.Y - 30),
Color.Blue);
if (isPathActive)
{
GUIStyle.SmallFont.DrawString(spriteBatch,
currentNode.ID.ToString(),
new Vector2(currentNode.DrawPosition.X - 10, -currentNode.DrawPosition.Y - 30),
Color.Blue);
}
}
if (path.CurrentNode != null)
{