From 66a7822f9ad8362b9a2be9900cfdcf546aa3a6d9 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 13 Mar 2023 20:23:28 +0200 Subject: [PATCH 1/5] Update bug_report.yml --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 188cbcbe6..841031474 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -52,9 +52,7 @@ body: label: Version description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu. options: - - 0.21.6.0 - - 0.22.0.0 (Unstable) - - Faction/endgame test branch + - v1.0.7.0 - Other validations: required: true From b8ed7a9ba440f883bb570c0dfdde8fc263787e71 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Tue, 14 Mar 2023 16:46:59 +0200 Subject: [PATCH 2/5] Update bug_report.yml --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 841031474..c9f28dfc4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -53,6 +53,7 @@ body: description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu. options: - v1.0.7.0 + - Unstable (v1.1.2.0) - Other validations: required: true From d5df588064b8a89d08bd96847827710e90c9ffc5 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 15 Mar 2023 19:22:21 +0200 Subject: [PATCH 3/5] Update bug_report.yml --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index c9f28dfc4..03f6ecfdf 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -53,7 +53,7 @@ body: description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu. options: - v1.0.7.0 - - Unstable (v1.1.2.0) + - Unstable (v1.1.3.0) - Other validations: required: true From b934dda228cb0d228646e2843cd5f07c7903ba4a Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Thu, 16 Mar 2023 17:00:21 +0200 Subject: [PATCH 4/5] v1.0.8.0 (Hotfix) --- .../BarotraumaClient/ClientSource/GUI/GUI.cs | 3 ++- .../BarotraumaClient/ClientSource/Map/Map/Map.cs | 14 ++++++++------ Barotrauma/BarotraumaClient/LinuxClient.csproj | 2 +- Barotrauma/BarotraumaClient/MacClient.csproj | 2 +- Barotrauma/BarotraumaClient/WindowsClient.csproj | 2 +- Barotrauma/BarotraumaServer/LinuxServer.csproj | 2 +- Barotrauma/BarotraumaServer/MacServer.csproj | 2 +- Barotrauma/BarotraumaServer/WindowsServer.csproj | 2 +- .../BarotraumaShared/Data/languageoptions.xml | 2 +- .../Characters/AI/Objectives/AIObjectiveCombat.cs | 2 +- .../Map/Outposts/OutpostGenerationParams.cs | 3 ++- .../SharedSource/StatusEffects/StatusEffect.cs | 4 ++-- Barotrauma/BarotraumaShared/changelog.txt | 10 ++++++++++ 13 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs index 641c6e3aa..838c2ee27 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs @@ -2587,10 +2587,11 @@ namespace Barotrauma public static void AddMessage(string message, Color color, float? lifeTime = null, bool playSound = true, GUIFont font = null) { + var guiMessage = new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont); lock (mutex) { if (messages.Any(msg => msg.Text == message)) { return; } - messages.Add(new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont)); + messages.Add(guiMessage); } if (playSound) { SoundPlayer.PlayUISound(GUISoundType.UIMessage); } } diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs index 18f4b34a4..b150f9b64 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs @@ -1147,12 +1147,14 @@ namespace Barotrauma unlockFaction = GameMain.GameSession.Campaign.Factions.Find(f => f.Prefab.Identifier == unlockEvent.Faction); unlockReputation = unlockFaction?.Reputation; } - - DrawIcon( - "LockedLocationConnection", (int)(28 * zoom), - RichString.Rich(TextManager.GetWithVariables(unlockEvent.UnlockPathTooltip ?? "LockedPathTooltip", - ("[requiredreputation]", Reputation.GetFormattedReputationText(MathUtils.InverseLerp(unlockReputation.MinReputation, unlockReputation.MaxReputation, unlockEvent.UnlockPathReputation), unlockEvent.UnlockPathReputation, addColorTags: true)), - ("[currentreputation]", unlockReputation.GetFormattedReputationText(addColorTags: true))))); + if (unlockReputation != null) + { + DrawIcon( + "LockedLocationConnection", (int)(28 * zoom), + RichString.Rich(TextManager.GetWithVariables(unlockEvent.UnlockPathTooltip ?? "LockedPathTooltip", + ("[requiredreputation]", Reputation.GetFormattedReputationText(MathUtils.InverseLerp(unlockReputation.MinReputation, unlockReputation.MaxReputation, unlockEvent.UnlockPathReputation), unlockEvent.UnlockPathReputation, addColorTags: true)), + ("[currentreputation]", unlockReputation.GetFormattedReputationText(addColorTags: true))))); + } } else { diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj index 578a3a4f2..de81b72cf 100644 --- a/Barotrauma/BarotraumaClient/LinuxClient.csproj +++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 1.0.7.0 + 1.0.8.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj index 92f2c619e..c555b58ce 100644 --- a/Barotrauma/BarotraumaClient/MacClient.csproj +++ b/Barotrauma/BarotraumaClient/MacClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 1.0.7.0 + 1.0.8.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj index ec949fa63..f9a76d377 100644 --- a/Barotrauma/BarotraumaClient/WindowsClient.csproj +++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 1.0.7.0 + 1.0.8.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj index 309ef1a8d..db3e2e713 100644 --- a/Barotrauma/BarotraumaServer/LinuxServer.csproj +++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 1.0.7.0 + 1.0.8.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj index 9ed219df2..555e2504d 100644 --- a/Barotrauma/BarotraumaServer/MacServer.csproj +++ b/Barotrauma/BarotraumaServer/MacServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 1.0.7.0 + 1.0.8.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj index 1ac03d6a3..1df6a27dd 100644 --- a/Barotrauma/BarotraumaServer/WindowsServer.csproj +++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 1.0.7.0 + 1.0.8.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaShared/Data/languageoptions.xml b/Barotrauma/BarotraumaShared/Data/languageoptions.xml index f1fdbe04b..c104ddc2e 100644 --- a/Barotrauma/BarotraumaShared/Data/languageoptions.xml +++ b/Barotrauma/BarotraumaShared/Data/languageoptions.xml @@ -18,5 +18,5 @@