Build 0.20.12.0
This commit is contained in:
@@ -1619,6 +1619,11 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
if (!affliction.Prefab.ShowBarInHealthMenu)
|
||||
{
|
||||
afflictionStrengthBar.BarSize = 1f;
|
||||
}
|
||||
|
||||
if (afflictionTooltip != null && afflictionTooltip.UserData == affliction)
|
||||
{
|
||||
UpdateAfflictionInfo(afflictionTooltip.Content, affliction);
|
||||
|
||||
@@ -224,8 +224,7 @@ namespace Barotrauma.Items.Components
|
||||
if (character == null) { return false; }
|
||||
if (character == Character.Controlled)
|
||||
{
|
||||
if (targetSections.Count == 0) { return false; }
|
||||
Spray(character, deltaTime, applyColors: true);
|
||||
Spray(character, deltaTime, applyColors: targetSections.Count > 0);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -987,11 +987,8 @@ namespace Barotrauma.Items.Components
|
||||
component.Color = borderComponent.OutlineColor = NoPowerColor;
|
||||
}
|
||||
|
||||
if (Voltage < MinVoltage) { continue; }
|
||||
|
||||
if (!component.Visible) { continue; }
|
||||
if (!(entity is Hull hull)) { continue; }
|
||||
|
||||
if (entity is not Hull hull) { continue; }
|
||||
if (!submarineContainer.Rect.Contains(component.Rect))
|
||||
{
|
||||
if (hull.Submarine.Info.Type != SubmarineType.Player)
|
||||
@@ -1001,6 +998,8 @@ namespace Barotrauma.Items.Components
|
||||
}
|
||||
}
|
||||
|
||||
if (Voltage < MinVoltage) { continue; }
|
||||
|
||||
hullDatas.TryGetValue(hull, out HullData? hullData);
|
||||
if (hullData is null)
|
||||
{
|
||||
|
||||
@@ -242,6 +242,11 @@ namespace Barotrauma
|
||||
return false;
|
||||
}
|
||||
|
||||
if (parentInventory?.Owner is Character character && character.InvisibleTimer > 0.0f)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Rectangle extents;
|
||||
if (cachedVisibleExtents.HasValue)
|
||||
{
|
||||
|
||||
@@ -240,6 +240,7 @@ namespace Barotrauma
|
||||
|
||||
public bool CanCharacterBuy()
|
||||
{
|
||||
if (DefaultPrice == null) { return false; }
|
||||
if (!DefaultPrice.RequiresUnlock) { return true; }
|
||||
return Character.Controlled is not null && Character.Controlled.HasStoreAccessForItem(this);
|
||||
}
|
||||
|
||||
+3
-3
@@ -168,11 +168,11 @@ namespace Barotrauma
|
||||
}
|
||||
else if (position.X < 0.0f)
|
||||
{
|
||||
obstacleDiff = Vector2.UnitX;
|
||||
obstacleDiff = -Vector2.UnitX;
|
||||
}
|
||||
else if (position.X > Level.Loaded.Size.X)
|
||||
{
|
||||
obstacleDiff = -Vector2.UnitX;
|
||||
obstacleDiff = Vector2.UnitX;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -183,7 +183,7 @@ namespace Barotrauma
|
||||
foreach (Voronoi2.VoronoiCell cell in cells)
|
||||
{
|
||||
Vector2 diff = cell.Center - position;
|
||||
if (diff.LengthSquared() > 5000.0f * 5000.0f) continue;
|
||||
if (diff.LengthSquared() > 5000.0f * 5000.0f) { continue; }
|
||||
obstacleDiff += diff;
|
||||
cellCount++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user