vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse Source
This commit is contained in:
EvilFactory
2024-04-26 12:31:21 -03:00
parent bfca2816c3 848113b8cb
commit b98dec4c3b
16 changed files with 97 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItem.cs
+1 -1
View File
@@ -123,7 +123,7 @@ namespace Barotrauma
{
Abandon = true;
}
else if (item.ParentInventory != null)
else if (item.ParentInventory != null && item.GetRootInventoryOwner() != character)
{
if (!objectiveManager.HasOrder<AIObjectiveCleanupItems>())
{
Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItem.cs
+1 -1
View File
@@ -368,7 +368,7 @@ namespace Barotrauma
return new AIObjectiveGoTo(moveToTarget, character, objectiveManager, repeat: false, getDivingGearIfNeeded: AllowToFindDivingGear, closeEnough: DefaultReach)
{
// If the root container changes, the item is no longer where it was (taken by someone -> need to find another item)
AbortCondition = obj => targetItem == null || targetItem.GetRootInventoryOwner() != moveToTarget,
AbortCondition = obj => targetItem == null || (targetItem.GetRootInventoryOwner() is Entity owner && owner != moveToTarget && owner != character),
SpeakIfFails = false,
endNodeFilter = CreateEndNodeFilter(moveToTarget)
};
Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs
+6
View File
@@ -350,6 +350,12 @@ namespace Barotrauma.Networking
if (serverMessageText == val) { return; }
#if SERVER
GameMain.Server?.SendChatMessage(TextManager.AddPunctuation(':', TextManager.Get("servermotd"), val).Value, ChatMessageType.Server);
#elif CLIENT
if (GameMain.NetLobbyScreen.ServerMessageButton is { } serverMessageButton)
{
serverMessageButton.Flash(GUIStyle.Green);
serverMessageButton.Pulsate(Vector2.One, Vector2.One * 1.2f, 1.0f);
}
#endif
serverMessageText = val;
ServerDetailsChanged = true;
Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
+8 -8
View File
@@ -1129,16 +1129,16 @@ namespace Barotrauma
{
if (!file.TryGet(out ContentPath _) || (file.TryGet(out ContentPath contentPath) && contentPath.IsNullOrWhiteSpace()))
{
DebugConsole.ThrowError($"Error in a <TriggerAnimation> element of {subElement.ParseContentPathFromUri()}: neither path nor filename defined!");
DebugConsole.ThrowError($"Error in a <TriggerAnimation> element of {subElement.ParseContentPathFromUri()}: neither path nor filename defined!",
contentPackage: subElement.ContentPackage);
break;
}
}
else
{
float priority = subElement.GetAttributeFloat("priority", def: 0f);
Identifier[] expectedSpeciesNames = subElement.GetAttributeIdentifierArray("expectedspecies", Array.Empty<Identifier>());
animationsToTrigger ??= new List<AnimLoadInfo>();
animationsToTrigger.Add(new AnimLoadInfo(animType, file, priority, expectedSpeciesNames.ToImmutableArray()));
}
float priority = subElement.GetAttributeFloat("priority", def: 0f);
Identifier[] expectedSpeciesNames = subElement.GetAttributeIdentifierArray("expectedspecies", Array.Empty<Identifier>());
animationsToTrigger ??= new List<AnimLoadInfo>();
animationsToTrigger.Add(new AnimLoadInfo(animType, file, priority, expectedSpeciesNames.ToImmutableArray()));
break;
}
}