Unstable 0.1300.0.9

2021-04-13 16:58:13 +03:00
parent 86597456ca
commit f48dfb5862
30 changed files with 245 additions and 57 deletions
@@ -354,6 +354,7 @@ namespace Barotrauma
 #if DEBUG
                        DebugConsole.NewMessage($"{character.Name}: Cannot find an item with the following identifier(s) or tag(s): {string.Join(", ", identifiersOrTags)}", Color.Yellow);
 #endif
+                        SpeakCannotFind();
                        Abandon = true;
                    }
                }
@@ -415,6 +416,24 @@ namespace Barotrauma
 #if DEBUG
            DebugConsole.NewMessage($"{character.Name}: Get item failed to reach {moveToTarget}", Color.Yellow);
 #endif
+        }
+
+        private void SpeakCannotFind()
+        {
+            // TODO: Use the item name as the variable here.
+            if (character.IsOnPlayerTeam && objectiveManager.CurrentOrder == objectiveManager.CurrentObjective)
+            {
+                string msg = TextManager.Get("dialogcannotreachtarget", true);
+                if (msg != null)
+                {
+                    character.Speak(msg, identifier: "dialogcannotfinditem", minDurationBetweenSimilar: 20.0f);
+                }
+            }
+        }
+
+        // TODO: remove?
+        private void SpeakCannotReach()
+        {
            if (character.IsOnPlayerTeam && objectiveManager.CurrentOrder == objectiveManager.CurrentObjective)
            {
                string TargetName = (moveToTarget as MapEntity)?.Name ?? (moveToTarget as Character)?.Name ?? moveToTarget.ToString();