From aea21aa9d43f70732464bcf52752d7e0a906a898 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 23 May 2019 15:13:40 +0300 Subject: [PATCH] (1587318e9) Don't show the combat mission success text if it hasn't been translated --- .../Source/GameSession/RoundSummary.cs | 36 ++++++++++--------- .../Source/Events/Missions/CombatMission.cs | 5 ++- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs b/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs index 2d6ebcfec..415232fa0 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/RoundSummary.cs @@ -61,25 +61,27 @@ namespace Barotrauma } //don't show the mission info if the mission was not completed and there's no localized "mission failed" text available - if (GameMain.GameSession.Mission != null && - (GameMain.GameSession.Mission.Completed || !string.IsNullOrEmpty(GameMain.GameSession.Mission.FailureMessage))) + if (GameMain.GameSession.Mission != null) { - //spacing - new GUIFrame(new RectTransform(new Vector2(1.0f, 0.1f), infoTextBox.Content.RectTransform), style: null); - - new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform), - TextManager.AddPunctuation(':', TextManager.Get("Mission"), GameMain.GameSession.Mission.Name), - font: GUI.LargeFont); - - var missionInfo = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform), - GameMain.GameSession.Mission.Completed ? GameMain.GameSession.Mission.SuccessMessage : GameMain.GameSession.Mission.FailureMessage, - wrap: true); - - if (GameMain.GameSession.Mission.Completed && singleplayer) + string message = GameMain.GameSession.Mission.Completed ? GameMain.GameSession.Mission.SuccessMessage : GameMain.GameSession.Mission.FailureMessage; + if (!string.IsNullOrEmpty(message)) { - var missionReward = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform), - TextManager.Get("MissionReward").Replace("[reward]", GameMain.GameSession.Mission.Reward.ToString())); - } + //spacing + new GUIFrame(new RectTransform(new Vector2(1.0f, 0.1f), infoTextBox.Content.RectTransform), style: null); + + new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform), + TextManager.AddPunctuation(':', TextManager.Get("Mission"), GameMain.GameSession.Mission.Name), + font: GUI.LargeFont); + + var missionInfo = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform), + message, wrap: true); + + if (GameMain.GameSession.Mission.Completed && singleplayer) + { + var missionReward = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform), + TextManager.Get("MissionReward").Replace("[reward]", GameMain.GameSession.Mission.Reward.ToString())); + } + } } foreach (GUIComponent child in infoTextBox.Content.Children) diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs index 550face51..09abef077 100644 --- a/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs +++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs @@ -36,7 +36,10 @@ namespace Barotrauma { get { - if (Winner == Character.TeamType.None) { return ""; } + if (Winner == Character.TeamType.None || string.IsNullOrEmpty(base.SuccessMessage)) { return ""; } + + //disable success message for now if it hasn't been translated + if (!TextManager.ContainsTag("MissionSuccess." + Prefab.Identifier)) { return ""; } var loser = Winner == Character.TeamType.Team1 ? Character.TeamType.Team2 :