Artifacts don't have to be inside the main sub when exiting, gap particle positioning bugfix, waypoints that aren't inside a hull are displayed in blue (easier to spot waypoint issues), a warning is displayed if trying to choose a shuttle as the submarine in SP, random sub selection in MP ignores shuttles

This commit is contained in:
Regalis
2016-08-13 18:26:40 +03:00
parent ec59c47041
commit 19d3d793e7
9 changed files with 48 additions and 17 deletions
+1 -2
View File
@@ -259,7 +259,6 @@ namespace Barotrauma
particle.Size = particle.Size * Math.Min(Math.Abs(flowForce.X / 1000.0f), 5.0f);
}
if (Math.Abs(flowForce.X) > 300.0f)
{
pos.X += Math.Sign(flowForce.X) * 10.0f;
@@ -387,7 +386,7 @@ namespace Barotrauma
else if (dir == 1)
{
if (!(hull1.Volume > 0.0f)) return;
//lowerSurface = hull2.Surface - hull2.WaveY[1];
lowerSurface = hull2.Surface - hull2.WaveY[hull2.WaveY.Length - 1];
flowTargetHull = hull2;
+3 -2
View File
@@ -133,9 +133,10 @@ namespace Barotrauma
if (Submarine!=null) drawPos += Submarine.DrawPosition;
drawPos.Y = -drawPos.Y;
Color clr = (isSelected) ? Color.Red : Color.White;
Color clr = currentHull == null ? Color.Blue : Color.White;
if (isSelected) clr = Color.Red;
if (isHighlighted) clr = Color.DarkRed;
int iconX = iconIndices[(int)spawnType]*IconSize % iconTexture.Width;
int iconY = (int)(Math.Floor(iconIndices[(int)spawnType]*IconSize / (float)iconTexture.Width))*IconSize;