Unstable 1.8.4.0

This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
@@ -50,9 +50,12 @@ namespace Barotrauma
if (OrderedCharacter.AIController is HumanAIController humanAI &&
humanAI.ObjectiveManager.CurrentOrders.None(o => o.MatchesOrder(SuggestedOrder.Identifier, Option) && o.TargetEntity == TargetItem))
{
if (orderedCharacter != CommandingCharacter)
bool orderGivenByDifferentCharacter = orderedCharacter != CommandingCharacter;
if (orderGivenByDifferentCharacter)
{
CommandingCharacter.Speak(SuggestedOrder.GetChatMessage(OrderedCharacter.Name, "", givingOrderToSelf: false), minDurationBetweenSimilar: 5);
CommandingCharacter.Speak(SuggestedOrder.GetChatMessage(OrderedCharacter.Name, "", givingOrderToSelf: false),
minDurationBetweenSimilar: 5,
identifier: ("GiveOrder." + SuggestedOrder.Prefab.Identifier).ToIdentifier());
}
CurrentOrder = SuggestedOrder
.WithOption(Option)
@@ -60,7 +63,12 @@ namespace Barotrauma
.WithOrderGiver(CommandingCharacter)
.WithManualPriority(CharacterInfo.HighestManualOrderPriority);
OrderedCharacter.SetOrder(CurrentOrder, CommandingCharacter != OrderedCharacter);
OrderedCharacter.Speak(TextManager.Get("DialogAffirmative").Value, delay: 1.0f, minDurationBetweenSimilar: 5);
if (orderGivenByDifferentCharacter)
{
OrderedCharacter.Speak(TextManager.Get("DialogAffirmative").Value, delay: 1.0f,
minDurationBetweenSimilar: 5,
identifier: ("ReceiveOrder." + SuggestedOrder.Prefab.Identifier).ToIdentifier());
}
}
TimeSinceLastAttempt = 0f;
}