From 3877c18d0c65647a684ce919a54f52dacdf64bcc Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 8 Apr 2019 19:18:20 +0300 Subject: [PATCH] (c15419d90) Changelog additions + merge fix --- .../Source/Characters/Character.cs | 1 - .../Source/GameSession/CrewManager.cs | 12 +------ .../Source/Screens/SubEditorScreen.cs | 18 +---------- .../AI/Objectives/AIObjectiveIdle.cs | 2 +- .../AI/Objectives/AIObjectiveManager.cs | 1 - Barotrauma/BarotraumaShared/changelog.txt | 32 ++++++++++++++++++- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs index d7732124d..4e611d6a6 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs @@ -136,7 +136,6 @@ namespace Barotrauma break; } } - } hudProgressBars = new Dictionary(); } diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs index 6b9d55aee..32af88417 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs @@ -271,10 +271,6 @@ namespace Barotrauma DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace); return; } - } - - characterInfos.Add(characterInfo); - } characterInfos.Add(characterInfo); } @@ -602,7 +598,7 @@ namespace Barotrauma characterListBox.BarScroll = roundedPos; } - return radioItem.GetComponent(); + return false; } private IEnumerable KillCharacterAnim(GUIComponent component) @@ -615,12 +611,6 @@ namespace Barotrauma { comp.Color = Color.DarkRed; } - List availableSpeakers = Character.CharacterList.FindAll(c => - c.AIController is HumanAIController && - !c.IsDead && - c.SpeechImpediment <= 100.0f); - pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers)); - } yield return new WaitForSeconds(1.0f); diff --git a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs index 1490f9866..52ac33d4a 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs @@ -1403,23 +1403,7 @@ namespace Barotrauma private void TryDeleteSub(Submarine sub) { - if (sub == null) { return; } - - if (sub.IsVanillaSubmarine()) - { - GUI.AddMessage(TextManager.Get("CannotEditVanillaSubs"), Color.Red, font: GUI.LargeFont); - return; - } - - string pathToCompare = sub.FilePath.Replace(@"\", @"/").ToLowerInvariant(); - foreach (ContentPackage cp in ContentPackage.List) - { - if (cp.Files.Any(f => f.Path.Replace(@"\", @"/").ToLowerInvariant() == pathToCompare)) - { - new GUIMessageBox("", TextManager.Get("CannotRemoveContentPackageSub").Replace("[contentpackage]", cp.Name)); - return; - } - } + if (sub == null) return; var msgBox = new GUIMessageBox( TextManager.Get("DeleteDialogLabel"), diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs index c0bdb1a15..865f18203 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs @@ -207,7 +207,7 @@ namespace Barotrauma PathSteering.SteeringManual(deltaTime, Vector2.UnitX * MathHelper.Clamp(speed, 0.25f, 1)); PathSteering.WanderAngle = 0.0f; } - else + else if (rightDist < WallAvoidDistance) { float speed = (WallAvoidDistance - rightDist) / WallAvoidDistance; PathSteering.SteeringManual(deltaTime, -Vector2.UnitX * MathHelper.Clamp(speed, 0.25f, 1)); diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs index 3a08bc8e3..0d22a0905 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Barotrauma.Extensions; namespace Barotrauma { diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt index c255258ca..6b8d67057 100644 --- a/Barotrauma/BarotraumaShared/changelog.txt +++ b/Barotrauma/BarotraumaShared/changelog.txt @@ -1,3 +1,34 @@ +--------------------------------------------------------------------------------------------------------- +v0.8.9.10 +--------------------------------------------------------------------------------------------------------- + +Additions and changes: +- Added collision sounds to items (e.g. when dropping or throwing items on the floor). +- Devices that are not currently being used never deteriorate spontaneously. +- Added a new submarine, "Berilia". +- Minor improvements to menu layouts. +- Randomize map seed when opening the "new game" tab. +- Show the "starting a round" popup to all clients when the server initiates a new round. + +Bugfixes: +- Fixed submarines not being able to move horizontally in multiplayer if not accelerating fast enough. +- Fixed idling AI characters causing lag spikes if they can't find a path out of the room they're inside or +if the submarine has no waypoints. +- Fixes to AI characters getting stuck if they fail to reach a leak they're trying to repair. +- Fixed characters "selecting" equipped railgun shells and depth charges, causing the characters to face +towards the item. +- Fixed highlighted items being selected when letting go of the Shoot button. +- Fixed inputs still working in multiplayer when the pause menu or the settings menu is open. +- Fixed some Steam achievements being impossible to unlock in single player. +- Fixed "Poisoner" Steam achievement being impossible to unlock. +- Fixed crashing when enabling game mode voting in multiplayer. +- Fixed voice chat volume not being applied on startup (i.e. the default volume was always used until you +went back to the settings menu to change it). +- Fixed power not working correctly in some grids with chained relays and junction boxes. +- Fixed crashing when attempting to publish a sub with a preview image larger than 1MB on the Steam Workshop. +- Don't allow overwriting vanilla submarines/characters even if the vanilla content package is not selected. +- Don't allow deleting vanilla subs or subs that are a part of some content package through the sub editor. + --------------------------------------------------------------------------------------------------------- v0.8.9.9 --------------------------------------------------------------------------------------------------------- @@ -46,7 +77,6 @@ picking up items that require two hands. - Slightly reduced the amount of oxygen characters consume from hulls. - Enemies don't attack outposts or targets inside it anymore. - Multiplayer fixes: - Fixed characters retaining the last known inputs when a client disconnects, causing the character to keep welding, honking a bike horn or whatever else they were doing until the server kills the character.