From 81f57ea3e70ce4672225066c05b0cfa84bc1c89c Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 13 May 2026 13:37:43 +0300 Subject: [PATCH 1/3] Add unstable version option to bug report template --- .github/DISCUSSION_TEMPLATE/bug-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/DISCUSSION_TEMPLATE/bug-reports.yml b/.github/DISCUSSION_TEMPLATE/bug-reports.yml index 71271780c..ec9c8b991 100644 --- a/.github/DISCUSSION_TEMPLATE/bug-reports.yml +++ b/.github/DISCUSSION_TEMPLATE/bug-reports.yml @@ -74,6 +74,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.12.6.2 (Spring Update 2026) + - Unstable v1.13.1.0 - Other validations: required: true From 1cd0178e0a753beb4c9f11567de85f4e339cf3f8 Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Tue, 16 Jun 2026 15:35:36 +0300 Subject: [PATCH 2/3] v1.13.3.1 (Summer Update 2026) --- .../Characters/Health/CharacterHealth.cs | 18 +- .../ClientSource/DebugConsole.cs | 33 ++- .../BarotraumaClient/ClientSource/GUI/GUI.cs | 11 +- .../ClientSource/GUI/GUITextBox.cs | 8 +- .../ClientSource/GUI/LoadingScreen.cs | 5 +- .../BarotraumaClient/ClientSource/GameMain.cs | 6 + .../ClientSource/Items/CharacterInventory.cs | 7 +- .../Items/Components/Machines/Controller.cs | 2 +- .../Components/Power/PowerDistributor.cs | 50 ++++- .../ClientSource/Items/Components/Turret.cs | 14 +- .../ClientSource/Items/Inventory.cs | 30 +-- .../BackgroundCreatures/BackgroundCreature.cs | 4 +- .../BackgroundCreatureManager.cs | 56 +---- .../ClientSource/Map/Levels/Level.cs | 2 +- .../Map/Levels/LevelObjects/LevelObject.cs | 2 +- .../Levels/LevelObjects/LevelObjectManager.cs | 203 ++++++++++++------ .../ClientSource/Map/Levels/LevelRenderer.cs | 16 +- .../ClientSource/Networking/GameClient.cs | 8 +- .../Networking/Voip/VoipClient.cs | 15 +- .../Screens/MainMenuScreen/MainMenuScreen.cs | 29 ++- .../ClientSource/Screens/SubEditorScreen.cs | 161 ++++++++++---- .../Serialization/SerializableEntityEditor.cs | 4 +- .../ClientSource/Steam/RemoteStorageHelper.cs | 34 +++ .../BarotraumaClient/LinuxClient.csproj | 2 +- Barotrauma/BarotraumaClient/MacClient.csproj | 2 +- .../BarotraumaClient/WindowsClient.csproj | 2 +- .../BarotraumaServer/LinuxServer.csproj | 2 +- Barotrauma/BarotraumaServer/MacServer.csproj | 2 +- .../ServerSource/DebugConsole.cs | 23 +- .../GameModes/MultiPlayerCampaign.cs | 1 + .../ServerSource/Items/Inventory.cs | 9 +- .../ServerSource/Networking/ChatMessage.cs | 14 +- .../ServerSource/Networking/GameServer.cs | 5 +- .../ServerEntityEventManager.cs | 2 +- .../Networking/Voip/VoipServer.cs | 9 +- .../BarotraumaServer/WindowsServer.csproj | 2 +- .../RotationAndFlippingTests.sub | Bin 13119 -> 13521 bytes .../StatusEffectAndLightTest.xml | 64 ++++++ .../SharedSource/AchievementManager.cs | 3 +- .../Characters/AI/EnemyAIController.cs | 30 ++- .../Characters/AI/HumanAIController.cs | 65 +++--- .../Objectives/AIObjectiveExtinguishFire.cs | 2 +- .../AI/Objectives/AIObjectiveRepairItem.cs | 10 + .../SharedSource/Characters/Attack.cs | 5 + .../SharedSource/Characters/Character.cs | 26 ++- .../SharedSource/Characters/Limb.cs | 19 +- ...erAbilityUnlockApprenticeshipTalentTree.cs | 4 +- .../Characters/Talents/TalentTree.cs | 12 +- .../SharedSource/DebugConsole.cs | 106 +++++++-- .../Events/EventActions/EventAction.cs | 7 +- .../Events/EventActions/TagAction.cs | 11 +- .../Items/Components/Holdable/Holdable.cs | 13 +- .../Items/Components/Holdable/Pickable.cs | 6 +- .../LinkedControllerCharacterComponent.cs | 15 ++ .../Items/Components/Machines/Controller.cs | 2 +- .../Components/Machines/Deconstructor.cs | 5 +- .../Items/Components/Machines/Fabricator.cs | 29 ++- .../Components/Power/PowerDistributor.cs | 3 +- .../Items/Components/TriggerComponent.cs | 4 +- .../SharedSource/Items/ItemPrefab.cs | 4 +- .../SharedSource/Map/Levels/Level.cs | 34 ++- .../Map/Levels/LevelObjects/LevelObject.cs | 2 +- .../Levels/LevelObjects/LevelObjectManager.cs | 2 +- .../SharedSource/Map/Map/Location.cs | 15 +- .../SharedSource/Map/Map/LocationType.cs | 12 ++ .../SharedSource/Map/Map/Map.cs | 44 +++- .../SharedSource/Map/Structure.cs | 12 +- .../SharedSource/Map/SubmarineInfo.cs | 27 +++ .../SharedSource/Settings/GameSettings.cs | 22 +- .../StatusEffects/StatusEffect.cs | 2 +- .../SharedSource/Steam/RemoteStorageHelper.cs | 105 +++++++++ Barotrauma/BarotraumaShared/changelog.txt | 54 +++++ CONTRIBUTING.md | 2 +- 73 files changed, 1165 insertions(+), 406 deletions(-) create mode 100644 Barotrauma/BarotraumaClient/ClientSource/Steam/RemoteStorageHelper.cs create mode 100644 Barotrauma/BarotraumaShared/SharedSource/Steam/RemoteStorageHelper.cs diff --git a/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs index 9e38c0b43..4378be8fd 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs @@ -258,7 +258,9 @@ namespace Barotrauma //RelativeSpacing = 0.05f }; - InventorySlotContainer = new GUICustomComponent(new RectTransform(new Vector2(0.1f, 1.0f), characterIndicatorArea.RectTransform, Anchor.TopLeft, Pivot.TopRight), + GUIFrame left = new(new RectTransform(new Vector2(0.25f, 1f), characterIndicatorArea.RectTransform), style: null); + + InventorySlotContainer = new GUICustomComponent(new RectTransform(Vector2.One, left.RectTransform), (spriteBatch, component) => { for (int i = 0; i < character.Inventory.Capacity; i++) @@ -266,6 +268,10 @@ namespace Barotrauma if (character.Inventory.SlotTypes[i] != InvSlotType.HealthInterface) { continue; } if (character.Inventory.HideSlot(i)) { continue; } + int width = Character.Inventory.visualSlots[i].Rect.Width; + left.RectTransform.MinSize = new Point(width, left.RectTransform.MinSize.Y); + if (afflictionIconList != null) { afflictionIconList.RectTransform.MinSize = new Point(width, afflictionIconList.RectTransform.MinSize.Y); } + //don't draw the item if it's being dragged out of the slot bool drawItem = !Inventory.DraggingItems.Any() || !Character.Inventory.GetItemsAt(i).All(it => Inventory.DraggingItems.Contains(it)) || character.Inventory.visualSlots[i].MouseOn(); @@ -292,8 +298,7 @@ namespace Barotrauma } }); - - cprButton = new GUIButton(new RectTransform(new Vector2(0.17f, 0.17f), characterIndicatorArea.RectTransform, Anchor.BottomLeft, scaleBasis: ScaleBasis.Smallest), text: "", style: "CPRButton") + cprButton = new GUIButton(new RectTransform(new Vector2(0.75f), left.RectTransform, Anchor.BottomLeft, scaleBasis: ScaleBasis.Smallest), text: "", style: "CPRButton") { UserData = UIHighlightAction.ElementId.CPRButton, OnClicked = (button, userData) => @@ -316,12 +321,11 @@ namespace Barotrauma return true; }, - ToolTip = TextManager.Get("doctor.cprobjective"), - IgnoreLayoutGroups = true, + ToolTip = TextManager.Get("tutorial.roles.medic.objective.cpr"), Visible = false }; - var limbSelection = new GUICustomComponent(new RectTransform(new Vector2(0.4f, 1.0f), characterIndicatorArea.RectTransform), + var limbSelection = new GUICustomComponent(new RectTransform(new Vector2(0.5f, 1.0f), characterIndicatorArea.RectTransform), (spriteBatch, component) => { DrawHealthWindow(spriteBatch, component.RectTransform.Rect, true); @@ -368,8 +372,6 @@ namespace Barotrauma CanBeFocused = false }; - characterIndicatorArea.Recalculate(); - healthBarHolder = new GUIFrame(new RectTransform(Point.Zero, GUI.Canvas), style: null) { HoverCursor = CursorState.Hand diff --git a/Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs b/Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs index 360038eed..f5a4a88b5 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs @@ -865,7 +865,20 @@ namespace Barotrauma GameSettings.SaveCurrentConfig(); }); }, isCheat: false)); - + + commands.Add(new Command("togglespoofeventmanagerid", "togglespoofeventmanagerid: Forces the client to report the last received event ID as always being 1, making the server believe the client is always behind.", (string[] args) => + { + if (GameMain.Client != null) + { + GameMain.Client.SpoofEntityManagerReceivedId = !GameMain.Client.SpoofEntityManagerReceivedId; + DebugConsole.NewMessage(GameMain.Client.SpoofEntityManagerReceivedId ? "Spoofing enabled ": "Spoofing disabled", Color.Green); + } + else + { + DebugConsole.NewMessage("Not connected to server", Color.Red); + } + })); + commands.Add(new Command("togglegrid", "Toggle visual snap grid in sub editor.", (string[] args) => { SubEditorScreen.ShouldDrawGrid = !SubEditorScreen.ShouldDrawGrid; @@ -4444,17 +4457,24 @@ namespace Barotrauma public static void StartLocalMPSession(int numClients = 2) { + string extraArguments = "-multiclienttestmode"; + if (NetConfig.UseLenientHandshake) + { + extraArguments += " -lenienthandshake"; + } + try { if (Process.GetProcessesByName("DedicatedServer").Length == 0) { #if WINDOWS - Process.Start("DedicatedServer.exe", arguments: "-multiclienttestmode"); + Process.Start("DedicatedServer.exe", arguments: extraArguments); #else - Process.Start("./DedicatedServer", arguments: "-multiclienttestmode"); + Process.Start("./DedicatedServer", arguments: extraArguments); #endif System.Threading.Thread.Sleep(1000); } + #if DEBUG GameClient.MultiClientTestMode = true; #endif @@ -4468,10 +4488,13 @@ namespace Barotrauma for (int i = 2; i <= numClients; i++) { System.Threading.Thread.Sleep(1000); + + string clientArguments = $"-connect server localhost -username client{i} -skipintro"; + #if WINDOWS - Process.Start("Barotrauma.exe", arguments: "-connect server localhost -username client" + i + " -multiclienttestmode"); + Process.Start("Barotrauma.exe", arguments: $"{clientArguments} {extraArguments}"); #else - Process.Start("./Barotrauma", arguments: "-connect server localhost -username client" + i + " -multiclienttestmode"); + Process.Start("./Barotrauma", arguments: $"{clientArguments} {extraArguments}"); #endif } } diff --git a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs index bf67f7b93..6d9628061 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs @@ -14,6 +14,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; using System.Collections.Immutable; +using System.Diagnostics.CodeAnalysis; namespace Barotrauma { @@ -649,12 +650,12 @@ namespace Barotrauma DrawMessages(spriteBatch, cam); if (MouseOn != null) - { + { + MouseOn.OnDrawToolTip?.Invoke(MouseOn); if (!MouseOn.ToolTip.IsNullOrWhiteSpace()) { MouseOn.DrawToolTip(spriteBatch); } - MouseOn.OnDrawToolTip?.Invoke(MouseOn); } if (SubEditorScreen.IsSubEditor()) @@ -2323,10 +2324,10 @@ namespace Barotrauma /// /// Creates a 7-segment display. /// - /// Returns if is or empty. + /// Returns if is . /// Defaults to TextManager.Get("kilowatt"). /// Defaults to . - public static GUITextBlock CreateDigitalDisplay(RectTransform rect, out GUITextBlock? leftLabel, out GUITextBlock rightLabel, LocalizedString? leftLabelText = null, LocalizedString? rightLabelText = null, LocalizedString? tooltip = null, GUIFont? leftLabelFont = null) + public static GUITextBlock CreateDigitalDisplay(RectTransform rect, [NotNullIfNotNull(nameof(leftLabelText))] out GUITextBlock? leftLabel, out GUITextBlock rightLabel, LocalizedString? leftLabelText = null, LocalizedString? rightLabelText = null, LocalizedString? tooltip = null, GUIFont? leftLabelFont = null) { GUILayoutGroup textArea = new(rect, isHorizontal: true, childAnchor: Anchor.CenterLeft) { @@ -2337,7 +2338,7 @@ namespace Barotrauma }; leftLabel = null; - if (!leftLabelText.IsNullOrEmpty()) + if (leftLabelText != null) { leftLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1f), textArea.RectTransform), leftLabelText, textColor: GUIStyle.TextColorBright, font: leftLabelFont ?? GUIStyle.LargeFont, textAlignment: Alignment.CenterRight); } diff --git a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUITextBox.cs b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUITextBox.cs index 3d0299054..af12c0da5 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GUI/GUITextBox.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GUI/GUITextBox.cs @@ -374,14 +374,14 @@ namespace Barotrauma CaretIndex = forcedCaretIndex == - 1 ? textBlock.GetCaretIndexFromScreenPos(PlayerInput.MousePosition) : forcedCaretIndex; CalculateCaretPos(); ClearSelection(); - bool wasSelected = selected; - selected = true; - GUI.KeyboardDispatcher.Subscriber = this; OnSelected?.Invoke(this, Keys.None); - if (!wasSelected && PlaySoundOnSelect && !ignoreSelectSound) + if (!selected && PlaySoundOnSelect && !ignoreSelectSound) { SoundPlayer.PlayUISound(GUISoundType.Select); } + selected = true; + //set this after we've set selected to true -> otherwise the textbox taking keyboard focus will trigger Select again + GUI.KeyboardDispatcher.Subscriber = this; } public void Deselect() diff --git a/Barotrauma/BarotraumaClient/ClientSource/GUI/LoadingScreen.cs b/Barotrauma/BarotraumaClient/ClientSource/GUI/LoadingScreen.cs index 90ca5d713..2a1cc6a0e 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GUI/LoadingScreen.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GUI/LoadingScreen.cs @@ -113,7 +113,10 @@ namespace Barotrauma spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, samplerState: GUI.SamplerState); - GUI.DrawBackgroundSprite(spriteBatch, currentBackgroundTexture, Color.White, drawArea); + if (currentBackgroundTexture.Texture != null) + { + GUI.DrawBackgroundSprite(spriteBatch, currentBackgroundTexture, Color.White, drawArea); + } overlay.Draw(spriteBatch, Vector2.Zero, scale: overlayScale); double noiseT = Timing.TotalTime * 0.02f; diff --git a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs index 36ee6950d..f70f0c8fc 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs @@ -277,6 +277,12 @@ namespace Barotrauma GameClient.MultiClientTestMode = true; } #endif + + if (ConsoleArguments.Contains("-lenienthandshake")) + { + NetConfig.UseLenientHandshake = true; + } + GUI.KeyboardDispatcher = new EventInput.KeyboardDispatcher(Window); PerformanceCounter = new PerformanceCounter(); diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/CharacterInventory.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/CharacterInventory.cs index 59e6c3f11..87086230d 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/CharacterInventory.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/CharacterInventory.cs @@ -127,12 +127,6 @@ namespace Barotrauma (int)SlotPositions[i].X, (int)SlotPositions[i].Y, (int)(slotSprite.size.X * multiplier), (int)(slotSprite.size.Y * multiplier)); - - if (SlotTypes[i] == InvSlotType.HealthInterface && - character.CharacterHealth?.InventorySlotContainer != null) - { - slotRect.Width = slotRect.Height = (int)(character.CharacterHealth.InventorySlotContainer.Rect.Width * 1.2f); - } ItemContainer itemContainer = slots[i].FirstOrDefault()?.GetComponent(); if (itemContainer != null) @@ -622,6 +616,7 @@ namespace Barotrauma for (int i = 0; i < capacity; i++) { + if (HideSlot(i)) { continue; } var item = slots[i].FirstOrDefault(); if (item != null) { diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Controller.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Controller.cs index bee454c79..95cad607a 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Controller.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Controller.cs @@ -26,7 +26,7 @@ namespace Barotrauma.Items.Components } else { - DisplayMsg = TextManager.ParseInputTypes(TextManager.Get(Msg)); + DisplayMsg = TextManager.ParseInputTypes(TextManager.Get(Msg)).Fallback(Msg); } CharacterHUD.RecreateHudTextsIfControlling(Character.Controlled); diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerDistributor.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerDistributor.cs index 91d5f5d0f..f3e6b4f6c 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerDistributor.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerDistributor.cs @@ -12,9 +12,12 @@ namespace Barotrauma.Items.Components private partial class PowerGroup { private GUIFrame? frame; + private GUIFrame? groupContent; + private GUILayoutGroup? nameGroup; private GUITextBox? nameBox; + private GUITextBlock? loadDisplayNameLabel; private GUIScrollBar? ratioSlider; - private readonly List powerUnitLabels = new List(); + private readonly List powerUnitLabels = []; private GUIFrame? divider; public bool IsVisible { get; private set; } = true; @@ -22,9 +25,9 @@ namespace Barotrauma.Items.Components public void CreateGUI() { frame = new GUIFrame(new RectTransform(new Vector2(1f, 0.25f), distributor.groupList!.Content.RectTransform, minSize: (0, 130)), style: null); - GUIFrame groupContent = new(new RectTransform(frame.Rect.Size - new Point(10), frame.RectTransform, Anchor.Center), style: null); + groupContent = new GUIFrame(new RectTransform(frame.Rect.Size - new Point(10), frame.RectTransform, Anchor.Center), style: null); - GUILayoutGroup nameGroup = new(new RectTransform(new Vector2(0.65f, 0.33f), groupContent.RectTransform, Anchor.TopLeft), isHorizontal: true, childAnchor: Anchor.CenterLeft) + nameGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.65f, 0.33f), groupContent.RectTransform, Anchor.TopLeft), isHorizontal: true, childAnchor: Anchor.CenterLeft) { Stretch = true }; @@ -37,7 +40,7 @@ namespace Barotrauma.Items.Components return true; } }; - nameBox = new GUITextBox(new RectTransform(Vector2.One, nameGroup.RectTransform), Name, font: GUIStyle.SubHeadingFont, style: "GUITextBoxNoStyle") + nameBox = new GUITextBox(new RectTransform(Vector2.One, nameGroup.RectTransform), Screen.Selected == GameMain.SubEditorScreen ? Name : DisplayName.Value, font: GUIStyle.SubHeadingFont, style: "GUITextBoxNoStyle") { MaxTextLength = MaxNameLength, OverflowClip = true, @@ -48,17 +51,40 @@ namespace Barotrauma.Items.Components return true; } }; + nameBox.OnSelected += (tb, _) => + { + if (tb.Selected) { return; } + tb.Text = Name; + }; nameBox.OnDeselected += (tb, _) => { Name = tb.Text; + tb.CaretIndex = 0; if (GameMain.Client == null) { return; } distributor.item.CreateClientEvent(distributor, new EventData(this, EventType.NameChange)); }; + nameBox.GetChild().GetChild().OnDrawToolTip = comp => + { + if (Screen.Selected != GameMain.SubEditorScreen && !nameBox.Selected) + { + comp.ToolTip = null; + return; + } + + LocalizedString localizedText = TextManager.Get(nameBox.Text); + comp.ToolTip = localizedText.IsNullOrEmpty() + ? TextManager.GetWithVariable("StringPropertyCannotTranslate", "[tag]", nameBox.Text) + : TextManager.GetWithVariable("StringPropertyTranslate", "[translation]", localizedText); + }; GUITextBlock loadDisplay = GUI.CreateDigitalDisplay(new RectTransform(new Vector2(0.35f, 0.33f), groupContent.RectTransform, Anchor.TopRight) { AbsoluteOffset = (5, 0) }, - out GUITextBlock? _, out GUITextBlock loadDisplayUnitLabel, TextManager.Get("PowerTransferLoadLabel"), tooltip: TextManager.Get("PowerTransferTipLoad"), leftLabelFont: GUIStyle.Font); + out loadDisplayNameLabel, out GUITextBlock loadDisplayUnitLabel, TextManager.Get("PowerTransferLoadLabel"), tooltip: TextManager.Get("PowerTransferTipLoad"), leftLabelFont: GUIStyle.Font); loadDisplay.TextGetter = () => MathUtils.RoundToInt(Load).ToString(); + float textAndPaddingWidth = loadDisplayNameLabel!.Font.MeasureString(loadDisplayNameLabel!.Text).X + loadDisplayNameLabel.Padding.X + loadDisplayNameLabel.Padding.Z; + float availableWidth = groupContent!.Rect.Width - loadDisplayNameLabel.Parent.Rect.Width + loadDisplayNameLabel.Rect.Width - textAndPaddingWidth; + nameGroup!.RectTransform.Resize(new Point((int)availableWidth, nameGroup.Rect.Height)); + ratioSlider = new GUIScrollBar(new RectTransform(new Vector2(1f, 0.33f), groupContent.RectTransform, Anchor.Center), barSize: 0.15f, style: "DeviceSlider") { Step = SupplyRatioStep, @@ -78,16 +104,17 @@ namespace Barotrauma.Items.Components ratioSlider.Bar.RectTransform.MaxSize = new Point(ratioSlider.Bar.Rect.Height); GUITextBlock ratioDisplay = GUI.CreateDigitalDisplay(new RectTransform(new Vector2(0.2f, 0.33f), groupContent.RectTransform, Anchor.BottomLeft), - out GUITextBlock? _, out GUITextBlock _, + out GUITextBlock? _, out GUITextBlock ratioDisplayUnitLabel, rightLabelText: "%"); ratioDisplay.TextGetter = () => DisplayRatio.ToString(); GUITextBlock outputDisplay = GUI.CreateDigitalDisplay(new RectTransform(new Vector2(0.35f, 0.33f), groupContent.RectTransform, Anchor.BottomRight) { AbsoluteOffset = (5, 0) }, - out GUITextBlock? _, out GUITextBlock outputDisplayUnitLabel, + out GUITextBlock? outputDisplayNameLabel, out GUITextBlock outputDisplayUnitLabel, TextManager.Get("powerdistributor.supplylabel"), tooltip: TextManager.Get("PowerTransferTipPower"), leftLabelFont: GUIStyle.Font); outputDisplay.TextGetter = () => distributor.IsShortCircuited(PowerOut) ? "err" : MathUtils.RoundToInt(distributor.CalculatePowerOut(this)).ToString(); powerUnitLabels.Add(loadDisplayUnitLabel); + powerUnitLabels.Add(ratioDisplayUnitLabel); powerUnitLabels.Add(outputDisplayUnitLabel); GUITextBlock.AutoScaleAndNormalize(powerUnitLabels); @@ -111,7 +138,14 @@ namespace Barotrauma.Items.Components IsVisible = PowerOut.Wires.Count >= 1; frame!.Visible = IsVisible; divider!.Visible = IsVisible && distributor.powerGroups.Last(group => group.frame!.Visible) != this; - if (distributor.prevLanguage != GameSettings.CurrentConfig.Language) { GUITextBlock.AutoScaleAndNormalize(powerUnitLabels); } + if (distributor.prevLanguage != GameSettings.CurrentConfig.Language) + { + GUITextBlock.AutoScaleAndNormalize(powerUnitLabels); + + float textAndPaddingWidth = loadDisplayNameLabel!.Font.MeasureString(loadDisplayNameLabel!.Text).X + loadDisplayNameLabel.Padding.X + loadDisplayNameLabel.Padding.Z; + float availableWidth = groupContent!.Rect.Width - loadDisplayNameLabel.Parent.Rect.Width + loadDisplayNameLabel.Rect.Width - textAndPaddingWidth; + nameGroup!.RectTransform.Resize(new Point((int)availableWidth, nameGroup.Rect.Height)); + } } } diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs index 7d29d3928..01a3d48ca 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs @@ -716,13 +716,19 @@ namespace Barotrauma.Items.Components GetAvailablePower(out float batteryCharge, out float batteryCapacity); - List availableAmmo = new List(); + List availableAmmo = []; + AddAmmoFromContainer(item.GetComponent()); foreach (MapEntity e in item.linkedTo) { - if (!(e is Item linkedItem)) { continue; } - var itemContainer = linkedItem.GetComponent(); - if (itemContainer == null) { continue; } + if (e is not Item linkedItem) { continue; } + AddAmmoFromContainer(linkedItem.GetComponent()); + } + + void AddAmmoFromContainer(ItemContainer itemContainer) + { + if (itemContainer == null) { return; } availableAmmo.AddRange(itemContainer.Inventory.AllItems); + //add empty slots too for (int i = 0; i < itemContainer.Inventory.Capacity - itemContainer.Inventory.AllItems.Count(); i++) { availableAmmo.Add(null); diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs index 3f7bfdfcd..7c5396020 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs @@ -339,6 +339,19 @@ namespace Barotrauma toolTip += $"‖color:{conditionColorStr}‖ ({(int)item.ConditionPercentage} %)‖color:end‖"; } if (!description.IsNullOrEmpty()) { toolTip += '\n' + description; } + + if (item.Prefab.UnlockedRecipeInToolTip.Length > 0 && GameMain.GameSession is { } GameSession) + { + if (item.Prefab.UnlockedRecipeInToolTip.All(id => GameSession.HasUnlockedRecipe(Character.Controlled, id))) + { + toolTip += $"\n‖color:{XMLExtensions.ToStringHex(GUIStyle.Green)}‖{TextManager.Get("unlockedrecipe.true")}‖color:end‖"; + } + else + { + toolTip += $"\n‖color:{XMLExtensions.ToStringHex(GUIStyle.Yellow)}‖{TextManager.Get("unlockedrecipe.false")}‖color:end‖"; + } + } + if (item.Prefab.ContentPackage != GameMain.VanillaContent && item.Prefab.ContentPackage != null) { colorStr = XMLExtensions.ToStringHex(Color.MediumPurple); @@ -356,19 +369,7 @@ namespace Barotrauma } #if DEBUG toolTip += $" ({item.Prefab.Identifier})"; -#endif - if (!item.Prefab.UnlockedRecipeInToolTip.IsEmpty && GameMain.GameSession is { } GameSession) - { - if (GameSession.HasUnlockedRecipe(Character.Controlled, item.Prefab.UnlockedRecipeInToolTip)) - { - toolTip += TextManager.Get("unlockedrecipe.true"); - } - else - { - toolTip += $"\n‖color:{XMLExtensions.ToStringHex(GUIStyle.Yellow)}‖{TextManager.Get("unlockedrecipe.false")}‖color:end‖"; - } - } - +#endif if (PlayerInput.KeyDown(InputType.ContextualCommand)) { toolTip += $"\n‖color:gui.blue‖{TextManager.ParseInputTypes(TextManager.Get("itemmsgcontextualorders"))}‖color:end‖"; @@ -1300,8 +1301,7 @@ namespace Barotrauma SubEditorScreen.StoreCommand(new InventoryPlaceCommand(DraggingItems.First().ParentInventory, new List(DraggingItems), true)); } } - - SoundPlayer.PlayUISound(GUISoundType.DropItem); + bool removed = false; if (Screen.Selected is SubEditorScreen editor) { diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreature.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreature.cs index cecbcef80..05e82e548 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreature.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreature.cs @@ -8,7 +8,7 @@ using System.Xml.Linq; namespace Barotrauma { - class BackgroundCreature : ISteerable + class BackgroundCreature : ISteerable, ILevelRenderableObject { const float MaxDepth = 10000.0f; @@ -76,6 +76,8 @@ namespace Barotrauma set; } + public Vector3 Position => new Vector3(position.X, position.Y, Depth); + public BackgroundCreature(BackgroundCreaturePrefab prefab, Vector2 position) { this.Prefab = prefab; diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreatureManager.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreatureManager.cs index d997412ac..dc68ba547 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreatureManager.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreatureManager.cs @@ -3,7 +3,6 @@ using Microsoft.Xna.Framework.Graphics; using System; using System.Collections.Generic; using System.Linq; -using System.Xml.Linq; namespace Barotrauma { @@ -15,52 +14,11 @@ namespace Barotrauma private float checkVisibleTimer; - private readonly List creatures = new List(); + private readonly List creatures = []; - private readonly List visibleCreatures = new List(); + private readonly List visibleCreatures = []; - public BackgroundCreatureManager() - { - /*foreach(var file in files) - { - LoadConfig(file.Path); - }*/ - } - - /*public BackgroundCreatureManager(string path) - { - DebugConsole.AddWarning($"Couldn't find any BackgroundCreaturePrefabs files, falling back to {path}"); - LoadConfig(ContentPath.FromRaw(null, path)); - } - - private void LoadConfig(ContentPath configPath) - { - try - { - XDocument doc = XMLExtensions.TryLoadXml(configPath); - if (doc == null) { return; } - var mainElement = doc.Root.FromPackage(configPath.ContentPackage); - if (mainElement.IsOverride()) - { - mainElement = mainElement.FirstElement(); - Prefabs.Clear(); - DebugConsole.NewMessage($"Overriding all background creatures with '{configPath}'", Color.MediumPurple); - } - else if (Prefabs.Any()) - { - DebugConsole.NewMessage($"Loading additional background creatures from file '{configPath}'"); - } - - foreach (var element in mainElement.Elements()) - { - Prefabs.Add(new BackgroundCreaturePrefab(element)); - }; - } - catch (Exception e) - { - DebugConsole.ThrowError(String.Format("Failed to load BackgroundCreatures from {0}", configPath), e); - } - }*/ + public IEnumerable VisibleCreatures => visibleCreatures; public void SpawnCreatures(Level level, int count, Vector2? position = null) { @@ -161,14 +119,6 @@ namespace Barotrauma } } - public void Draw(SpriteBatch spriteBatch, Camera cam) - { - foreach (BackgroundCreature creature in visibleCreatures) - { - creature.Draw(spriteBatch, cam); - } - } - public void DrawLights(SpriteBatch spriteBatch, Camera cam) { foreach (BackgroundCreature creature in visibleCreatures) diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/Level.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/Level.cs index d3d2b8b53..323bb74da 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/Level.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/Level.cs @@ -140,7 +140,7 @@ namespace Barotrauma public void DrawFront(SpriteBatch spriteBatch, Camera cam) { - renderer?.DrawForeground(spriteBatch, cam, LevelObjectManager); + renderer?.DrawForeground(spriteBatch, cam, backgroundCreatureManager, LevelObjectManager); } public void ClientEventRead(IReadMessage msg, float sendingTime) { diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObject.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObject.cs index d56efd35b..aa1bea808 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObject.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObject.cs @@ -12,7 +12,7 @@ using System.Xml.Linq; namespace Barotrauma { - partial class LevelObject + partial class LevelObject : ILevelRenderableObject { public float SwingTimer; public float ScaleOscillateTimer; diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectManager.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectManager.cs index f4b48feb5..08b2d982e 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectManager.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectManager.cs @@ -8,13 +8,20 @@ using System.Linq; namespace Barotrauma { + public interface ILevelRenderableObject + { + public Vector3 Position { get; } + + } + partial class LevelObjectManager { + // Pre-initialized to the max size, so that we don't have to resize the lists at runtime. TODO: Could the capacity (of some collections?) be lower? - private readonly List visibleObjectsBack = new List(MaxVisibleObjects); - private readonly List visibleObjectsMid = new List(MaxVisibleObjects); - private readonly List visibleObjectsFront = new List(MaxVisibleObjects); - private readonly HashSet allVisibleObjects = new HashSet(MaxVisibleObjects); + private readonly List visibleObjectsBack = new List(MaxVisibleObjects); + private readonly List visibleObjectsMid = new List(MaxVisibleObjects); + private readonly List visibleObjectsFront = new List(MaxVisibleObjects); + private readonly HashSet allVisibleObjects = new HashSet(MaxVisibleObjects); private double NextRefreshTime; @@ -35,35 +42,44 @@ namespace Barotrauma partial void UpdateProjSpecific(float deltaTime, Camera cam) { - foreach (LevelObject obj in visibleObjectsBack) + foreach (ILevelRenderableObject obj in visibleObjectsBack) { - obj.Update(deltaTime, cam); + if (obj is LevelObject levelObj) + { + levelObj.Update(deltaTime, cam); + } } - foreach (LevelObject obj in visibleObjectsMid) + foreach (ILevelRenderableObject obj in visibleObjectsMid) { - obj.Update(deltaTime, cam); + if (obj is LevelObject levelObj) + { + levelObj.Update(deltaTime, cam); + } } - foreach (LevelObject obj in visibleObjectsFront) + foreach (ILevelRenderableObject obj in visibleObjectsFront) { - obj.Update(deltaTime, cam); + if (obj is LevelObject levelObj) + { + levelObj.Update(deltaTime, cam); + } } } /// /// Returns all visible objects, but not in order, because internally uses a HashSet. /// - public IEnumerable GetAllVisibleObjects() + public IEnumerable GetAllVisibleObjects() { allVisibleObjects.Clear(); - foreach (LevelObject obj in visibleObjectsBack) + foreach (ILevelRenderableObject obj in visibleObjectsBack) { allVisibleObjects.Add(obj); } - foreach (LevelObject obj in visibleObjectsMid) + foreach (ILevelRenderableObject obj in visibleObjectsMid) { allVisibleObjects.Add(obj); } - foreach (LevelObject obj in visibleObjectsFront) + foreach (ILevelRenderableObject obj in visibleObjectsFront) { allVisibleObjects.Add(obj); } @@ -73,7 +89,7 @@ namespace Barotrauma /// /// Checks which level objects are in camera view and adds them to the visibleObjects lists /// - private void RefreshVisibleObjects(Rectangle currentIndices, float zoom) + private void RefreshVisibleObjects(Rectangle currentIndices, BackgroundCreatureManager backgroundCreatureManager, float zoom) { visibleObjectsBack.Clear(); visibleObjectsMid.Clear(); @@ -152,6 +168,27 @@ namespace Barotrauma } } + foreach (var backgroundCreature in backgroundCreatureManager.VisibleCreatures) + { + int drawOrderIndex = 0; + for (int i = 0; i < visibleObjectsBack.Count; i++) + { + if (visibleObjectsBack[i].Position.Z > backgroundCreature.Position.Z) + { + break; + } + else + { + drawOrderIndex = i + 1; + if (drawOrderIndex >= MaxVisibleObjects) { break; } + } + } + if (drawOrderIndex >= 0 && drawOrderIndex < MaxVisibleObjects) + { + visibleObjectsBack.Insert(drawOrderIndex, backgroundCreature); + } + } + //object grid is sorted in an ascending order //(so we prefer the objects in the foreground instead of ones in the background if some need to be culled) //rendering needs to be done in a descending order though to get the background objects to be drawn first -> reverse the lists @@ -165,28 +202,28 @@ namespace Barotrauma /// /// Draw the objects behind the level walls /// - public void DrawObjectsBack(SpriteBatch spriteBatch, Camera cam) + public void DrawObjectsBack(SpriteBatch spriteBatch, BackgroundCreatureManager backgroundCreatureManager, Camera cam) { - DrawObjects(spriteBatch, cam, visibleObjectsBack); + DrawObjects(spriteBatch, cam, backgroundCreatureManager, visibleObjectsBack); } /// /// Draw the objects in front of the level walls, but behind characters /// - public void DrawObjectsMid(SpriteBatch spriteBatch, Camera cam) + public void DrawObjectsMid(SpriteBatch spriteBatch, BackgroundCreatureManager backgroundCreatureManager, Camera cam) { - DrawObjects(spriteBatch, cam, visibleObjectsMid); + DrawObjects(spriteBatch, cam, backgroundCreatureManager, visibleObjectsMid); } /// /// Draw the objects in front of the level walls and characters /// - public void DrawObjectsFront(SpriteBatch spriteBatch, Camera cam) + public void DrawObjectsFront(SpriteBatch spriteBatch, BackgroundCreatureManager backgroundCreatureManager, Camera cam) { - DrawObjects(spriteBatch, cam, visibleObjectsFront); + DrawObjects(spriteBatch, cam, backgroundCreatureManager, visibleObjectsFront); } - private void DrawObjects(SpriteBatch spriteBatch, Camera cam, List objectList) + private void DrawObjects(SpriteBatch spriteBatch, Camera cam, BackgroundCreatureManager backgroundCreatureManager, List objectList) { Rectangle indices = Rectangle.Empty; indices.X = (int)Math.Floor(cam.WorldView.X / (float)GridSize); @@ -207,7 +244,7 @@ namespace Barotrauma float z = 0.0f; if (ForceRefreshVisibleObjects || (currentGridIndices != indices && Timing.TotalTime > NextRefreshTime)) { - RefreshVisibleObjects(indices, cam.Zoom); + RefreshVisibleObjects(indices, backgroundCreatureManager, cam.Zoom); ForceRefreshVisibleObjects = false; if (cam.Zoom < 0.1f) { @@ -216,61 +253,93 @@ namespace Barotrauma } } - foreach (LevelObject obj in objectList) + bool prevObjectHasDeformableSprite = false; + foreach (ILevelRenderableObject obj2 in objectList) { - Vector2 camDiff = new Vector2(obj.Position.X, obj.Position.Y) - cam.WorldViewCenter; + Vector2 camDiff = new Vector2(obj2.Position.X, obj2.Position.Y) - cam.WorldViewCenter; camDiff.Y = -camDiff.Y; - - Sprite activeSprite = obj.Sprite; - activeSprite?.Draw( - spriteBatch, - new Vector2(obj.Position.X, -obj.Position.Y) - camDiff * obj.Position.Z * ParallaxStrength, - Color.Lerp(obj.Prefab.SpriteColor, obj.Prefab.SpriteColor.Multiply(Level.Loaded.BackgroundTextureColor), obj.Position.Z / obj.Prefab.FadeOutDepth), - activeSprite.Origin, - obj.CurrentRotation, - obj.CurrentScale, - SpriteEffects.None, - z); - if (obj.ActivePrefab.DeformableSprite != null) + bool hasDeformableSprite = false; + if (obj2 is LevelObject levelObject) { - if (obj.CurrentSpriteDeformation != null) + hasDeformableSprite = levelObject.ActivePrefab.DeformableSprite != null; + if (hasDeformableSprite != prevObjectHasDeformableSprite) { - obj.ActivePrefab.DeformableSprite.Deform(obj.CurrentSpriteDeformation); + spriteBatch.End(); + spriteBatch.Begin(SpriteSortMode.Deferred, + BlendState.NonPremultiplied, + SamplerState.LinearWrap, DepthStencilState.DepthRead, + transformMatrix: cam.Transform); } - else + + Sprite activeSprite = levelObject.Sprite; + activeSprite?.Draw( + spriteBatch, + new Vector2(levelObject.Position.X, -levelObject.Position.Y) - camDiff * levelObject.Position.Z * ParallaxStrength, + Color.Lerp(levelObject.Prefab.SpriteColor, levelObject.Prefab.SpriteColor.Multiply(Level.Loaded.BackgroundTextureColor), levelObject.Position.Z / levelObject.Prefab.FadeOutDepth), + activeSprite.Origin, + levelObject.CurrentRotation, + levelObject.CurrentScale, + SpriteEffects.None, + z); + + if (hasDeformableSprite) { - obj.ActivePrefab.DeformableSprite.Reset(); - } - obj.ActivePrefab.DeformableSprite?.Draw(cam, - new Vector3(new Vector2(obj.Position.X, obj.Position.Y) - camDiff * obj.Position.Z * ParallaxStrength, z * 10.0f), - obj.ActivePrefab.DeformableSprite.Origin, - obj.CurrentRotation, - obj.CurrentScale, - Color.Lerp(obj.Prefab.SpriteColor, obj.Prefab.SpriteColor.Multiply(Level.Loaded.BackgroundTextureColor), obj.Position.Z / 5000.0f)); - } - - - if (GameMain.DebugDraw) - { - GUI.DrawRectangle(spriteBatch, new Vector2(obj.Position.X, -obj.Position.Y), new Vector2(10.0f, 10.0f), GUIStyle.Red, true); - - if (obj.Triggers == null) { continue; } - foreach (LevelTrigger trigger in obj.Triggers) - { - if (trigger.PhysicsBody == null) continue; - GUI.DrawLine(spriteBatch, new Vector2(obj.Position.X, -obj.Position.Y), new Vector2(trigger.WorldPosition.X, -trigger.WorldPosition.Y), Color.Cyan, 0, 3); - - Vector2 flowForce = trigger.GetWaterFlowVelocity(); - if (flowForce.LengthSquared() > 1) + if (levelObject.CurrentSpriteDeformation != null) { - flowForce.Y = -flowForce.Y; - GUI.DrawLine(spriteBatch, new Vector2(trigger.WorldPosition.X, -trigger.WorldPosition.Y), new Vector2(trigger.WorldPosition.X, -trigger.WorldPosition.Y) + flowForce * 10, GUIStyle.Orange, 0, 5); + levelObject.ActivePrefab.DeformableSprite.Deform(levelObject.CurrentSpriteDeformation); } - trigger.PhysicsBody.UpdateDrawPosition(); - trigger.PhysicsBody.DebugDraw(spriteBatch, trigger.IsTriggered ? Color.Cyan : Color.DarkCyan); + else + { + levelObject.ActivePrefab.DeformableSprite.Reset(); + } + levelObject.ActivePrefab.DeformableSprite?.Draw(cam, + new Vector3(new Vector2(levelObject.Position.X, levelObject.Position.Y) - camDiff * levelObject.Position.Z * ParallaxStrength, z * 10.0f), + levelObject.ActivePrefab.DeformableSprite.Origin, + levelObject.CurrentRotation, + levelObject.CurrentScale, + Color.Lerp(levelObject.Prefab.SpriteColor, levelObject.Prefab.SpriteColor.Multiply(Level.Loaded.BackgroundTextureColor), levelObject.Position.Z / 5000.0f)); } + prevObjectHasDeformableSprite = hasDeformableSprite; + + if (GameMain.DebugDraw) + { + GUI.DrawRectangle(spriteBatch, new Vector2(levelObject.Position.X, -levelObject.Position.Y), new Vector2(10.0f, 10.0f), GUIStyle.Red, true); + + if (levelObject.Triggers == null) { continue; } + foreach (LevelTrigger trigger in levelObject.Triggers) + { + if (trigger.PhysicsBody == null) continue; + GUI.DrawLine(spriteBatch, new Vector2(levelObject.Position.X, -levelObject.Position.Y), new Vector2(trigger.WorldPosition.X, -trigger.WorldPosition.Y), Color.Cyan, 0, 3); + + Vector2 flowForce = trigger.GetWaterFlowVelocity(); + if (flowForce.LengthSquared() > 1) + { + flowForce.Y = -flowForce.Y; + GUI.DrawLine(spriteBatch, new Vector2(trigger.WorldPosition.X, -trigger.WorldPosition.Y), new Vector2(trigger.WorldPosition.X, -trigger.WorldPosition.Y) + flowForce * 10, GUIStyle.Orange, 0, 5); + } + trigger.PhysicsBody.UpdateDrawPosition(); + trigger.PhysicsBody.DebugDraw(spriteBatch, trigger.IsTriggered ? Color.Cyan : Color.DarkCyan); + } + } + } + else if (obj2 is BackgroundCreature backgroundCreature && cam.Zoom > 0.05f) + { + hasDeformableSprite = backgroundCreature.Prefab.DeformableSprite != null; + if (hasDeformableSprite != prevObjectHasDeformableSprite) + { + spriteBatch.End(); + spriteBatch.Begin(SpriteSortMode.Deferred, + BlendState.NonPremultiplied, + SamplerState.LinearWrap, DepthStencilState.DepthRead, + transformMatrix: cam.Transform); + } + + backgroundCreature.Draw(spriteBatch, cam); + } + prevObjectHasDeformableSprite = hasDeformableSprite; + z += 0.0001f; } diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelRenderer.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelRenderer.cs index a7c47f066..5e4f475f8 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelRenderer.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelRenderer.cs @@ -214,8 +214,9 @@ namespace Barotrauma //calculate the sum of the forces of nearby level triggers //and use it to move the water texture and water distortion effect Vector2 currentWaterParticleVel = level.GenerationParams.WaterParticleVelocity; - foreach (LevelObject levelObject in level.LevelObjectManager.GetAllVisibleObjects()) + foreach (ILevelRenderableObject obj in level.LevelObjectManager.GetAllVisibleObjects()) { + if (obj is not LevelObject levelObject) { continue; } if (levelObject.Triggers == null) { continue; } //use the largest water flow velocity of all the triggers Vector2 objectMaxFlow = Vector2.Zero; @@ -274,11 +275,7 @@ namespace Barotrauma SamplerState.LinearWrap, DepthStencilState.DepthRead, null, null, cam.Transform); - backgroundSpriteManager?.DrawObjectsBack(spriteBatch, cam); - if (cam.Zoom > 0.05f) - { - backgroundCreatureManager?.Draw(spriteBatch, cam); - } + backgroundSpriteManager?.DrawObjectsBack(spriteBatch, backgroundCreatureManager, cam); level.GenerationParams.DrawWaterParticles(spriteBatch, cam, waterParticleOffset); @@ -292,17 +289,18 @@ namespace Barotrauma BlendState.NonPremultiplied, SamplerState.LinearClamp, DepthStencilState.DepthRead, null, null, cam.Transform); - backgroundSpriteManager?.DrawObjectsMid(spriteBatch, cam); + backgroundSpriteManager?.DrawObjectsMid(spriteBatch, backgroundCreatureManager, cam); spriteBatch.End(); } - public void DrawForeground(SpriteBatch spriteBatch, Camera cam, LevelObjectManager backgroundSpriteManager = null) + public void DrawForeground(SpriteBatch spriteBatch, Camera cam, + BackgroundCreatureManager backgroundCreatureManager, LevelObjectManager backgroundSpriteManager = null) { spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.LinearClamp, DepthStencilState.DepthRead, null, null, cam.Transform); - backgroundSpriteManager?.DrawObjectsFront(spriteBatch, cam); + backgroundSpriteManager?.DrawObjectsFront(spriteBatch, backgroundCreatureManager, cam); spriteBatch.End(); } diff --git a/Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs index c96fb5037..55d0c0b7d 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs @@ -2546,7 +2546,7 @@ namespace Barotrauma.Networking segmentTable.StartNewSegment(ClientNetSegment.SyncIds); //outmsg.Write(GameMain.NetLobbyScreen.LastUpdateID); outmsg.WriteUInt16(ChatMessage.LastID); - outmsg.WriteUInt16(EntityEventManager.LastReceivedID); + outmsg.WriteUInt16(SpoofEntityManagerReceivedId ? (ushort)1 : EntityEventManager.LastReceivedID); outmsg.WriteUInt16(LastClientListUpdateID); if (!(GameMain.GameSession?.GameMode is MultiPlayerCampaign campaign) || campaign.LastSaveID == 0) @@ -3365,6 +3365,12 @@ namespace Barotrauma.Networking { get { return votingInterface; } } + + /// + /// Forces the client to report the last received event ID as always being 1, making the server believe the client is always behind. + /// + public bool SpoofEntityManagerReceivedId { get; set; } + private VotingInterface votingInterface; public bool TypingChatMessage(GUITextBox textBox, string text) diff --git a/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs b/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs index 596a03649..23808ff47 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs @@ -89,6 +89,7 @@ namespace Barotrauma.Networking { byte queueId = msg.ReadByte(); float distanceFactor = msg.ReadRangedSingle(0.0f, 1.0f, 8); + bool isRadio = msg.ReadBoolean(); VoipQueue queue = queues.Find(q => q.QueueID == queueId); if (queue == null) @@ -117,19 +118,21 @@ namespace Barotrauma.Networking float rangeMultiplier = spectating ? 2.0f : 1.0f; WifiComponent senderRadio = null; - var messageType = - !client.VoipQueue.ForceLocal && - ChatMessage.CanUseRadio(client.Character, out senderRadio) && - (spectating || (ChatMessage.CanUseRadio(Character.Controlled, out var recipientRadio) && senderRadio.CanReceive(recipientRadio))) - ? ChatMessageType.Radio : ChatMessageType.Default; + var messageType = isRadio ? ChatMessageType.Radio : ChatMessageType.Default; + client.Character.ShowTextlessSpeechBubble(1.25f, ChatMessage.MessageColor[(int)messageType]); client.VoipSound.UseRadioFilter = messageType == ChatMessageType.Radio && !GameSettings.CurrentConfig.Audio.DisableVoiceChatFilters; client.RadioNoise = 0.0f; if (messageType == ChatMessageType.Radio) { + //If the client cannot establish a radio, use a headsets default range as a fallback to calculate the radio noise. + //This cannot happen in an un-modded setting as CanUseRadio is part of the server side check for isRadio to be true. + ChatMessage.CanUseRadio(client.Character, out senderRadio); + float senderRadioRange = (senderRadio == null) ? 35000.0f : senderRadio.Range; + client.VoipSound.UsingRadio = true; - client.VoipSound.SetRange(senderRadio.Range * RangeNear * speechImpedimentMultiplier * rangeMultiplier, senderRadio.Range * speechImpedimentMultiplier * rangeMultiplier); + client.VoipSound.SetRange(senderRadioRange * RangeNear * speechImpedimentMultiplier * rangeMultiplier, senderRadioRange * speechImpedimentMultiplier * rangeMultiplier); if (distanceFactor > RangeNear && !spectating) { //noise starts increasing exponentially after 40% range diff --git a/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs index e42d09894..0eeb1c815 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs @@ -49,9 +49,6 @@ namespace Barotrauma private GUITextBox serverNameBox, passwordBox, maxPlayersBox; private GUITickBox isPublicBox, wrongPasswordBanBox, karmaBox; private GUIDropDown languageDropdown, serverExecutableDropdown; -#if DEBUG - private GUITickBox lenientHandshakeBox; -#endif private readonly GUIButton joinServerButton, hostServerButton; private readonly GUIFrame modsButtonContainer; @@ -533,6 +530,18 @@ namespace Barotrauma return true; } }; + + new GUITickBox(new RectTransform(new Point(300, 30), Frame.RectTransform, Anchor.TopRight) { AbsoluteOffset = new Point(40, 280) }, + "Lenient server startup timeouts") + { + Selected = NetConfig.UseLenientHandshake, + ToolTip = "Start with more lenient Lidgren handshake timeouts. The server is more likely to start even when running multiple instances on the same machine under heavy load.", + OnSelected = (tickBox) => + { + NetConfig.UseLenientHandshake = tickBox.Selected; + return true; + } + }; #endif var minButtonSize = new Point(120, 20); var maxButtonSize = new Point(480, 80); @@ -1117,13 +1126,11 @@ namespace Barotrauma int ownerKey = Math.Max(CryptoRandom.Instance.Next(), 1); arguments.Add("-ownerkey"); arguments.Add(ownerKey.ToString()); -#if DEBUG - if (lenientHandshakeBox.Selected) + + if (NetConfig.UseLenientHandshake) { arguments.Add("-lenienthandshake"); - NetConfig.UseLenientHandshake = true; } -#endif var processInfo = new ProcessStartInfo { @@ -1593,14 +1600,6 @@ namespace Barotrauma ToolTip = TextManager.Get("hostserverkarmasettingtooltip") }; -#if DEBUG - lenientHandshakeBox = new GUITickBox(new RectTransform(new Vector2(0.5f, 1.0f), tickboxAreaLower.RectTransform), "DEBUG: Lenient server startup timeouts") - { - Selected = true, - ToolTip = "Start with more lenient Lidgren handshake timeouts. The server is more likely to start even when running multiple instances on the same machine under heavy load." - }; -#endif - tickboxAreaLower.RectTransform.IsFixedSize = true; //spacing diff --git a/Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs b/Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs index 206009ddc..ce3ecefb4 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs @@ -1,18 +1,21 @@ using Barotrauma.Extensions; using Barotrauma.IO; using Barotrauma.Items.Components; +using Barotrauma.Sounds; using Barotrauma.Steam; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; +using Steamworks; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Globalization; +using System.IO.Compression; using System.Linq; using System.Threading; +using System.Xml; using System.Xml.Linq; -using Barotrauma.Sounds; namespace Barotrauma { @@ -2043,6 +2046,8 @@ namespace Barotrauma private bool SaveSubToFile(string name, ContentPackage packageToSaveTo) { + bool remoteStorageWasEnabled = Submarine.MainSub.Info.SaveToRemoteStorage; + Type subFileType = DetermineSubFileType(MainSub?.Info.Type ?? SubmarineType.Player); static string getExistingFilePath(ContentPackage package, string fileName) @@ -2271,6 +2276,16 @@ namespace Barotrauma linkedSubBox.AddItem(sub.Name, sub); } subNameLabel.Text = ToolBox.LimitString(MainSub.Info.Name, subNameLabel.Font, subNameLabel.Rect.Width); + + if (remoteStorageWasEnabled) + { + Submarine.MainSub.Info.SaveToRemoteStorage = true; + + RemoteStorageHelper.TryWrite( + localPath: MainSub.Info.FilePath, + saveAs: MainSub.Info.FilePath.CleanUpPathCrossPlatform(correctFilenameCase: false), + allowOverwrite: true); + } } } } @@ -3222,6 +3237,42 @@ namespace Barotrauma previewImageButtonHolder.RectTransform.MinSize = new Point(0, previewImageButtonHolder.RectTransform.Children.Max(c => c.MinSize.Y)); + if (SteamManager.IsInitialized) + { + GUILayoutGroup remoteStorageArea = new( + new RectTransform(new Vector2(1f, 0.05f), rightColumn.RectTransform, + minSize: new Point(0, minHeight)), + isHorizontal: true, + childAnchor: Anchor.CenterLeft) + { + Stretch = true, + AbsoluteSpacing = 5 + }; + + new GUITextBlock(new RectTransform(Vector2.One, remoteStorageArea.RectTransform), + TextManager.Get("RemoteStorageToggle.Title"), textAlignment: Alignment.CenterLeft, wrap: true); + + new GUITickBox(new RectTransform(Vector2.One, remoteStorageArea.RectTransform), label: "") + { + OnAddedToGUIUpdateList = component => + { + // Values may change outside of game. + component.Enabled = SteamRemoteStorage.IsCloudEnabledForAccount; + component.ToolTip = !SteamRemoteStorage.IsCloudEnabledForAccount ? TextManager.Get("RemoteStorageToggle.Disabled") : ""; + ((GUITickBox)component).SetSelected(SteamRemoteStorage.IsCloudEnabled && MainSub.Info.SaveToRemoteStorage, callOnSelected: false); + }, + OnSelected = tickBox => + { + if (tickBox.Selected && !SteamRemoteStorage.IsCloudEnabledForApp) + { + RemoteStorageHelper.AskToEnable(onAccepted: () => MainSub.Info.SaveToRemoteStorage = true); + return false; + } + return MainSub.Info.SaveToRemoteStorage = tickBox.Selected; + } + }; + } + var contentPackageTabber = new GUILayoutGroup(new RectTransform((1.0f, 0.075f), rightColumn.RectTransform), isHorizontal: true); GUIButton createTabberBtn(string labelTag) @@ -3745,7 +3796,7 @@ namespace Barotrauma } var package = GetLocalPackageThatOwnsSub(subInfo); - if (package != null) + if (package != null || subInfo.IsFromRemoteStorage) { deleteBtn.Enabled = true; } @@ -3770,13 +3821,29 @@ namespace Barotrauma searchBox.OnDeselected += (sender, userdata) => { searchTitle.Visible = sender.Text.IsNullOrEmpty(); }; searchBox.OnTextChanged += (textBox, text) => { FilterSubs(subList, text); return true; }; - var sortedSubs = GetLoadableSubs() - .OrderBy(s => s.Type) - .ThenBy(s => s.Name) - .ToList(); + List allSubs = [.. SubmarineInfo.SavedSubmarines]; + foreach (SteamRemoteStorage.RemoteFile remoteFile in SteamRemoteStorage.Files.Where(file => file.Filename.EndsWith(".sub"))) + { + if (!remoteFile.TryRead(out byte[] bytes)) { continue; } + + using System.IO.MemoryStream stream = new(bytes); + using GZipStream zipStream = new(stream, CompressionMode.Decompress); + if (XMLExtensions.TryLoadXml(zipStream) is not XDocument doc) + { + DebugConsole.ThrowError($"{RemoteStorageHelper.DebugPrefix} Failed to load submarine \"{remoteFile.Filename}\" from remote storage: file is not a valid XML document."); + continue; + } + + SubmarineInfo subInfo = new(remoteFile.Filename, element: doc.Root, tryLoad: false) { IsFromRemoteStorage = true }; + allSubs.Add(subInfo); + } + + IOrderedEnumerable sortedSubs = allSubs + .OrderBy(kvp => kvp.Type) + .ThenBy(kvp => kvp.Name) + .ThenBy(kvp => kvp.IsFromRemoteStorage); SubmarineInfo prevSub = null; - foreach (SubmarineInfo sub in sortedSubs) { if (prevSub == null || prevSub.Type != sub.Type) @@ -3794,35 +3861,44 @@ namespace Barotrauma prevSub = sub; } - string pathWithoutUserName = Path.GetFullPath(sub.FilePath); - string saveFolder = Path.GetFullPath(SaveUtil.DefaultSaveFolder); - if (pathWithoutUserName.StartsWith(saveFolder)) + string displayPath = sub.FilePath; + if (sub.IsFromRemoteStorage) { - pathWithoutUserName = "..." + pathWithoutUserName[saveFolder.Length..]; + displayPath += $" {TextManager.Get("RemoteStorage")}"; } else { - pathWithoutUserName = sub.FilePath; + string saveFolder = Path.GetFullPath(SaveUtil.DefaultSaveFolder); + string fullPath = Path.GetFullPath(displayPath); + if (fullPath.StartsWith(saveFolder)) + { + displayPath = $"...{fullPath[saveFolder.Length..]}"; + } } - GUITextBlock textBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), subList.Content.RectTransform) { MinSize = new Point(0, 30) }, - ToolBox.LimitString(sub.Name, GUIStyle.Font, subList.Rect.Width - 80)) + LocalizedString limitedName = ToolBox.LimitString(sub.Name, GUIStyle.Font, subList.Rect.Width - 80); + GUITextBlock textBlock = new(new RectTransform(Vector2.UnitX, subList.Content.RectTransform) { MinSize = new Point(0, 30) }, limitedName) { UserData = sub, - ToolTip = pathWithoutUserName + ToolTip = displayPath }; - if (!(ContentPackageManager.VanillaCorePackage?.Files.Any(f => f.Path == sub.FilePath) ?? false)) + if (sub.IsFromRemoteStorage) + { + // remote storage + textBlock.OverrideTextColor(RemoteStorageHelper.SteamColor); + } + else if (ContentPackageManager.VanillaCorePackage == null || ContentPackageManager.VanillaCorePackage.Files.None(f => f.Path == sub.FilePath)) { if (GetLocalPackageThatOwnsSub(sub) == null && ContentPackageManager.AllPackages.FirstOrDefault(p => p.Files.Any(f => f.Path == sub.FilePath)) is ContentPackage subPackage) { - //workshop mod + // workshop mod textBlock.OverrideTextColor(Color.MediumPurple); } else { - //local mod + // local mod textBlock.OverrideTextColor(GUIStyle.TextColorBright); } } @@ -4017,10 +4093,9 @@ namespace Barotrauma return false; } - if (!(subList.SelectedComponent?.UserData is SubmarineInfo selectedSubInfo)) { return false; } + if (subList.SelectedComponent?.UserData is not SubmarineInfo selectedSubInfo) { return false; } - var ownerPackage = GetLocalPackageThatOwnsSub(selectedSubInfo); - if (ownerPackage is null) + if (!selectedSubInfo.IsFromRemoteStorage && GetLocalPackageThatOwnsSub(selectedSubInfo) is null) { if (IsVanillaSub(selectedSubInfo)) { @@ -4182,21 +4257,23 @@ namespace Barotrauma { if (sub == null) { return; } - //If the sub is included in a content package that only defines that one sub, - //check that it's a local content package and only allow deletion if it is. - //(deleting from the Submarines folder is also currently allowed, but this is temporary) - var subPackage = GetLocalPackageThatOwnsSub(sub); - if (!ContentPackageManager.LocalPackages.Regular.Contains(subPackage)) { return; } - - var msgBox = new GUIMessageBox( - TextManager.Get("DeleteDialogLabel"), - TextManager.GetWithVariable("DeleteDialogQuestion", "[file]", sub.Name), - new LocalizedString[] { TextManager.Get("Yes"), TextManager.Get("Cancel") }); + // If the sub is included in a content package that only defines that one sub, + // check that it's a local content package and only allow deletion if it is. + // (deleting from the Submarines folder is also currently allowed, but this is temporary) + ContentPackage subPackage = GetLocalPackageThatOwnsSub(sub); + if (!ContentPackageManager.LocalPackages.Regular.Contains(subPackage)) { subPackage = null; } + if (!sub.IsFromRemoteStorage && subPackage == null) { return; } + + GUIMessageBox msgBox = new(TextManager.Get("DeleteDialogLabel"), TextManager.GetWithVariable("DeleteDialogQuestion", "[file]", sub.Name), [TextManager.Get("Yes"), TextManager.Get("Cancel")]); msgBox.Buttons[0].OnClicked += (btn, userData) => { - try + if (sub.IsFromRemoteStorage) { - if (subPackage != null) + RemoteStorageHelper.TryDelete(sub.FilePath); + } + else if (subPackage != null) + { + try { File.Delete(sub.FilePath, catchUnauthorizedAccessExceptions: false); ModProject modProject = new ModProject(subPackage); @@ -4207,17 +4284,17 @@ namespace Barotrauma { MainSub.Info.FilePath = null; } - } - sub.Dispose(); - CreateLoadScreen(); + } + catch (Exception e) + { + DebugConsole.ThrowErrorLocalized(TextManager.GetWithVariable("DeleteFileError", "[file]", sub.FilePath), e); + } } - catch (Exception e) - { - DebugConsole.ThrowErrorLocalized(TextManager.GetWithVariable("DeleteFileError", "[file]", sub.FilePath), e); - } - return true; + + sub.Dispose(); + CreateLoadScreen(); + return msgBox.Close(btn, userData); }; - msgBox.Buttons[0].OnClicked += msgBox.Close; msgBox.Buttons[1].OnClicked += msgBox.Close; } diff --git a/Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs b/Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs index 22b885e50..bf90e8c54 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs @@ -445,7 +445,7 @@ namespace Barotrauma { DebugConsole.NewMessage("Missing Localization for property: " + propertyTag); MissingLocalizations.Add($"sp.{propertyTag}.name|{displayName}"); - MissingLocalizations.Add($"sp.{propertyTag}.description|{property.GetAttribute().Description}"); + MissingLocalizations.Add($"sp.{propertyTag}.description|{property.GetAttribute()?.Description}"); } } #endif @@ -467,7 +467,7 @@ namespace Barotrauma } if (toolTip.IsNullOrEmpty()) { - toolTip = property.GetAttribute().Description; + toolTip = property.GetAttribute()?.Description; } GUIComponent propertyField = null; diff --git a/Barotrauma/BarotraumaClient/ClientSource/Steam/RemoteStorageHelper.cs b/Barotrauma/BarotraumaClient/ClientSource/Steam/RemoteStorageHelper.cs new file mode 100644 index 000000000..f6c119398 --- /dev/null +++ b/Barotrauma/BarotraumaClient/ClientSource/Steam/RemoteStorageHelper.cs @@ -0,0 +1,34 @@ +#nullable enable +using Steamworks; +using System; +namespace Barotrauma.Steam; + +internal static partial class RemoteStorageHelper +{ + /// + /// Asks the user if they wish to enable remote storage. Accepting enables it automatically. + /// + /// Invoked when the user accepts enabling remote storage. + /// Invoked when the user rejects enabling remote storage. + /// Closes automatically if remote storage was enabled outside of the game, or if remote storage can not be enabled. + public static void AskToEnable(Action? onAccepted = null, Action? onRejected = null) + { + GUIMessageBox confirmBox = new GUIMessageBox( + TextManager.Get("RemoteStorageEnablePopup.Header"), + TextManager.Get("RemoteStorageEnablePopup.Text"), + [TextManager.Get("Yes"), TextManager.Get("No")], + autoCloseCondition: () => !SteamRemoteStorage.IsCloudEnabledForAccount || SteamRemoteStorage.IsCloudEnabledForApp); + + confirmBox.Buttons[0].OnClicked += (btn, data) => + { + SteamRemoteStorage.IsCloudEnabledForApp = true; + onAccepted?.Invoke(); + return confirmBox.Close(btn, data); + }; + confirmBox.Buttons[1].OnClicked += (btn, data) => + { + onRejected?.Invoke(); + return confirmBox.Close(btn, data); + }; + } +} \ No newline at end of file diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj index 76c505259..3a58895b2 100644 --- a/Barotrauma/BarotraumaClient/LinuxClient.csproj +++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 1.12.7.0 + 1.13.3.1 Copyright © FakeFish 2018-2024 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj index 4f6ffc38d..09e03f0cb 100644 --- a/Barotrauma/BarotraumaClient/MacClient.csproj +++ b/Barotrauma/BarotraumaClient/MacClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 1.12.7.0 + 1.13.3.1 Copyright © FakeFish 2018-2024 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj index 649d8f930..c6dc2f53f 100644 --- a/Barotrauma/BarotraumaClient/WindowsClient.csproj +++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 1.12.7.0 + 1.13.3.1 Copyright © FakeFish 2018-2024 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj index 37c1595ca..5fed6bbcf 100644 --- a/Barotrauma/BarotraumaServer/LinuxServer.csproj +++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 1.12.7.0 + 1.13.3.1 Copyright © FakeFish 2018-2023 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj index b216a3a40..7410b3e84 100644 --- a/Barotrauma/BarotraumaServer/MacServer.csproj +++ b/Barotrauma/BarotraumaServer/MacServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 1.12.7.0 + 1.13.3.1 Copyright © FakeFish 2018-2023 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs index 74b208a47..bdca95163 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs @@ -1797,22 +1797,35 @@ namespace Barotrauma (Client client, Vector2 cursorWorldPos, string[] args) => { if (Submarine.MainSub == null || Level.Loaded == null) { return; } + Submarine submarineToTeleport = Submarine.MainSub; + if (args.Length > 1) + { + foreach (Submarine sub in Submarine.Loaded.Where(s => s.PhysicsBody.BodyType == FarseerPhysics.BodyType.Dynamic)) + { + if ((sub.Info.Name + "_" + sub.TeamID) == args[1]) + { + submarineToTeleport = sub; + break; + } + } + } + if (args.Length == 0 || args[0].Equals("cursor", StringComparison.OrdinalIgnoreCase)) { - Submarine.MainSub.SetPosition(cursorWorldPos); + submarineToTeleport.SetPosition(cursorWorldPos); } else if (args[0].Equals("start", StringComparison.OrdinalIgnoreCase)) { - Submarine.MainSub.SetPosition(Level.Loaded.StartPosition - Vector2.UnitY * Submarine.MainSub.Borders.Height); + submarineToTeleport.SetPosition(Level.Loaded.StartPosition - Vector2.UnitY * submarineToTeleport.Borders.Height); } else if (args[0].Equals("end", StringComparison.OrdinalIgnoreCase)) { - Submarine.MainSub.SetPosition(Level.Loaded.EndPosition - Vector2.UnitY * Submarine.MainSub.Borders.Height); + submarineToTeleport.SetPosition(Level.Loaded.EndPosition - Vector2.UnitY * submarineToTeleport.Borders.Height); } else if (args[0].Equals("endoutpost", StringComparison.OrdinalIgnoreCase)) { - Submarine.MainSub.SetPosition(Level.Loaded.EndExitPosition - Vector2.UnitY * Submarine.MainSub.Borders.Height); - var submarineDockingPort = DockingPort.List.FirstOrDefault(d => d.Item.Submarine == Submarine.MainSub); + submarineToTeleport.SetPosition(Level.Loaded.EndExitPosition - Vector2.UnitY * submarineToTeleport.Borders.Height); + var submarineDockingPort = DockingPort.List.FirstOrDefault(d => d.Item.Submarine == submarineToTeleport); if (Level.Loaded?.EndOutpost == null) { NewMessage("Can't teleport the sub to the end outpost (no outpost at the end of the level).", Color.Red); diff --git a/Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs b/Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs index 0bb6f889e..3b62d212d 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs @@ -1179,6 +1179,7 @@ namespace Barotrauma NetWalletTransfer transfer = INetSerializableStruct.Read(msg); if (GameMain.Server is null) { return; } + if (transfer.Amount <= 0) { return; } if (transfer.Sender.TryUnwrap(out var id)) { diff --git a/Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs b/Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs index 38e09b975..89ab59407 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs @@ -193,13 +193,6 @@ namespace Barotrauma (item.PreviousParentInventory == null || !sender.Character.CanAccessInventory(item.PreviousParentInventory)); - // Prevent modified clients from being able to steal items from characters by item swapping with an existing item - // due to drag and drop being enabled - if (!sender.Character.CanAccessInventory(this, CharacterInventory.AccessLevel.AllowBotsAndPets) && GetItemAt(slotIndex) != null) - { - itemAccessDenied = true; - } - //more restricted "adding" of handcuffs: we can't allow putting handcuffs on a player just because dragging and dropping is allowed if (item.HasTag(Tags.HandLockerItem) && !itemAccessDenied) { @@ -219,7 +212,7 @@ namespace Barotrauma continue; } } - TryPutItem(item, slotIndex, true, true, sender.Character, false); + TryPutItem(item, slotIndex, allowSwapping: false, allowCombine: false, user: sender.Character, createNetworkEvent: false); for (int j = 0; j < capacity; j++) { if (slots[j].Contains(item) && !receivedItemIdsFromClient[j].Contains(item.ID)) diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/ChatMessage.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/ChatMessage.cs index 06ed826ff..5c62f2584 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/ChatMessage.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/ChatMessage.cs @@ -5,6 +5,17 @@ namespace Barotrauma.Networking { partial class ChatMessage { + private static string SanitizeText(Client client, string text) + { + if (!client.HasPermission(ClientPermissions.SpamImmunity)) + { + // Prevent clients without spam immunity from being able to use RichString features + text = text.Replace('‖', ' '); + } + + return text; + } + public static void ServerRead(IReadMessage msg, Client c) { c.KickAFKTimer = 0.0f; @@ -66,8 +77,7 @@ namespace Barotrauma.Networking txt = msg.ReadString() ?? ""; } - // Sanitize incoming text message from client so they can't use RichString features - txt = txt.Replace('‖', ' '); + txt = SanitizeText(c, txt); if (!NetIdUtils.IdMoreRecent(ID, c.LastSentChatMsgID)) { return; } diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs index 68922e636..205369554 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs @@ -896,7 +896,10 @@ namespace Barotrauma.Networking string subHash = inc.ReadString(); CampaignSettings settings = INetSerializableStruct.Read(inc); - var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.StringRepresentation == subHash); + var matchingSub = + ServerSettings.AllowSubVoting ? + Voting.HighestVoted(VoteType.Sub, connectedClients) : + SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.StringRepresentation == subHash); if (GameStarted) { diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs index a3262596c..f49f20697 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs @@ -249,7 +249,7 @@ namespace Barotrauma.Networking // in which case we'll wait until the timeout runs out before kicking the client List toKick = inGameClients.FindAll(c => NetIdUtils.IdMoreRecent((UInt16)(lastSentToAll + 1), c.LastRecvEntityEventID) && - (firstEventToResend.CreateTime > c.MidRoundSyncTimeOut || lastSentToAnyoneTime > c.MidRoundSyncTimeOut || Timing.TotalTime > c.MidRoundSyncTimeOut + 10.0)); + (!c.NeedsMidRoundSync || firstEventToResend.CreateTime > c.MidRoundSyncTimeOut || lastSentToAnyoneTime > c.MidRoundSyncTimeOut || Timing.TotalTime > c.MidRoundSyncTimeOut + 10.0)); toKick.ForEach(c => { DebugConsole.NewMessage(c.Name + " was kicked because they were expecting a very old network event (" + (c.LastRecvEntityEventID + 1).ToString() + ")", Color.Red); diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs index ee068ffb8..66e1b3fef 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs @@ -51,13 +51,14 @@ namespace Barotrauma.Networking { if (recipient == sender) { continue; } - if (!CanReceive(sender, recipient, out float distanceFactor)) { continue; } + if (!CanReceive(sender, recipient, out float distanceFactor, out bool isRadio)) { continue; } IWriteMessage msg = new WriteOnlyMessage(); msg.WriteByte((byte)ServerPacketHeader.VOICE); msg.WriteByte((byte)queue.QueueID); msg.WriteRangedSingle(distanceFactor, 0.0f, 1.0f, 8); + msg.WriteBoolean(isRadio); queue.Write(msg); netServer.Send(msg, recipient.Connection, DeliveryMethod.Unreliable); @@ -65,15 +66,17 @@ namespace Barotrauma.Networking } } - private static bool CanReceive(Client sender, Client recipient, out float distanceFactor) + private static bool CanReceive(Client sender, Client recipient, out float distanceFactor, out bool isRadio) { if (Screen.Selected != GameMain.GameScreen) { distanceFactor = 0.0f; + isRadio = false; return true; } distanceFactor = 0.0f; + isRadio = false; //no-one can hear muted players if (sender.Muted) { return false; } @@ -98,12 +101,14 @@ namespace Barotrauma.Networking { if (recipientSpectating) { + isRadio = true; if (recipient.SpectatePos == null) { return true; } distanceFactor = MathHelper.Clamp(Vector2.Distance(sender.Character.WorldPosition, recipient.SpectatePos.Value) / senderRadio.Range, 0.0f, 1.0f); return distanceFactor < 1.0f; } else if (recipientRadio != null && recipientRadio.CanReceive(senderRadio)) { + isRadio = true; distanceFactor = MathHelper.Clamp(Vector2.Distance(sender.Character.WorldPosition, recipient.Character.WorldPosition) / senderRadio.Range, 0.0f, 1.0f); return true; } diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj index 0d3c8a9d1..7519b4037 100644 --- a/Barotrauma/BarotraumaServer/WindowsServer.csproj +++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 1.12.7.0 + 1.13.3.1 Copyright © FakeFish 2018-2023 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]RotationAndFlippingTests/RotationAndFlippingTests.sub b/Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]RotationAndFlippingTests/RotationAndFlippingTests.sub index 10d816db3920a87423d7c115a9f0bf7ae2ce249d..c73783ed9483e2b987a19c910d7631e5017cd20b 100644 GIT binary patch literal 13521 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 jSR%1}6<@f)jH

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 Vfe8+1e9ZoZ{plCTl* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs b/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs index 2e0365317..d3278fed9 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs @@ -524,8 +524,7 @@ namespace Barotrauma { UnlockAchievement(causeOfDeath.Killer, "killpoison".ToIdentifier()); } - else if (item.Prefab.Identifier == "nuclearshell" || - item.Prefab.Identifier == "nucleardepthcharge") + else if (item.Prefab.Tags.Contains("nuclearexplosive")) { UnlockAchievement(causeOfDeath.Killer, "killnuke".ToIdentifier()); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs index eeab5c9b6..fdc62eeee 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs @@ -197,6 +197,18 @@ namespace Barotrauma private readonly List myBodies; +#if SERVER + ///

+ /// How often the server can send messages about a limb targeting some attack target. + /// Mainly relevant for attacks with no cooldown, e.g. fractal guardian's steam cannons which run continuously over time (we can't send events every frame) + /// + private const double MinSetAttackTargetEventInterval = 0.5; + private IDamageable lastDamageTarget; + private Limb lastTargetLimb; + private Limb lastAttackLimb; + private double lastSetAttackTargetEventTime; +#endif + public LatchOntoAI LatchOntoAI { get; private set; } public SwarmBehavior SwarmBehavior { get; private set; } public PetBehavior PetBehavior { get; private set; } @@ -2679,11 +2691,19 @@ namespace Barotrauma if (!ActiveAttack.IsRunning) { #if SERVER - GameMain.NetworkMember.CreateEntityEvent(Character, new Character.SetAttackTargetEventData( - AttackLimb, - damageTarget, - targetLimb, - SimPosition)); + if (Timing.TotalTime > lastSetAttackTargetEventTime + MinSetAttackTargetEventInterval || + damageTarget != lastDamageTarget || AttackLimb != lastAttackLimb || targetLimb != lastTargetLimb) + { + GameMain.NetworkMember.CreateEntityEvent(Character, new Character.SetAttackTargetEventData( + AttackLimb, + damageTarget, + targetLimb, + SimPosition)); + lastSetAttackTargetEventTime = Timing.TotalTime; + lastDamageTarget = damageTarget; + lastAttackLimb = AttackLimb; + lastTargetLimb = targetLimb; + } #else Character.PlaySound(CharacterSound.SoundType.Attack, maxInterval: 3); #endif diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs index 320db7e27..c90f049cb 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs @@ -46,7 +46,7 @@ namespace Barotrauma private float respondToAttackTimer; private const float RespondToAttackInterval = 1.0f; - private bool wasConscious; + private bool wasDead; private bool freezeAI; @@ -201,7 +201,7 @@ namespace Barotrauma } if (isIncapacitated) { return; } - wasConscious = true; + wasDead = false; respondToAttackTimer -= deltaTime; if (respondToAttackTimer <= 0.0f) @@ -1256,14 +1256,15 @@ namespace Barotrauma public override void OnAttacked(Character attacker, AttackResult attackResult) { - // The attack incapacitated/killed the character: respond immediately to trigger nearby characters because the update loop no longer runs - if (wasConscious && (Character.IsIncapacitated || Character.Stun > 0.0f)) + // If the character is incapacitated or dead, respond to the attack anyway to let other nearby characters react to it + // (But if the character is already dead, and was dead before this attack, don't react) + if (Character.IsDead && wasDead) { return; } + if (Character.IsIncapacitated || Character.Stun > 0.0f) { RespondToAttack(attacker, attackResult); - wasConscious = false; + wasDead = Character.IsDead; return; } - if (Character.IsDead) { return; } if (attacker == null || Character.IsPlayer) { // The player characters need to "respond" to the attack always, because the update loop doesn't run for them. @@ -1467,10 +1468,10 @@ namespace Barotrauma otherHumanAI.VisibleHulls.Contains(attacker.CurrentHull) || otherCharacter.CanSeeTarget(attacker, seeThroughWindows: true); if (!isWitnessing) - { - if (Character.IsDead || Character.IsUnconscious || otherCharacter.TeamID != Character.TeamID) + { + if (Character.IsKnockedDown || otherCharacter.TeamID != Character.TeamID) { - // Dead or in different team -> cannot report. + // Knocked down or in different team -> cannot report. continue; } if (otherHumanAI.objectiveManager.HasOrders()) @@ -1494,6 +1495,14 @@ namespace Barotrauma continue; } } + else if (!otherCharacter.IsSecurity) + { + //witnessed the attack as non-security, trigger security + foreach (Character security in Character.CharacterList.Where(c => c.TeamID == otherCharacter.TeamID)) + { + TriggerSecurity(security.AIController as HumanAIController, attacker, DetermineCombatMode(security, cumulativeDamage, isWitnessing)); + } + } float delay = isWitnessing ? GetReactionTime() : Rand.Range(2.0f, 3.0f, Rand.RandSync.Unsynced); otherHumanAI.AddCombatObjective(combatMode, attacker, delay); } @@ -1926,12 +1935,12 @@ namespace Barotrauma character.IsCriminal = true; character.IsActingOffensively = true; } - if (!TriggerSecurity(otherHumanAI, combatMode)) + if (!TriggerSecurity(otherHumanAI, character, combatMode)) { // Else call the others foreach (Character security in Character.CharacterList.Where(c => c.TeamID == otherCharacter.TeamID).OrderBy(c => Vector2.DistanceSquared(character.WorldPosition, c.WorldPosition))) { - if (!TriggerSecurity(security.AIController as HumanAIController, combatMode)) + if (!TriggerSecurity(security.AIController as HumanAIController, character, combatMode)) { // Only alert one guard at a time return; @@ -1941,25 +1950,25 @@ namespace Barotrauma } } - bool TriggerSecurity(HumanAIController humanAI, AIObjectiveCombat.CombatMode combatMode) - { - if (humanAI == null) { return false; } - if (!humanAI.Character.IsSecurity) { return false; } - if (humanAI.ObjectiveManager.IsCurrentObjective()) { return false; } - humanAI.AddCombatObjective(combatMode, character, delay: GetReactionTime(), - onCompleted: () => - { - //if the target is arrested successfully, reset the damage accumulator - foreach (Character anyCharacter in Character.CharacterList) + } + private static bool TriggerSecurity(HumanAIController humanAI, Character targetCharacter, AIObjectiveCombat.CombatMode combatMode) + { + if (humanAI == null) { return false; } + if (!humanAI.Character.IsSecurity) { return false; } + if (humanAI.ObjectiveManager.IsCurrentObjective()) { return false; } + humanAI.AddCombatObjective(combatMode, targetCharacter, delay: GetReactionTime(), + onCompleted: () => + { + //if the target is arrested successfully, reset the damage accumulator + foreach (Character anyCharacter in Character.CharacterList) + { + if (anyCharacter.AIController is HumanAIController anyAI) { - if (anyCharacter.AIController is HumanAIController anyAI) - { - anyAI.structureDamageAccumulator?.Remove(character); - } + anyAI.structureDamageAccumulator?.Remove(targetCharacter); } - }); - return true; - } + } + }); + return true; } public static void ItemTaken(Item item, Character thief) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs index 0a57628a2..e603c4b9c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs @@ -133,7 +133,7 @@ namespace Barotrauma bool operateExtinguisher = !moveCloser || (dist < extinguisher.Range * 1.2f && character.CanSeeTarget(targetHull)); if (operateExtinguisher) { - character.CursorPosition = fs.Position; + character.CursorPosition = FarseerPhysics.ConvertUnits.ToDisplayUnits(Submarine.GetRelativeSimPositionFromWorldPosition(fs.WorldPosition, character.Submarine, fs.Submarine)); Vector2 fromCharacterToFireSource = fs.WorldPosition - character.WorldPosition; character.CursorPosition += VectorExtensions.Forward(extinguisherItem.body.TransformedRotation + (float)Math.Sin(sinTime) / 2, fromCharacterToFireSource.Length() / 2); if (extinguisherItem.RequireAimToUse) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRepairItem.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRepairItem.cs index 72fa4a870..002e38441 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRepairItem.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRepairItem.cs @@ -173,6 +173,16 @@ namespace Barotrauma if (character.CanInteractWith(Item, out _, checkLinked: false)) { waitTimer += deltaTime; + + //if we're climbing upwards to the item, ensure the character stays within arm's length of it + //without this, the character can get stuck in a loop where the GoTo objective takes them close enough to the item, + //then the character shifts a bit downwards on the ladder and goes outside interaction range, and the GoTo objective kicks in again + if (character.IsClimbing && + Item.WorldPosition.Y > character.WorldPosition.Y + FarseerPhysics.ConvertUnits.ToDisplayUnits(character.AnimController.ArmLength)) + { + character.AIController.SteeringManager.SteeringManual(deltaTime, Vector2.UnitY); + } + if (waitTimer < WaitTimeBeforeRepair) { return; } HumanAIController.FaceTarget(Item); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs index bfed4ae7a..e32cc8f42 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs @@ -758,6 +758,11 @@ namespace Barotrauma public float CoolDownTimer { get; set; } public float CurrentRandomCoolDown { get; private set; } public float SecondaryCoolDownTimer { get; set; } + + /// + /// The attack is considered to be running from the moment it starts until the reaches the of the attack, or until the attack lands successfully. + /// E.g. from the moment the monster decides to lunge itself towards the target until it hits a target or until it completes that lunge. + /// public bool IsRunning { get; private set; } public float AfterAttackTimer { get; set; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs index 8201439ba..6ca3c2e22 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs @@ -994,6 +994,9 @@ namespace Barotrauma public bool IsForceRagdolled; public bool FollowCursor = true; + /// + /// Is the character currently dead, unconscious or paralyzed? + /// public bool IsIncapacitated { get @@ -1003,6 +1006,9 @@ namespace Barotrauma } } + /// + /// Is the character dead or below 0 vitality and not able to stay conscious? + /// public bool IsUnconscious { get { return CharacterHealth.IsUnconscious; } @@ -1669,7 +1675,8 @@ namespace Barotrauma AnimController.FindHull(setInWater: true); if (AnimController.CurrentHull != null) { Submarine = AnimController.CurrentHull.Submarine; } - IsContainable = prefab.ConfigElement.GetAttributeBool(nameof(IsContainable), def: Mass <= 30.0f); + //mass < 35 = husk chimera is the largest vanilla monster that can be contained by default + IsContainable = prefab.ConfigElement.GetAttributeBool(nameof(IsContainable), def: Mass < 35.0f); CharacterList.Add(this); @@ -2258,7 +2265,10 @@ namespace Barotrauma { Vector2 targetMovement = GetTargetMovement(); AnimController.TargetMovement = targetMovement; - AnimController.IgnorePlatforms = AnimController.TargetMovement.Y < -0.1f; + if (SelectedItem?.GetComponent() is not { ControlCharacterPose: true }) + { + AnimController.IgnorePlatforms = AnimController.TargetMovement.Y < -0.1f; + } } if (AnimController is HumanoidAnimController humanAnimController) @@ -3503,9 +3513,11 @@ namespace Barotrauma UpdateAttackers(deltaTime); - foreach (var characterTalent in characterTalents) + //use a for loop instead of foreach because talents can unlock other talents via StatusEffectAction (see #17328) + //this way we'll just add them to the end of the list without causing a collection was modified exception + for (int i = 0; i < characterTalents.Count; i++) { - characterTalent.UpdateTalent(deltaTime); + characterTalents[i].UpdateTalent(deltaTime); } if (IsDead) { return; } @@ -5796,6 +5808,12 @@ namespace Barotrauma return info.UnlockedTalents.Contains(identifier); } + public bool IsTalentLocked(Identifier talentIdentifier) + { + if (info == null) { return true; } + return Info.GetSavedStatValue(StatTypes.LockedTalents, talentIdentifier) >= 1; + } + public bool HasUnlockedAllTalents() { if (TalentTree.JobTalentTrees.TryGet(Info.Job.Prefab.Identifier, out TalentTree talentTree)) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs index e9f1d2f0a..b0282a97c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs @@ -1022,6 +1022,15 @@ namespace Barotrauma partial void UpdateProjSpecific(float deltaTime); +#if SERVER + /// + /// How often the server can send messages about attacks being executed. Note that the timer is per-limb: if one limb executes an attack immediately after another, an network event can still be created. + /// Mainly relevant for attacks with no cooldown, e.g. fractal guardian's steam cannons which run continuously over time (we can't send events every frame) + /// + private const double MinExecuteAttackEventInterval = 0.5f; + private double lastExecuteAttackEventTime; +#endif + private readonly List contactBodies = new List(); /// /// Returns true if the attack successfully hit something. If the distance is not given, it will be calculated. @@ -1142,9 +1151,13 @@ namespace Barotrauma ExecuteAttack(damageTarget, targetLimb, out attackResult); } #if SERVER - GameMain.NetworkMember.CreateEntityEvent(character, new Character.ExecuteAttackEventData( - attackLimb: this, targetEntity: damageTarget, targetLimb: targetLimb, - targetSimPos: attackSimPos)); + if (Timing.TotalTime > lastExecuteAttackEventTime + MinExecuteAttackEventInterval) + { + GameMain.NetworkMember.CreateEntityEvent(character, new Character.ExecuteAttackEventData( + attackLimb: this, targetEntity: damageTarget, targetLimb: targetLimb, + targetSimPos: attackSimPos)); + lastExecuteAttackEventTime = Timing.TotalTime; + } #endif } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CustomAbilities/CharacterAbilityUnlockApprenticeshipTalentTree.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CustomAbilities/CharacterAbilityUnlockApprenticeshipTalentTree.cs index c6d9d476a..fa5e6af9e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CustomAbilities/CharacterAbilityUnlockApprenticeshipTalentTree.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CustomAbilities/CharacterAbilityUnlockApprenticeshipTalentTree.cs @@ -43,14 +43,14 @@ namespace Barotrauma.Abilities { foreach (Identifier identifier in option.TalentIdentifiers) { - if (IsShowCaseTalent(identifier, option) || TalentTree.IsTalentLocked(identifier, characters)) { continue; } + if (IsShowCaseTalent(identifier, option) || Character.IsTalentLocked(identifier)) { continue; } identifiers.Add(identifier); } foreach (var (_, value) in option.ShowCaseTalents) { - var ids = value.Where(i => !TalentTree.IsTalentLocked(i, characters)).ToImmutableHashSet(); + var ids = value.Where(i => !Character.IsTalentLocked(i)).ToImmutableHashSet(); if (ids.Count is 0) { continue; } identifiers.Add(value.GetRandomUnsynced()); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/TalentTree.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/TalentTree.cs index 5af044625..8cfe22970 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/TalentTree.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/TalentTree.cs @@ -131,7 +131,7 @@ namespace Barotrauma if (character.Info.GetTotalTalentPoints() - selectedTalents.Count <= 0) { return false; } if (!JobTalentTrees.TryGet(character.Info.Job.Prefab.Identifier, out TalentTree talentTree)) { return false; } - if (IsTalentLocked(talentIdentifier, Character.GetFriendlyCrew(character))) { return false; } + if (character.IsTalentLocked(talentIdentifier)) { return false; } if (character.Info.GetUnlockedTalentsInTree().Contains(talentIdentifier)) { @@ -163,16 +163,6 @@ namespace Barotrauma return false; } - public static bool IsTalentLocked(Identifier talentIdentifier, IEnumerable characterList) - { - foreach (Character c in characterList) - { - if (c.Info.GetSavedStatValue(StatTypes.LockedTalents, talentIdentifier) >= 1) { return true; } - } - - return false; - } - public static List CheckTalentSelection(Character controlledCharacter, IEnumerable selectedTalents) { List viableTalents = new List(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs b/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs index c70f3a767..6f0ac57f7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs @@ -251,7 +251,7 @@ namespace Barotrauma GameMain.NetworkMember.ShowNetStats = !GameMain.NetworkMember.ShowNetStats; })); - commands.Add(new Command("spawn|spawncharacter", "spawn [creaturename/jobname] [near/inside/outside/cursor] [team] [add to crew (true/false)]: Spawn a creature at a random spawnpoint (use the second parameter to only select spawnpoints near/inside/outside the submarine). You can also enter the name of a job (e.g. \"Mechanic\") to spawn a character with a specific job and the appropriate equipment.", null, + commands.Add(new Command("spawn|spawncharacter", "spawn [creaturename/jobname] [near/inside/outside/cursor] [team] [add to crew (true/false)] [name]: Spawn a creature at a random spawnpoint (use the second parameter to only select spawnpoints near/inside/outside the submarine). You can also enter the name of a job (e.g. \"Mechanic\") to spawn a character with a specific job and the appropriate equipment.", null, () => { string[] creatureAndJobNames = @@ -270,7 +270,7 @@ namespace Barotrauma }; }, isCheat: true)); - commands.Add(new Command("give|giveitem", "give|giveitem [itemname/itemidentifier] [amount] [condition]: Spawn an item in the inventory of the controlled character", + commands.Add(new Command("give|giveitem", "give|giveitem [itemname/itemidentifier] [amount] [condition] [quality]: Spawn an item in the inventory of the controlled character", (string[] args) => { if (Character.Controlled == null) @@ -291,9 +291,12 @@ namespace Barotrauma }, getValidArgs: () => { - return new string[][] + return new string[][] { - GetItemNameOrIdParams().ToArray() + GetItemNameOrIdParams().ToArray(), + new string[] { "1" }, + new string[] { "100" }, + ItemQualityNames.ToArray() }; }, isCheat: true)); @@ -310,7 +313,7 @@ namespace Barotrauma }; }, isCheat: true)); - commands.Add(new Command("spawnitem", "spawnitem [itemname/itemidentifier] [cursor/inventory/cargo/random/[name]] [amount] [condition]: Spawn an item at the position of the cursor, in the inventory of the controlled character, in the inventory of the client with the given name, or at a random spawnpoint if the location parameter is omitted or \"random\".", + commands.Add(new Command("spawnitem", "spawnitem [itemname/itemidentifier] [cursor/inventory/cargo/random/[name]] [amount] [condition] [quality]: Spawn an item at the position of the cursor, in the inventory of the controlled character, in the inventory of the client with the given name, or at a random spawnpoint if the location parameter is omitted or \"random\".", (string[] args) => { TrySpawnItem(args); @@ -320,7 +323,10 @@ namespace Barotrauma return new string[][] { GetItemNameOrIdParams().ToArray(), - GetSpawnPosParams().ToArray() + GetSpawnPosParams().ToArray(), + new string[] { "1" }, + new string[] { "100" }, + ItemQualityNames.ToArray() }; }, isCheat: true)); @@ -1323,6 +1329,7 @@ namespace Barotrauma } else { + if (GameMain.GameSession?.Map is Map map) { NewMessage("Map seed: " + map.Seed); } NewMessage("Level seed: " + Level.Loaded.Seed); NewMessage("Level generation params: " + Level.Loaded.GenerationParams.Identifier); NewMessage("Adjacent locations: " + (Level.Loaded.StartLocation?.Type.Identifier ?? "none".ToIdentifier()) + ", " + (Level.Loaded.StartLocation?.Type.Identifier ?? "none".ToIdentifier())); @@ -1332,17 +1339,29 @@ namespace Barotrauma } },null)); - commands.Add(new Command("teleportsub", "teleportsub [start/end/endoutpost/cursor]: Teleport the submarine to the position of the cursor, or the start or end of the level. The 'endoutpost' argument also automatically docks the sub with the outpost at the end of the level. WARNING: does not take outposts into account, so often leads to physics glitches. Only use for debugging.", + commands.Add(new Command("teleportsub", "teleportsub [start/end/endoutpost/cursor] [submarine_team]: Teleport the submarine to the position of the cursor, or the start or end of the level. The 'endoutpost' argument also automatically docks the sub with the outpost at the end of the level. WARNING: does not take outposts into account, so often leads to physics glitches. Only use for debugging.", onExecute:(string[] args) => { if (Submarine.MainSub == null) { return; } + Submarine submarineToTeleport = Submarine.MainSub; + if (args.Length > 1) + { + foreach (Submarine sub in Submarine.Loaded.Where(s => s.PhysicsBody.BodyType == FarseerPhysics.BodyType.Dynamic)) + { + if ((sub.Info.Name + "_" + sub.TeamID) == args[1]) + { + submarineToTeleport = sub; + break; + } + } + } if (args.Length == 0 || args[0].Equals("cursor", StringComparison.OrdinalIgnoreCase)) { #if SERVER ThrowError("Cannot teleport the sub to the position of the cursor. Use \"start\" or \"end\", or execute the command as a client."); #else - Submarine.MainSub.SetPosition(Screen.Selected.Cam.ScreenToWorld(PlayerInput.MousePosition)); + submarineToTeleport.SetPosition(Screen.Selected.Cam.ScreenToWorld(PlayerInput.MousePosition)); #endif } else if (args[0].Equals("start", StringComparison.OrdinalIgnoreCase)) @@ -1355,9 +1374,9 @@ namespace Barotrauma Vector2 pos = Level.Loaded.StartPosition; if (Level.Loaded.StartOutpost != null) { - pos -= Vector2.UnitY * (Submarine.MainSub.Borders.Height + Level.Loaded.StartOutpost.Borders.Height) / 2; + pos -= Vector2.UnitY * (submarineToTeleport.Borders.Height + Level.Loaded.StartOutpost.Borders.Height) / 2; } - Submarine.MainSub.SetPosition(pos); + submarineToTeleport.SetPosition(pos); } else if (args[0].Equals("end", StringComparison.OrdinalIgnoreCase)) { @@ -1369,9 +1388,9 @@ namespace Barotrauma Vector2 pos = Level.Loaded.EndPosition; if (Level.Loaded.EndOutpost != null) { - pos -= Vector2.UnitY * (Submarine.MainSub.Borders.Height + Level.Loaded.EndOutpost.Borders.Height) / 2; + pos -= Vector2.UnitY * (submarineToTeleport.Borders.Height + Level.Loaded.EndOutpost.Borders.Height) / 2; } - Submarine.MainSub.SetPosition(pos); + submarineToTeleport.SetPosition(pos); } else if (args[0].Equals("endoutpost", StringComparison.OrdinalIgnoreCase)) { @@ -1380,8 +1399,8 @@ namespace Barotrauma NewMessage("Can't teleport the sub to the end outpost (no outpost at the end of the level).", Color.Red); return; } - Submarine.MainSub.SetPosition(Level.Loaded.EndExitPosition - Vector2.UnitY * Submarine.MainSub.Borders.Height); - var submarineDockingPort = DockingPort.List.FirstOrDefault(d => d.Item.Submarine == Submarine.MainSub); + submarineToTeleport.SetPosition(Level.Loaded.EndExitPosition - Vector2.UnitY * submarineToTeleport.Borders.Height); + var submarineDockingPort = DockingPort.List.FirstOrDefault(d => d.Item.Submarine == submarineToTeleport); var outpostDockingPort = DockingPort.List.FirstOrDefault(d => d.Item.Submarine == Level.Loaded.EndOutpost); if (submarineDockingPort != null && outpostDockingPort != null) { @@ -1393,7 +1412,8 @@ namespace Barotrauma { return new string[][] { - new string[] { "start", "end", "endoutpost", "cursor" } + new string[] { "start", "end", "endoutpost", "cursor" }, + ListAvailableSubmarines() }; }, isCheat: true)); @@ -2566,7 +2586,17 @@ namespace Barotrauma return locationNames.ToArray(); } - + + private static string[] ListAvailableSubmarines() + { + List submarineNames = new(); + foreach (var submarine in Submarine.Loaded.Where(s => s.PhysicsBody.BodyType == FarseerPhysics.BodyType.Dynamic)) + { + submarineNames.Add(submarine.Info.Name + "_" + submarine.TeamID); + } + return submarineNames.ToArray(); + } + private static bool TryFindTeleportPosition(string locationName, out Vector2 teleportPosition) { if (Submarine.MainSub is Submarine mainSub && string.Equals(locationName, "mainsub", StringComparison.InvariantCultureIgnoreCase)) @@ -2949,7 +2979,7 @@ namespace Barotrauma isHuman = job != null || characterLowerCase == CharacterPrefab.HumanSpeciesName; } - ParseOptionalArgs(out Vector2 spawnPosition, out WayPoint spawnPoint, out CharacterTeamType? teamType, out bool addToCrew); + ParseOptionalArgs(out Vector2 spawnPosition, out WayPoint spawnPoint, out CharacterTeamType? teamType, out bool addToCrew, out string renameCharacter); if (usePreConfiguredNPC) { @@ -2980,6 +3010,14 @@ namespace Barotrauma CharacterInfo characterInfo = new CharacterInfo(CharacterPrefab.HumanSpeciesName, jobOrJobPrefab: job, variant: variant); Entity.Spawner.AddCharacterToSpawnQueue(CharacterPrefab.HumanSpeciesName, spawnPosition, characterInfo, onSpawn: newCharacter => { + if (renameCharacter != null) + { + if (renameCharacter.Length > 31) + { + renameCharacter = renameCharacter.Substring(0, 32); + } + newCharacter.Info.Name = renameCharacter; + } SetTeamAndCrew(newCharacter); newCharacter.GiveJobItems(isPvPMode: GameMain.GameSession?.GameMode is PvPMode, spawnPoint); newCharacter.GiveIdCardTags(spawnPoint); @@ -3007,7 +3045,7 @@ namespace Barotrauma } } - void ParseOptionalArgs(out Vector2 spawnPosition, out WayPoint spawnPoint, out CharacterTeamType? teamType, out bool addToCrew) + void ParseOptionalArgs(out Vector2 spawnPosition, out WayPoint spawnPoint, out CharacterTeamType? teamType, out bool addToCrew, out string renameCharacter) { spawnPosition = Vector2.Zero; spawnPoint = null; @@ -3093,6 +3131,12 @@ namespace Barotrauma ThrowError($"Could not parse the \"add to crew\" argument ({args[argIndex]}). Defaulting to {addToCrew}."); } } + argIndex++; + renameCharacter = null; + if (args.Length > argIndex) + { + renameCharacter = args[argIndex]; + } } } @@ -3100,6 +3144,7 @@ namespace Barotrauma { yield return "cursor"; yield return "inventory"; + yield return "cargo"; #if SERVER if (GameMain.Server != null) @@ -3140,6 +3185,8 @@ namespace Barotrauma } } + private static ImmutableArray ItemQualityNames = ["normal", "good", "excellent", "masterwork"]; + private static void TrySpawnItem(string[] args) { try @@ -3200,7 +3247,8 @@ namespace Barotrauma int amount = 1; int conditionPrc = 100; - + int itemQuality = 0; + if (TryGetSpawnPosParam(out string spawnLocation, out int spawnLocationIndex)) { switch (spawnLocation) @@ -3220,7 +3268,7 @@ namespace Barotrauma break; default: var matchingCharacter = FindMatchingCharacter(args.Skip(1).Take(1).ToArray()); - if (matchingCharacter != null){ spawnInventory = matchingCharacter.Inventory; } + if (matchingCharacter != null) { spawnInventory = matchingCharacter.Inventory; } break; } @@ -3229,10 +3277,21 @@ namespace Barotrauma if (!int.TryParse(args[spawnLocationIndex + 1], NumberStyles.Any, CultureInfo.InvariantCulture, out amount)) { amount = 1; } amount = Math.Min(amount, 100); } - + if (args.Length > spawnLocationIndex + 2) { - if (!int.TryParse(args[^1], NumberStyles.Any, CultureInfo.InvariantCulture, out conditionPrc)) { conditionPrc = 100; } + if (!int.TryParse(args[spawnLocationIndex + 2], NumberStyles.Any, CultureInfo.InvariantCulture, out conditionPrc)) { conditionPrc = 100; } + } + + if (args.Length > spawnLocationIndex + 3) + { + for (int i = 0; i <= Quality.MaxQuality; i++) + { + if (args[spawnLocationIndex + 3].ToLowerInvariant() == ItemQualityNames[i]) + { + itemQuality = i; + } + } } } @@ -3254,7 +3313,7 @@ namespace Barotrauma } else { - Entity.Spawner?.AddItemToSpawnQueue(itemPrefab, spawnPos.Value, condition: itemCondition); + Entity.Spawner?.AddItemToSpawnQueue(itemPrefab, spawnPos.Value, condition: itemCondition, quality: itemQuality); } } else if (spawnInventory != null) @@ -3281,6 +3340,7 @@ namespace Barotrauma } item.Condition = item.Health * Math.Clamp(conditionPrc / 100f, 0f, 1f); + item.Quality = itemQuality; } } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/EventAction.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/EventAction.cs index bf96cb286..7da8b324a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/EventAction.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/EventAction.cs @@ -31,12 +31,17 @@ namespace Barotrauma Actions = new List(); foreach (var e in element.Elements()) { - if (e.Name.ToString().Equals("statuseffect", StringComparison.OrdinalIgnoreCase)) + if (e.NameAsIdentifier().Equals("statuseffect")) { DebugConsole.ThrowError($"Error in event prefab \"{scriptedEvent.Prefab.Identifier}\". Status effect configured as a sub action. Please configure status effects as child elements of a StatusEffectAction.", contentPackage: element.ContentPackage); continue; } + else if (e.NameAsIdentifier().Equals(nameof(OnRoundEndAction))) + { + DebugConsole.ThrowError($"Error in event prefab \"{scriptedEvent.Prefab.Identifier}\". {nameof(OnRoundEndAction)} configured as a sub action. Please configure it as an action at the end of the event.", + contentPackage: element.ContentPackage); + } var action = Instantiate(scriptedEvent, e); if (action != null) { Actions.Add(action); } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs index d448ad904..4c1d983a4 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs @@ -123,7 +123,7 @@ namespace Barotrauma AddTargetPredicate( Tags.Traitor, ScriptedEvent.TargetPredicate.EntityType.Character, - e => e is Character c && (c.IsPlayer || c.IsBot) && c.IsTraitor && !c.IsIncapacitated); + e => e is Character c && (c.IsPlayer || c.IsBot) && c.IsTraitor && !c.IsIncapacitated && CharacterTeamMatches(c)); } private void TagNonTraitors() @@ -131,7 +131,7 @@ namespace Barotrauma AddTargetPredicate( Tags.NonTraitor, ScriptedEvent.TargetPredicate.EntityType.Character, - e => e is Character c && (c.IsPlayer || c.IsBot) && !c.IsTraitor && c.IsOnPlayerTeam && !c.IsIncapacitated); + e => e is Character c && (c.IsPlayer || c.IsBot) && !c.IsTraitor && c.IsOnPlayerTeam && !c.IsIncapacitated && CharacterTeamMatches(c)); } private void TagNonTraitorPlayers() @@ -139,7 +139,7 @@ namespace Barotrauma AddTargetPredicate( Tags.NonTraitorPlayer, ScriptedEvent.TargetPredicate.EntityType.Character, - e => e is Character c && c.IsPlayer && !c.IsTraitor && c.IsOnPlayerTeam && !c.IsIncapacitated); + e => e is Character c && c.IsPlayer && !c.IsTraitor && c.IsOnPlayerTeam && !c.IsIncapacitated && CharacterTeamMatches(c)); } private void TagBots(bool playerCrewOnly) @@ -151,7 +151,8 @@ namespace Barotrauma e is Character c && c.IsBot && (!c.IsIncapacitated || !IgnoreIncapacitatedCharacters) && - (!playerCrewOnly || c.TeamID == CharacterTeamType.Team1)); + (!playerCrewOnly || c.TeamID == CharacterTeamType.Team1) && + CharacterTeamMatches(c)); } private void TagCrew() @@ -171,7 +172,7 @@ namespace Barotrauma private void TagHumansByTag(Identifier tag) { - AddTarget(Tag, Character.CharacterList.Where(c => c.HumanPrefab != null && c.HumanPrefab.GetTags().Contains(tag))); + AddTarget(Tag, Character.CharacterList.Where(c => c.HumanPrefab != null && c.HumanPrefab.GetTags().Contains(tag) && CharacterTeamMatches(c))); } private void TagHumansByJobIdentifier(Identifier jobIdentifier) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs index 75155b00c..faf53a468 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs @@ -168,6 +168,9 @@ namespace Barotrauma.Items.Components set { attachedByDefault = value; } } +#if DEBUG + [Editable] +#endif [Serialize("0.0,0.0", IsPropertySaveable.No, description: "The position the character holds the item at (in pixels, as an offset from the character's shoulder)."+ " For example, a value of 10,-100 would make the character hold the item 100 pixels below the shoulder and 10 pixels forwards.")] public Vector2 HoldPos @@ -177,8 +180,10 @@ namespace Barotrauma.Items.Components } //the distance from the holding characters elbow to center of the physics body of the item protected Vector2 holdPos; - +#if DEBUG + [Editable] +#endif [Serialize("0.0,0.0", IsPropertySaveable.No, description: "The position the character holds the item at when aiming (in pixels, as an offset from the character's shoulder)."+ " Works similarly as HoldPos, except that the position is rotated according to the direction the player is aiming at. For example, a value of 10,-100 would make the character hold the item 100 pixels below the shoulder and 10 pixels forwards when aiming directly to the right.")] public Vector2 AimPos @@ -279,6 +284,9 @@ namespace Barotrauma.Items.Components /// /// For setting the handle positions using status effects /// +#if DEBUG + [Editable] +#endif public Vector2 Handle1 { get { return ConvertUnits.ToDisplayUnits(handlePos[0]); } @@ -299,6 +307,9 @@ namespace Barotrauma.Items.Components /// /// For setting the handle positions using status effects /// +#if DEBUG + [Editable] +#endif public Vector2 Handle2 { get { return ConvertUnits.ToDisplayUnits(handlePos[1]); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs index b6a70a3f3..343c92aea 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs @@ -119,7 +119,7 @@ namespace Barotrauma.Items.Components return OnPicked(picker, pickDroppedStack: true); } - public virtual bool OnPicked(Character picker, bool pickDroppedStack) + public bool OnPicked(Character picker, bool pickDroppedStack, bool playSound = true) { //if the item has multiple Pickable components (e.g. Holdable and Wearable, check that we don't equip it in hands when the item is worn or vice versa) if (item.GetComponents().Any()) @@ -156,7 +156,7 @@ namespace Barotrauma.Items.Components ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker); #if CLIENT - if (!GameMain.Instance.LoadingScreenOpen && picker == Character.Controlled) { SoundPlayer.PlayUISound(GUISoundType.PickItem); } + if (!GameMain.Instance.LoadingScreenOpen && playSound && picker == Character.Controlled) { SoundPlayer.PlayUISound(GUISoundType.PickItem); } PlaySound(ActionType.OnPicked, picker); #endif if (pickDroppedStack) @@ -164,7 +164,7 @@ namespace Barotrauma.Items.Components foreach (var droppedItem in droppedStack) { if (droppedItem == item) { continue; } - droppedItem.GetComponent().OnPicked(picker, pickDroppedStack: false); + droppedItem.GetComponent().OnPicked(picker, pickDroppedStack: false, playSound: false); } } return true; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/LinkedControllerCharacterComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/LinkedControllerCharacterComponent.cs index 6faa6db36..ed32f1c27 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/LinkedControllerCharacterComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/LinkedControllerCharacterComponent.cs @@ -42,6 +42,9 @@ namespace Barotrauma.Items.Components set; } + [Serialize(true, IsPropertySaveable.No, description: $"Should this item be removed if the linked character is null?")] + public bool RemoveItemIfCharacterNull { get; set; } + public Character? Character { get; private set; } public bool DoesBleed => Character?.DoesBleed == true; @@ -50,6 +53,8 @@ namespace Barotrauma.Items.Components public LinkedControllerCharacterComponent(Item item, ContentXElement element) : base(item, element) { + IsActive = true; + #if CLIENT spriteOverrides = element.Elements() .Where(static e => e.Name.LocalName.ToLowerInvariant() == "spriteoverride") @@ -58,6 +63,16 @@ namespace Barotrauma.Items.Components #endif } + public override void Update(float deltaTime, Camera cam) + { + base.Update(deltaTime, cam); + + if (RemoveItemIfCharacterNull && GameMain.NetworkMember is not { IsClient: true } && (Character == null || Character.Removed)) + { + Entity.Spawner?.AddEntityToRemoveQueue(Item); + } + } + public void UpdateLinkedCharacter(Character? character) { Character = character; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs index 9e2d344fe..f83763ae7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs @@ -525,7 +525,7 @@ namespace Barotrauma.Items.Components return true; } - if (containerToSpawnOnSelectedItem.Inventory.AllItems.Any(x => x.Prefab == spawnItemOnSelectedPrefab)) + if (containerToSpawnOnSelectedItem.Inventory.AllItems.Any(item => item == spawnedItemOnSelected)) { return true; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs index c6cb73978..201d1030a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs @@ -208,8 +208,6 @@ namespace Barotrauma.Items.Components amountMultiplier = (int)itemCreationMultiplier.Value; } - ApplyDeconstructionStatusEffects(targetItem, ActionType.OnDeconstructed, 1f); - if (targetItem.Prefab.RandomDeconstructionOutput) { int amount = targetItem.Prefab.RandomDeconstructionOutputAmount; @@ -339,6 +337,8 @@ namespace Barotrauma.Items.Components if (targetItem.AllowDeconstruct && allowRemove) { + ApplyDeconstructionStatusEffects(targetItem, ActionType.OnDeconstructed, 1f); + //drop all items that are inside the deconstructed item foreach (ItemContainer ic in targetItem.GetComponents()) { @@ -474,6 +474,7 @@ namespace Barotrauma.Items.Components // Move items again since the status effect could have spawned additional items in the character inventory MoveItemsFromCharacterToOutput(); + character.Kill(CauseOfDeathType.Unknown, causeOfDeathAffliction: null); Entity.Spawner?.AddEntityToRemoveQueue(character); }, 0.1f); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Fabricator.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Fabricator.cs index d0c8b38ac..2ae8e0ec8 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Fabricator.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Fabricator.cs @@ -732,6 +732,7 @@ namespace Barotrauma.Items.Components } private readonly HashSet usedIngredients = new HashSet(); + private readonly Dictionary ingredientFlexibilityCache = new Dictionary(); public bool MissingRequiredRecipe(FabricationRecipe fabricableItem, Character character) { @@ -786,10 +787,24 @@ namespace Barotrauma.Items.Components //maintain a list of used ingredients so we don't end up considering the same item a suitable for multiple required ingredients usedIngredients.Clear(); - return fabricableItem.RequiredItems.All(requiredItem => + // Items are considered more flexible if they can be used in many different requirements + ingredientFlexibilityCache.Clear(); + foreach (var prefab in fabricableItem.RequiredItems.SelectMany(static r => r.ItemPrefabs)) + { + ingredientFlexibilityCache[prefab] = fabricableItem.RequiredItems.Count(r => r.ItemPrefabs.Contains(prefab)); + } + + return fabricableItem.RequiredItems + // Match the most restrictive requirements to least restrictive first, while we still have items that we can use + .OrderBy(static r => r.ItemPrefabs.Count()) + .ThenByDescending(static requiredItem => requiredItem.Amount) + .All(requiredItem => { int availableItemsAmount = 0; - foreach (ItemPrefab requiredPrefab in requiredItem.ItemPrefabs) + foreach (ItemPrefab requiredPrefab in requiredItem.ItemPrefabs + // Fill in the least flexible and more abundant items first, so we don't end up using unique items first + .OrderBy(GetItemFlexibility) + .ThenByDescending(GetAvailableItemsCount)) { if (!availableIngredients.TryGetValue(requiredPrefab.Identifier, out var availableItems)) { continue; } @@ -811,6 +826,16 @@ namespace Barotrauma.Items.Components return false; }); + + int GetAvailableItemsCount(ItemPrefab itemPrefab) + { + return availableIngredients.TryGetValue(itemPrefab.Identifier, out var list) ? list.Count : 0; + } + + int GetItemFlexibility(ItemPrefab itemPrefab) + { + return ingredientFlexibilityCache[itemPrefab]; + } } private float GetRequiredTime(FabricationRecipe fabricableItem, Character user) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerDistributor.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerDistributor.cs index 6086b0b24..f9edf52f0 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerDistributor.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerDistributor.cs @@ -36,7 +36,7 @@ namespace Barotrauma.Items.Components } } - public LocalizedString? DisplayName { get; private set; } + public LocalizedString DisplayName { get; private set; } private float supplyRatio = 1f; public float SupplyRatio @@ -80,6 +80,7 @@ namespace Barotrauma.Items.Components SupplyRatio = element.GetAttributeFloat("ratio", SupplyRatio); } + DisplayName = TextManager.Get(name).Fallback(name); #if CLIENT CreateGUI(); if (Screen.Selected is not { IsEditor: true }) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs index b2ff80ee6..e1accd3ca 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs @@ -252,7 +252,7 @@ namespace Barotrauma.Items.Components { PhysicsBody = new PhysicsBody(currentWidth, currentHeight, radius: 0.0f, density: 1.5f, BodyType.Static, Physics.CollisionWall, LevelTrigger.GetCollisionCategories(triggeredBy)) { - UserData = item + UserData = this }; } else @@ -260,7 +260,7 @@ namespace Barotrauma.Items.Components currentRadius = Math.Max(ConvertUnits.ToSimUnits(Radius * item.Scale), 0.01f); PhysicsBody = new PhysicsBody(width: 0.0f, height: 0.0f, radius: currentRadius, density: 1.5f, BodyType.Static, Physics.CollisionWall, LevelTrigger.GetCollisionCategories(triggeredBy)) { - UserData = item + UserData = this }; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs index a52d1d94c..0d3919b80 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs @@ -734,8 +734,8 @@ namespace Barotrauma [Serialize(false, IsPropertySaveable.No, description: "Hides the condition displayed in the item's tooltip.")] public bool HideConditionInTooltip { get; set; } - [Serialize("", IsPropertySaveable.No, description: "If set, displays if the given fabrication recipe has been unlocked or not in the tooltip. The actual unlocking of the recipe should be handled in a status effect.")] - public Identifier UnlockedRecipeInToolTip { get; set; } + [Serialize("", IsPropertySaveable.No, description: "If set, the item's tooltip displays if the given fabrication recipe has been unlocked or not. The actual unlocking of the recipe should be handled in a status effect.")] + public Identifier[] UnlockedRecipeInToolTip { get; set; } //if true and the item has trigger areas defined, characters need to be within the trigger to interact with the item //if false, trigger areas define areas that can be used to highlight the item diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs index 71f4b0752..cc3e1691b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs @@ -2971,11 +2971,39 @@ namespace Barotrauma string percentage = string.Format(CultureInfo.InvariantCulture, "{0:P2}", (float)spawnPointsContainingResources / PathPoints.Count); DebugConsole.NewMessage($"Level resources spawned: {itemCount}\n" + $" Spawn points containing resources: {spawnPointsContainingResources} ({percentage})\n" + - $" Total value: {PathPoints.Sum(p => p.ClusterLocations.Sum(c => c.Resources.Sum(r => r.Prefab.DefaultPrice?.Price ?? 0)))} mk"); + $" Total value: {GetTotalLevelResourceValue()} mk"); if (AbyssResources.Count > 0) { DebugConsole.NewMessage($"Abyss resources spawned: {AbyssResources.Sum(a => a.Resources.Count)}\n" + - $" Total value: {AbyssResources.Sum(c => c.Resources.Sum(r => r.Prefab.DefaultPrice?.Price ?? 0))} mk"); + $" Total value: {GetTotalAbyssResourceValue()} mk"); + } + + int GetTotalLevelResourceValue() + { + int value = 0; + foreach (var pathPoint in PathPoints) + { + foreach (var clusterLocation in pathPoint.ClusterLocations) + { + foreach (var resource in clusterLocation.Resources) + { + value += resource.Prefab.DefaultPrice?.Price ?? 0; + } + } + } + return value; + } + int GetTotalAbyssResourceValue() + { + int value = 0; + foreach (var clusterLocation in AbyssResources) + { + foreach (var resource in clusterLocation.Resources) + { + value += resource.Prefab.DefaultPrice?.Price ?? 0; + } + } + return value; } #endif @@ -3204,7 +3232,6 @@ namespace Barotrauma } } - /// Used by clients to set the rotation for the resources public List GenerateMissionResources(ItemPrefab prefab, int requiredAmount, PositionType positionType, IEnumerable targetCaves = null) { var allValidLocations = GetAllValidClusterLocations(); @@ -5150,6 +5177,7 @@ namespace Barotrauma renderer.Dispose(); renderer = null; } + backgroundCreatureManager?.Clear(); #endif if (LevelObjectManager != null) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObject.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObject.cs index 6d90bcda0..6c8d8cc6b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObject.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObject.cs @@ -11,7 +11,7 @@ namespace Barotrauma partial class LevelObject : ISpatialEntity, IDamageable, ISerializableEntity { public readonly LevelObjectPrefab Prefab; - public Vector3 Position; + public Vector3 Position { get; set; } public float NetworkUpdateTimer; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObjectManager.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObjectManager.cs index 59c14535a..5d6de4696 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObjectManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelObjectManager.cs @@ -457,7 +457,7 @@ namespace Barotrauma if (newObject.NeedsUpdate) { updateableObjects.Add(newObject); } //add some variance to the Z position to prevent z-fighting //(based on the x and y position of the object, scaled to be visually insignificant) - newObject.Position.Z += (minX + minY) % 100.0f * 0.00001f; + newObject.Position += new Vector3(0, 0, (minX + minY) % 100.0f * 0.00001f); int xStart = (int)Math.Floor(minX / GridSize); int xEnd = (int)Math.Floor(maxX / GridSize); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs index 637d5d2a8..945f4bc6e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs @@ -348,11 +348,22 @@ namespace Barotrauma { price *= 1f - characters.Max(static c => c.GetStatValue(StatTypes.StoreBuyMultiplierAffiliated, includeSaved: false)); price *= 1f - characters.Max(static c => c.Info.GetSavedStatValue(StatTypes.StoreBuyMultiplierAffiliated, Tags.StatIdentifierTargetAll)); - price *= 1f - characters.Max(c => item.Tags.Sum(tag => c.Info.GetSavedStatValue(StatTypes.StoreBuyMultiplierAffiliated, tag))); + price *= 1f - characters.Max(c => GetStatValuesForItem(c, item, StatTypes.StoreBuyMultiplierAffiliated)); } price *= 1f - characters.Max(static c => c.GetStatValue(StatTypes.StoreBuyMultiplier, includeSaved: false)); - price *= 1f - characters.Max(c => item.Tags.Sum(tag => c.Info.GetSavedStatValue(StatTypes.StoreBuyMultiplier, tag))); + price *= 1f - characters.Max(c => GetStatValuesForItem(c, item, StatTypes.StoreBuyMultiplier)); } + + static float GetStatValuesForItem(Character character, ItemPrefab item, StatTypes statType) + { + float statValueSum = 0.0f; + foreach (Identifier itemTag in item.Tags) + { + statValueSum += character.Info.GetSavedStatValue(statType, itemTag); + } + return statValueSum; + } + // Price should never go below 1 mk return Math.Max((int)price, 1); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs index 710397b4a..6f80c0a4a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs @@ -487,7 +487,19 @@ namespace Barotrauma var portrait = new Sprite(subElement, lazyLoad: true); if (portrait != null) { +#if CLIENT + if (!File.Exists(portrait.FilePath)) + { + DebugConsole.ThrowError($"Error in location type \"{Identifier}\": cannot find the location portrait \"{portrait.FilePath}\"."); + } + else + { + portraitsList.Add(portrait); + } +#elif SERVER + // Add without checking the path, since servers don't parse the file path of the sprite portraitsList.Add(portrait); +#endif } break; case "store": diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs index 308234df4..9a1f277db 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs @@ -261,15 +261,7 @@ namespace Barotrauma } } - foreach (var endLocation in EndLocations) - { - if (endLocation.Type?.ForceLocationName is { IsEmpty: false }) - { - endLocation.ForceName(endLocation.Type.ForceLocationName); - } - } - - AssignEndLocationLevelData(); + AssignEndLocationLevelData(campaign); //backwards compatibility: if locations go out of bounds (map saved with different generation parameters before width/height were included in the xml) float maxX = Locations.Select(l => l.MapPosition.X).Max(); @@ -973,13 +965,43 @@ namespace Barotrauma previousToEndLocation.Connections.Add(endConnection); endLocation.Connections.Add(endConnection); - AssignEndLocationLevelData(); + AssignEndLocationLevelData(campaign); } - private void AssignEndLocationLevelData() + /// + /// Assigns the correct outpost generation parameters to the end locations. Also checks and ensures that all of them are correctly assigned to the end biome, and have a location type that can be generated in the end biome. + /// Strangely shaped custom maps may sometimes generate in a way that there aren't enough locations in the last biome to assign as the end locations, and we may end up choosing locations in the second-to-last biome instead - let's correct that here. + /// + /// + /// + private void AssignEndLocationLevelData(CampaignMode campaign) { + Biome endBiome = Biome.Prefabs.OrderBy(p => p.UintIdentifier).FirstOrDefault(b => b.IsEndBiome) ?? throw new InvalidOperationException("Could not find an end biome to assign to the end locations."); + LocationType endLocationType = + LocationType.Prefabs + .OrderBy(p => p.UintIdentifier) + .FirstOrDefault(IsSuitableEndLocationType) + ?? throw new InvalidOperationException("Could not find an a location type to assign to the end locations."); + + bool IsSuitableEndLocationType(LocationType lt) + { + return lt.AreaSettings.Any(s => + s.Commonness > 0 && + (s.MatchesBiome(endBiome.Identifier) || s.MatchesZone(generationParams.DifficultyZones))); + } + for (int i = 0; i < endLocations.Count; i++) { + if (endLocations[i].Biome != endBiome) + { + endLocations[i].Biome = endBiome; + endLocations[i].LevelData = new LevelData(endLocations[i], this, endLocations[i].LevelData.Difficulty); + } + endLocations[i].ChangeType(campaign: campaign, endLocationType); + if (endLocationType.ForceLocationName is { IsEmpty: false }) + { + endLocations[i].ForceName(endLocationType.ForceLocationName); + } endLocations[i].LevelData.ReassignGenerationParams(Seed); var outpostParams = OutpostGenerationParams.OutpostParams.FirstOrDefault(p => p.ForceToEndLocationIndex == i); if (outpostParams != null) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs index b96b7f1a7..a2d32c05c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs @@ -275,7 +275,7 @@ namespace Barotrauma { CreateStairBodies(); } - else if (HasBody) + else if (Prefab.Body) { CreateSections(); UpdateSections(); @@ -346,7 +346,7 @@ namespace Barotrauma { Rectangle oldRect = Rect; base.Rect = value; - if (HasBody) + if (Prefab.Body) { CreateSections(); UpdateSections(); @@ -668,7 +668,7 @@ namespace Barotrauma { prevSections = Sections.ToArray(); } - if (!HasBody) + if (!Prefab.Body) { if (FlippedX && IsHorizontal) { @@ -685,7 +685,7 @@ namespace Barotrauma xsections = 1; ysections = 1; } - Sections = new WallSection[xsections]; + Sections = new WallSection[Math.Max(xsections, ysections)]; } else { @@ -1635,7 +1635,7 @@ namespace Barotrauma CreateStairBodies(); } - if (HasBody) + if (Prefab.Body) { CreateSections(); UpdateSections(); @@ -1663,7 +1663,7 @@ namespace Barotrauma CreateStairBodies(); } - if (HasBody) + if (Prefab.Body) { CreateSections(); UpdateSections(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs index e760df983..6269e39ac 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs @@ -29,6 +29,31 @@ namespace Barotrauma partial class SubmarineInfo : IDisposable { + public static HashSet SubmarinePathsWithRemoteStorage { get; set; } = []; + + public bool SaveToRemoteStorage + { + get + { + if (FilePath == null) { return false; } + + return SubmarinePathsWithRemoteStorage.Contains(FilePath.CleanUpPathCrossPlatform(correctFilenameCase: false)); + } + set + { + if (FilePath == null) { return; } + + if (value) + { + SubmarinePathsWithRemoteStorage.Add(FilePath.CleanUpPathCrossPlatform(correctFilenameCase: false)); + } + else + { + SubmarinePathsWithRemoteStorage.Remove(FilePath.CleanUpPathCrossPlatform(correctFilenameCase: false)); + } + } + } + private static List savedSubmarines = new List(); public static IEnumerable SavedSubmarines => savedSubmarines; @@ -197,6 +222,8 @@ namespace Barotrauma set; } + public bool IsFromRemoteStorage; + /// /// When enabled, the XML element is not loaded until it is accessed. /// diff --git a/Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs b/Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs index 8f22a4da0..ac59bd3ac 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs @@ -562,6 +562,19 @@ namespace Barotrauma IgnoredHints.Init(currentConfigDoc.Root.GetChildElement("ignoredhints")); DebugConsoleMapping.Init(currentConfigDoc.Root.GetChildElement("debugconsolemapping")); CompletedTutorials.Init(currentConfigDoc.Root.GetChildElement("tutorials")); + var submarineSettings = currentConfigDoc.Root.GetChildElement("submarinesettings"); + if (submarineSettings != null) + { + SubmarineInfo.SubmarinePathsWithRemoteStorage.Clear(); + foreach (XElement subElement in submarineSettings.Elements("SubmarineWithRemoteStorage")) + { + string path = subElement.GetAttributeString("path", ""); + if (!path.IsNullOrEmpty()) + { + SubmarineInfo.SubmarinePathsWithRemoteStorage.Add(path); + } + } + } #endif } else @@ -689,7 +702,14 @@ namespace Barotrauma XElement tutorialsElement = new XElement("tutorials"); root.Add(tutorialsElement); CompletedTutorials.Instance.SaveTo(tutorialsElement); - + + XElement submarineSettings = new XElement("submarinesettings"); root.Add(submarineSettings); + + SubmarineInfo.SubmarinePathsWithRemoteStorage.ForEach(path => + { + submarineSettings.Add(new XElement("SubmarineWithRemoteStorage", new XAttribute("path", path))); + }); + XElement keyMappingElement = new XElement("keymapping", currentConfig.KeyMap.Bindings.Select(kvp => new XAttribute(kvp.Key.ToString(), kvp.Value.ToString()))); diff --git a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs index 2fc581c16..2971dd962 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs @@ -1779,7 +1779,7 @@ namespace Barotrauma offset *= item.Scale; if (item.FlippedX) { offset.X *= -1; } if (item.FlippedY) { offset.Y *= -1; } - offset = Vector2.Transform(offset, Matrix.CreateRotationZ(-item.RotationRad)); + offset = Vector2.Transform(offset, Matrix.CreateRotationZ(item.body?.Rotation ?? -item.RotationRad)); } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Steam/RemoteStorageHelper.cs b/Barotrauma/BarotraumaShared/SharedSource/Steam/RemoteStorageHelper.cs new file mode 100644 index 000000000..e9fbed23e --- /dev/null +++ b/Barotrauma/BarotraumaShared/SharedSource/Steam/RemoteStorageHelper.cs @@ -0,0 +1,105 @@ +#nullable enable +using Barotrauma.IO; +using Microsoft.Xna.Framework; +using Steamworks; +using System; +using System.Diagnostics.CodeAnalysis; +namespace Barotrauma.Steam; + +internal static partial class RemoteStorageHelper +{ + public static readonly Color SteamColor = Color.DodgerBlue; + public static readonly string DebugPrefix = $"‖color:{SteamColor.ToStringHex()}‖[Remote Storage]‖end‖"; + + /// Attempts to read a file from remote storage into a byte array. + /// The remote file to read from. + /// The bytes read from the remote file. Returns if the operation failed. + /// + /// if the operation was successful.
+ /// if the operation failed. + /// + public static bool TryRead(this SteamRemoteStorage.RemoteFile remoteFile, [NotNullWhen(returnValue: true)] out byte[]? bytes, bool logError = true) + { + bytes = SteamRemoteStorage.FileRead(remoteFile.Filename); + bool success = bytes != null; + + if (logError && !success) + { + DebugConsole.ThrowError($"{DebugPrefix} Failed to read file \"{remoteFile.Filename}\" from remote storage: operation failed."); + } + + return success; + } + + /// Attempts to write a file to remote storage. + /// The path of the local file to read from. + /// The name of the remote file to write to. If , the file name of is used. + /// If , overwriting existing remote files is allowed. + /// + /// if the operation was successful.
+ /// if the operation failed. + /// + public static bool TryWrite(string localPath, string? saveAs = null, bool allowOverwrite = false, bool logError = true) + { + string fileName = saveAs ?? Path.GetFileName(localPath); + + if (!allowOverwrite && SteamRemoteStorage.FileExists(fileName)) + { + if (logError) + { + DebugConsole.ThrowError($"{DebugPrefix} Failed to write file \"{fileName}\" to remote storage: file already exists."); + } + return false; + } + + byte[] data; + + try + { + data = File.ReadAllBytes(localPath); + } + catch (Exception exception) + { + if (logError) + { + DebugConsole.ThrowError($"{DebugPrefix} Failed to read file \"{fileName}\" while writing to remote storage: {exception}"); + } + return false; + } + + bool success = SteamRemoteStorage.FileWrite(fileName, data); + + if (logError && !success) + { + DebugConsole.ThrowError($"{DebugPrefix} Failed to write file \"{fileName}\" to remote storage: operation failed."); + } + + return success; + } + + /// Attempts to delete a file from remote storage. + /// The name of the remote file to delete. + /// + /// if the operation was successful.
+ /// if the operation failed. + /// + public static bool TryDelete(string fileName, bool logError = true) + { + bool success = SteamRemoteStorage.FileDelete(fileName); + + if (logError && !success) + { + DebugConsole.ThrowError($"{DebugPrefix} Failed to delete file \"{fileName}\" from remote storage: operation failed."); + } + + return success; + } + + /// Checks if a file is stored remotely. + /// The name of the remote file to check. + /// + /// if the file is stored.
+ /// if the file is not stored or the operation failed. + /// + public static bool IsStored(string fileName) => SteamRemoteStorage.FileExists(fileName); +} diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt index 1e029d35c..9f31a1e87 100644 --- a/Barotrauma/BarotraumaShared/changelog.txt +++ b/Barotrauma/BarotraumaShared/changelog.txt @@ -1,4 +1,58 @@ ------------------------------------------------------------------------------------------------------------------------------------------------- +v1.13.3.1 (Summer Update 2026) +------------------------------------------------------------------------------------------------------------------------------------------------- + +Submarine reworks: +- Humpback, Orca 2, Azimuth, Typhon, and Herja have received their visual and gameplay reworks. +- The command room of the Orca 2 is now located at the center of the submarine. +- Typhon now comes with valves and pipe weakpoints. +- Herja has been upgraded with a power distributor, befitting its high-tech theme. + +Changes and additions: +- Added an option to back up your custom submarines in the Steam Cloud. Can be enabled per-submarine using a checkbox in the sub editor's save dialog. +- Added quality parameter to the give/spawnitem console commands. Allows spawning in items with non-default quality. +- The teleportsub console command has a parameter for choosing which submarine to teleport. +- The spawncharacter console command has a parameter for renaming the spawned character. +- The showseed console command displays the map seed too if used in campaign mode. + +Multiplayer: +- Fixed monster attacks that run over time (e.g. when fractal guardians fire the steam cannon) causing an excessive amount of network usage in multiplayer. +- Fixed an exploit that allowed modified clients to cause other clients to eventually get out of sync and disconnect. +- Fixed inability to drag and drop stacks of items to other players in multiplayer. +- Fixed submarine voting not working in campaign mode. + +Miscellaneous fixes: +- Fixed security (or anyone else) not reacting to attacking stunned/incapacitated characters. +- Fixed the item pickup sound playing multiple times, for every item in a stack you're picking up. +- Fixed the item dropping sound playing twice when dropping an item. +- Fixed being unable to fabricate certain items with specific combinations of materials. Happened in some cases where the recipe accepted multiple different materials as ingredients: the fabricator would got through the requirements in order, and always take the first available items without considering that the item could've been necessary for another, more strict requirement. +- Followup to the "infinite explosion" fix in Summer Update 2025: the previous fix only applied to oxygen tank shelves, but it turned out oxygen generators could also cause the same kind of "explosion loop" where tanks keep exploding and getting refilled by the oxygen generator. +- Fixed "inspirational leader" talent not giving bonus XP like the description says it should. +- Fixed characters being able to drop off platforms while using a periscope (inconsistent with other movement inputs being disabled while on a periscope). +- Fixed bots being unable to extinguish fires in connected subs (e.g. in Remora's drone). +- Fixed parts of the CPR button not being clickable on the health HUD on certain resolutions (was getting blocked by the limb indicators). +- Fixed nuclear shells fabricated with the cheaper recipe variant not giving the "I am become death" achievement. +- Fixed gravity spheres (or more generally, any items with a triggercomponent) taking damage when you cut their trigger area with a plasma cutter, rather than the actual collider of the item. +- Fixed equip buttons being clickable despite the slot being hidden. Meant that when you had equipped an item in your hand, you could click an invisible button at the left side of the inventory where the hand slots would appear. +- Fixed turrets not showing the ammo on the HUD if the ammo is inside the turret itself, rather than a linked loader. +- If one of the unique hireable characters (e.g. Ignatius May, Aunt Doris) dies in the outpost before you hire them, they can no longer appear elsewhere or be hired. +- Fixed cargo scooter lights working, but not draining the battery, when the battery is in another slot than the battery slot. +- Fixed custom interaction messages set on items in the sub editor no longer appearing in-game. +- Allow combining defense bot ammo boxes the same way as other ammo boxes and magazines (merging their ammo together). +- Fixed the character deconstruction bag staying in the deconstructor if you do a level transition while a character is inside the deconstructor. +- Fixed items duplicating if a character gets deconstructed without dying first (possible e.g. by taking advantage of the Miracle Worker talent). +- Fixed crafting blueprint tooltips not showing whether the recipe has been unlocked or not. +- Fixed valves potentially getting stuck in a non-interactable state if the round ends immediately after one's been toggled. + +Modding: +- Fixed "LockedTalents" PermanentStat locking the talent for everyone (not used in any vanilla talent). +- Clients are allowed to use colored text in their chat messages when they have the "chat spam immunity" permission. Colored text was disabled in client-sent chat messages in the previous update due to some ways in which it can be abused, but turns out there were some users relying on this functionality. +- Fixed OnDeconstructed status effect triggering when the item is not deconstructed in some cases (e.g. researching unidentified genetic material without stabilozine). +- Fixed the special locations at the end of the campaign map generating incorrectly on very short maps. +- Fixed status effects using OffsetCopiesEntityTransform not taking physics body rotation into account. +- Fixed TagAction's Team setting being ignored when tagging characters in certain ways (e.g. traitors, non-traitors, bots, human prefab tags). + +------------------------------------------------------------------------------------------------------------------------------------------------- v1.12.7.0 ------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05b530ad5..d0ad6514e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ You need a version of Visual Studio that supports C# 10 to compile game. If you When installing on Windows, make sure you select ".NET desktop development" during the install process to make sure you have the required features to work with Barotrauma. #### Linux -You will need to install the .NET 6 SDK according to the instructions laid out on Microsoft's docs: https://docs.microsoft.com/en-us/dotnet/core/install/linux +You will need to install the .NET 8 SDK according to the instructions laid out on Microsoft's docs: https://docs.microsoft.com/en-us/dotnet/core/install/linux To edit the source code, we recommend using [Visual Studio Code](https://code.visualstudio.com/) with [Microsoft's C# extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp). From 06616535f433be006487a108016d9fbf45d5e05c Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Tue, 16 Jun 2026 15:37:52 +0300 Subject: [PATCH 3/3] Updated bug report template --- .github/DISCUSSION_TEMPLATE/bug-reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/DISCUSSION_TEMPLATE/bug-reports.yml b/.github/DISCUSSION_TEMPLATE/bug-reports.yml index ec9c8b991..6f4b24417 100644 --- a/.github/DISCUSSION_TEMPLATE/bug-reports.yml +++ b/.github/DISCUSSION_TEMPLATE/bug-reports.yml @@ -73,8 +73,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: - - v1.12.6.2 (Spring Update 2026) - - Unstable v1.13.1.0 + - v1.13.3.1 (Summer Update 2026) - Other validations: required: true