(73193fb71) Updated a couple of sound effects
This commit is contained in:
@@ -656,6 +656,13 @@ namespace Barotrauma
|
|||||||
msg.Timer -= deltaTime;
|
msg.Timer -= deltaTime;
|
||||||
msg.Pos += msg.Velocity * deltaTime;
|
msg.Pos += msg.Velocity * deltaTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foreach (GUIMessage msg in messages)
|
||||||
|
{
|
||||||
|
if (!msg.WorldSpace) continue;
|
||||||
|
msg.Timer -= deltaTime;
|
||||||
|
msg.Pos += msg.Velocity * deltaTime;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
messages.RemoveAll(m => m.Timer <= 0.0f);
|
messages.RemoveAll(m => m.Timer <= 0.0f);
|
||||||
|
|||||||
@@ -127,18 +127,6 @@ namespace Barotrauma.Items.Components
|
|||||||
Stretch = true,
|
Stretch = true,
|
||||||
RelativeSpacing = 0.03f
|
RelativeSpacing = 0.03f
|
||||||
};
|
};
|
||||||
autopilotTickBox = new GUITickBox(new RectTransform(new Vector2(0.3f, 0.3f), paddedControlContainer.RectTransform),
|
|
||||||
TextManager.Get("SteeringAutoPilot"), style: "GUIRadioButton")
|
|
||||||
{
|
|
||||||
OnSelected = (GUITickBox box) =>
|
|
||||||
{
|
|
||||||
AutoPilot = box.Selected;
|
|
||||||
if (AutoPilot && MaintainPos)
|
|
||||||
{
|
|
||||||
posToMaintain = controlledSub == null ? item.WorldPosition : controlledSub.WorldPosition;
|
|
||||||
}
|
|
||||||
unsentChanges = true;
|
|
||||||
user = Character.Controlled;
|
|
||||||
|
|
||||||
maintainPosTickBox = new GUITickBox(new RectTransform(new Vector2(0.2f, 0.2f), paddedAutoPilotControls.RectTransform),
|
maintainPosTickBox = new GUITickBox(new RectTransform(new Vector2(0.2f, 0.2f), paddedAutoPilotControls.RectTransform),
|
||||||
TextManager.Get("SteeringMaintainPos"), font: GUI.SmallFont)
|
TextManager.Get("SteeringMaintainPos"), font: GUI.SmallFont)
|
||||||
|
|||||||
+6
@@ -346,6 +346,12 @@ namespace Barotrauma.Networking
|
|||||||
Write(msg, eventsToSync, out sentEvents, client);
|
Write(msg, eventsToSync, out sentEvents, client);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foreach (NetEntityEvent entityEvent in sentEvents)
|
||||||
|
{
|
||||||
|
(entityEvent as ServerEntityEvent).Sent = true;
|
||||||
|
client.EntityEventLastSent[entityEvent.ID] = NetTime.Now;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (NetEntityEvent entityEvent in sentEvents)
|
foreach (NetEntityEvent entityEvent in sentEvents)
|
||||||
{
|
{
|
||||||
(entityEvent as ServerEntityEvent).Sent = true;
|
(entityEvent as ServerEntityEvent).Sent = true;
|
||||||
|
|||||||
@@ -797,6 +797,7 @@ namespace Barotrauma
|
|||||||
{
|
{
|
||||||
UpdateLimbAttack(deltaTime, AttackingLimb, attackSimPos, distance);
|
UpdateLimbAttack(deltaTime, AttackingLimb, attackSimPos, distance);
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool SteerThroughGap(Structure wall, WallSection section, Vector2 targetWorldPos, float deltaTime)
|
private bool SteerThroughGap(Structure wall, WallSection section, Vector2 targetWorldPos, float deltaTime)
|
||||||
@@ -1215,16 +1216,7 @@ namespace Barotrauma
|
|||||||
valueModifier = isOutdoor ? 1 : 0;
|
valueModifier = isOutdoor ? 1 : 0;
|
||||||
valueModifier *= isOpen ? 5 : 1;
|
valueModifier *= isOpen ? 5 : 1;
|
||||||
}
|
}
|
||||||
}
|
for (int i = 0; i < s.Sections.Length; i++)
|
||||||
}
|
|
||||||
else if (target.Entity is Structure s)
|
|
||||||
{
|
|
||||||
targetingTag = "wall";
|
|
||||||
if (aggressiveBoarding)
|
|
||||||
{
|
|
||||||
// Ignore walls when inside.
|
|
||||||
valueModifier = character.CurrentHull == null ? 2 : 0;
|
|
||||||
if (valueModifier > 0)
|
|
||||||
{
|
{
|
||||||
valueModifier = isOutdoor ? 0 : 1;
|
valueModifier = isOutdoor ? 0 : 1;
|
||||||
valueModifier *= isOpen ? 0 : 1;
|
valueModifier *= isOpen ? 0 : 1;
|
||||||
@@ -1246,11 +1238,6 @@ namespace Barotrauma
|
|||||||
|
|
||||||
valueModifier *= targetingPriorities[targetingTag].Priority;
|
valueModifier *= targetingPriorities[targetingTag].Priority;
|
||||||
|
|
||||||
if (targetingTag == null) continue;
|
|
||||||
if (!targetingPriorities.ContainsKey(targetingTag)) continue;
|
|
||||||
|
|
||||||
valueModifier *= targetingPriorities[targetingTag].Priority;
|
|
||||||
|
|
||||||
if (valueModifier == 0.0f) continue;
|
if (valueModifier == 0.0f) continue;
|
||||||
|
|
||||||
Vector2 toTarget = target.WorldPosition - character.WorldPosition;
|
Vector2 toTarget = target.WorldPosition - character.WorldPosition;
|
||||||
|
|||||||
@@ -587,6 +587,39 @@ namespace Barotrauma
|
|||||||
|
|
||||||
AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
|
AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
|
||||||
|
|
||||||
|
if (sprite == null)
|
||||||
|
{
|
||||||
|
DebugConsole.ThrowError("Item \"" + Name + "\" has no sprite!");
|
||||||
|
#if SERVER
|
||||||
|
sprite = new Sprite("", Vector2.Zero);
|
||||||
|
sprite.SourceRect = new Rectangle(0, 0, 32, 32);
|
||||||
|
#else
|
||||||
|
sprite = new Sprite(TextureLoader.PlaceHolderTexture, null, null)
|
||||||
|
{
|
||||||
|
Origin = TextureLoader.PlaceHolderTexture.Bounds.Size.ToVector2() / 2
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
size = sprite.size;
|
||||||
|
sprite.EntityID = identifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!category.HasFlag(MapEntityCategory.Legacy) && string.IsNullOrEmpty(identifier))
|
||||||
|
{
|
||||||
|
DebugConsole.ThrowError(
|
||||||
|
"Item prefab \"" + name + "\" has no identifier. All item prefabs have a unique identifier string that's used to differentiate between items during saving and loading.");
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(identifier))
|
||||||
|
{
|
||||||
|
MapEntityPrefab existingPrefab = List.Find(e => e.Identifier == identifier);
|
||||||
|
if (existingPrefab != null)
|
||||||
|
{
|
||||||
|
DebugConsole.ThrowError(
|
||||||
|
"Map entity prefabs \"" + name + "\" and \"" + existingPrefab.Name + "\" have the same identifier!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
|
||||||
|
|
||||||
List.Add(this);
|
List.Add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -533,30 +533,6 @@ namespace Barotrauma
|
|||||||
{
|
{
|
||||||
maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
|
maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (minX < 0.0f && maxX > Level.Loaded.Size.X)
|
|
||||||
{
|
|
||||||
//no walls found at either side, just use the initial spawnpos and hope for the best
|
|
||||||
}
|
|
||||||
else if (minX < 0)
|
|
||||||
{
|
|
||||||
//no wall found at the left side, spawn to the left from the right-side wall
|
|
||||||
spawnPos.X = maxX - minWidth - 100.0f;
|
|
||||||
}
|
|
||||||
else if (maxX > Level.Loaded.Size.X)
|
|
||||||
{
|
|
||||||
//no wall found at right side, spawn to the right from the left-side wall
|
|
||||||
spawnPos.X = minX + minWidth + 100.0f;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//walls found at both sides, use their midpoint
|
|
||||||
spawnPos.X = (minX + maxX) / 2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (minX < 0.0f && maxX > Level.Loaded.Size.X)
|
if (minX < 0.0f && maxX > Level.Loaded.Size.X)
|
||||||
|
|||||||
Reference in New Issue
Block a user