Unstable 1.2.4.0

2023-11-30 13:53:00 +02:00
parent 8a2e2ea0ae
commit fb5ea537bf
210 changed files with 4201 additions and 1283 deletions
@@ -254,7 +254,7 @@ namespace Barotrauma
                RelativeSpacing = 0.02f,
            };

-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), location.Name, font: GUIStyle.LargeFont)
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), location.DisplayName, font: GUIStyle.LargeFont)
            {
                AutoScaleHorizontal = true
            };
@@ -598,9 +598,10 @@ namespace Barotrauma
                    break;
                case CampaignMode.InteractionType.Crew:
                    CrewManagement.UpdateCrew();
+                    CrewManagement.UpdateHireables();
                    break;
                case CampaignMode.InteractionType.PurchaseSub:
-                    if (submarineSelection == null) submarineSelection = new SubmarineSelection(false, () => Campaign.ShowCampaignUI = false, tabs[(int)CampaignMode.InteractionType.PurchaseSub].RectTransform);
+                    submarineSelection ??= new SubmarineSelection(false, () => Campaign.ShowCampaignUI = false, tabs[(int)CampaignMode.InteractionType.PurchaseSub].RectTransform);
                    submarineSelection.RefreshSubmarineDisplay(true, setTransferOptionToTrue: true);
                    break;
                case CampaignMode.InteractionType.Map:
@@ -258,8 +258,8 @@ namespace Barotrauma

            graphics.BlendState = BlendState.NonPremultiplied;
            graphics.SamplerStates[0] = SamplerState.LinearWrap;
-            Quad.UseBasicEffect(renderTargetBackground);
-            Quad.Render();
+            GraphicsQuad.UseBasicEffect(renderTargetBackground);
+            GraphicsQuad.Render();

            //Draw the rest of the structures, characters and front structures
            spriteBatch.Begin(SpriteSortMode.BackToFront, BlendState.NonPremultiplied, null, DepthStencilState.None, null, null, cam.Transform);
@@ -312,8 +312,8 @@ namespace Barotrauma

            graphics.BlendState = BlendState.Opaque;
            graphics.SamplerStates[0] = SamplerState.LinearWrap;
-            Quad.UseBasicEffect(renderTarget);
-            Quad.Render();
+            GraphicsQuad.UseBasicEffect(renderTarget);
+            GraphicsQuad.Render();

            //draw alpha blended particles that are inside a sub
            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, null, DepthStencilState.DepthRead, null, null, cam.Transform);
@@ -379,8 +379,8 @@ namespace Barotrauma
                graphics.DepthStencilState = DepthStencilState.None;
                graphics.SamplerStates[0] = SamplerState.LinearWrap;
                graphics.BlendState = CustomBlendStates.Multiplicative;
-                Quad.UseBasicEffect(GameMain.LightManager.LightMap);
-                Quad.Render();
+                GraphicsQuad.UseBasicEffect(GameMain.LightManager.LightMap);
+                GraphicsQuad.Render();
            }

 			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.LinearWrap, DepthStencilState.None, null, null, cam.Transform);
@@ -389,6 +389,8 @@ namespace Barotrauma
                c.DrawFront(spriteBatch, cam);
            }

+            GameMain.LightManager.DebugDrawVertices(spriteBatch);
+
            Level.Loaded?.DrawDebugOverlay(spriteBatch, cam);            
            if (GameMain.DebugDraw)
            {
@@ -437,7 +439,7 @@ namespace Barotrauma
                graphics.SamplerStates[0] = SamplerState.PointClamp;
                graphics.SamplerStates[1] = SamplerState.PointClamp;
                GameMain.LightManager.LosEffect.CurrentTechnique.Passes[0].Apply();
-                Quad.Render();
+                GraphicsQuad.Render();
                graphics.SamplerStates[0] = SamplerState.LinearWrap;
                graphics.SamplerStates[1] = SamplerState.LinearWrap;
            }
@@ -505,7 +507,7 @@ namespace Barotrauma
            graphics.DepthStencilState = DepthStencilState.None;
            if (string.IsNullOrEmpty(postProcessTechnique))
            {
-                Quad.UseBasicEffect(renderTargetFinal);
+                GraphicsQuad.UseBasicEffect(renderTargetFinal);
            }
            else
            {
@@ -514,7 +516,7 @@ namespace Barotrauma
                PostProcessEffect.CurrentTechnique = PostProcessEffect.Techniques[postProcessTechnique];
                PostProcessEffect.CurrentTechnique.Passes[0].Apply();
            }
-            Quad.Render();
+            GraphicsQuad.Render();

            if (fadeToBlackState > 0.0f)
            {
@@ -221,7 +221,17 @@ namespace Barotrauma
                    currentLevelData.AllowInvalidOutpost = allowInvalidOutpost.Selected;
                    var dummyLocations = GameSession.CreateDummyLocations(currentLevelData);
                    Level.Generate(currentLevelData, mirror: mirrorLevel.Selected, startLocation: dummyLocations[0], endLocation: dummyLocations[1]);
-                    Submarine.MainSub?.SetPosition(Level.Loaded.StartPosition);
+
+                    if (Submarine.MainSub != null)
+                    {
+                        Vector2 startPos = Level.Loaded.StartPosition;
+                        if (Level.Loaded.StartOutpost != null)
+                        {
+                            startPos.Y -= Level.Loaded.StartOutpost.Borders.Height / 2 + Submarine.MainSub.Borders.Height / 2;
+                        }
+                        Submarine.MainSub?.SetPosition(startPos);
+                    }
+
                    GameMain.LightManager.AddLight(pointerLightSource);
                    if (!wasLevelLoaded || Cam.Position.X < 0 || Cam.Position.Y < 0 || Cam.Position.Y > Level.Loaded.Size.X || Cam.Position.Y > Level.Loaded.Size.Y)
                    {
@@ -165,6 +165,7 @@ namespace Barotrauma
                }
            }   
 #else
+            SpamServerFilters.RequestGlobalSpamFilter();
            FetchRemoteContent();
 #endif

@@ -1520,6 +1520,7 @@ namespace Barotrauma
            };

            bool nameChangePending = isGameRunning && GameMain.Client.PendingName != string.Empty && GameMain.Client?.Character?.Name != GameMain.Client.PendingName;
+            changesPendingText?.Parent?.RemoveChild(changesPendingText);
            changesPendingText = null;

            if (TabMenu.PendingChanges)
@@ -655,6 +655,7 @@ namespace Barotrauma
                ScrollBarVisible = true,
                OnSelected = (btn, obj) =>
                {
+                    if (GUI.MouseOn is GUIButton) { return false; }
                    if (obj is not ServerInfo serverInfo) { return false; }

                    joinButton.Enabled = true;
@@ -852,6 +853,13 @@ namespace Barotrauma
            });
        }

+        public void HideServerPreview()
+        {
+            serverPreviewContainer.Visible = false;
+            panelAnimator.RightEnabled = false;
+            panelAnimator.RightVisible = false;
+        }
+
        private void InsertServer(ServerInfo serverInfo, GUIComponent component)
        {
            var children = serverList.Content.RectTransform.Children.Reverse().ToList();
@@ -973,7 +981,7 @@ namespace Barotrauma
            }
        }

-        private void FilterServers()
+        public void FilterServers()
        {
            RemoveMsgFromServerList(MsgUserData.NoMatchingServers);
            foreach (GUIComponent child in serverList.Content.Children)
@@ -1013,6 +1021,7 @@ namespace Barotrauma
                return false;
            }
 #endif
+            if (SpamServerFilters.IsFiltered(serverInfo)) { return false; }

            if (!string.IsNullOrEmpty(searchBox.Text) && !serverInfo.ServerName.Contains(searchBox.Text, StringComparison.OrdinalIgnoreCase)) { return false; }

@@ -1553,15 +1562,169 @@ namespace Barotrauma
            var serverFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.06f), serverList.Content.RectTransform) { MinSize = new Point(0, 35) },
                style: "ListBoxElement")
            {
-                UserData = serverInfo
+                UserData = serverInfo,
            };
+
+            serverFrame.OnSecondaryClicked += (_, data) =>
+            {
+                if (data is not ServerInfo info) { return false; }
+                CreateContextMenu(info);
+                return true;
+            };
+
            new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), serverFrame.RectTransform, Anchor.Center), isHorizontal: true, childAnchor: Anchor.CenterLeft)
            {
                Stretch = false
            };
            UpdateServerInfoUI(serverInfo);
            if (!skipPing) { PingUtils.GetServerPing(serverInfo, UpdateServerInfoUI); }
+        }

+        private static readonly Vector2 confirmPopupSize = new Vector2(0.2f, 0.2625f);
+        private static readonly Point confirmPopupMinSize = new Point(300, 300);
+
+        private void CreateContextMenu(ServerInfo info)
+        {
+            var favoriteOption = new ContextMenuOption(IsFavorite(info) ? "removefromfavorites" : "addtofavorites", isEnabled: true, () =>
+            {
+                if (IsFavorite(info))
+                {
+                    RemoveFromFavoriteServers(info);
+                }
+                else
+                {
+                    AddToFavoriteServers(info);
+                }
+                FilterServers();
+            });
+            var reportOption = new ContextMenuOption("reportserver", isEnabled: true, () => { CreateReportPrompt(info); });
+            var filterOption = new ContextMenuOption("filterserver", isEnabled: true, () =>
+            {
+                CreateFilterServerPrompt(info);
+            })
+            {
+                Tooltip = TextManager.Get("filterservertooltip")
+            };
+
+            GUIContextMenu.CreateContextMenu(favoriteOption, filterOption, reportOption);
+        }
+
+        public static void CreateFilterServerPrompt(ServerInfo info)
+        {
+            GUI.AskForConfirmation(
+                header: TextManager.Get("filterserver"),
+                body: TextManager.GetWithVariables("filterserverconfirm", ("[server]", info.ServerName), ("[filepath]", SpamServerFilter.SavePath)),
+                onConfirm: () =>
+                {
+                    SpamServerFilters.AddServerToLocalSpamList(info);
+
+                    if (GameMain.ServerListScreen is not { } serverListScreen) { return; }
+
+                    if (serverListScreen.selectedServer.TryUnwrap(out var selectedServer) && selectedServer.Equals(info))
+                    {
+                        serverListScreen.HideServerPreview();
+                    }
+                    serverListScreen.FilterServers();
+                }, relativeSize: confirmPopupSize, minSize: confirmPopupMinSize);
+        }
+
+        private enum ReportReason
+        {
+            Spam,
+            Advertising,
+            Inappropriate
+        }
+
+        public static void CreateReportPrompt(ServerInfo info)
+        {
+            if (!GameAnalyticsManager.SendUserStatistics)
+            {
+                GUI.NotifyPrompt(TextManager.Get("reportserver"), TextManager.Get("reportserverdisabled"));
+                return;
+            }
+
+            var msgBox = new GUIMessageBox(
+                headerText: TextManager.Get("reportserver"),
+                text: string.Empty,
+                relativeSize: new Vector2(0.2f, 0.4f),
+                minSize: new Point(380, 430),
+                buttons: Array.Empty<LocalizedString>());
+
+            var layout = new GUILayoutGroup(new RectTransform(Vector2.One, msgBox.Content.RectTransform, Anchor.Center));
+
+            new GUITextBlock(new RectTransform(new Vector2(1f, 0.3f), layout.RectTransform), TextManager.GetWithVariable("reportserverexplanation", "[server]", info.ServerName), wrap: true)
+            {
+                ToolTip = TextManager.Get("reportserverprompttooltip")
+            };
+
+            var listBox = new GUIListBox(new RectTransform(new Vector2(1f, 0.3f), layout.RectTransform));
+
+            var enums = Enum.GetValues<ReportReason>();
+            foreach (ReportReason reason in enums)
+            {
+                new GUITickBox(new RectTransform(new Vector2(1f, 1f / enums.Length), listBox.Content.RectTransform), TextManager.Get($"reportreason.{reason}"))
+                {
+                    UserData = reason
+                };
+            }
+
+            // padding
+            new GUIFrame(new RectTransform(new Vector2(1f, 0.05f), layout.RectTransform), style: null);
+
+            var buttonLayout = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.3f), layout.RectTransform))
+            {
+                Stretch = true
+            };
+
+            var reportAndHideButton = new GUIButton(new RectTransform(new Vector2(1f, 0.333f), buttonLayout.RectTransform), TextManager.Get("reportoption.reportandhide"))
+            {
+                Enabled = false,
+                OnClicked = (_, _) =>
+                {
+                    CreateFilterServerPrompt(info);
+                    msgBox.Close();
+                    return true;
+                }
+            };
+            var reportButton = new GUIButton(new RectTransform(new Vector2(1f, 0.333f), buttonLayout.RectTransform), TextManager.Get("reportoption.report"))
+            {
+                Enabled = false,
+                OnClicked = (_, _) =>
+                {
+                    ReportServer(info, GetUserSelectedReasons());
+                    msgBox.Close();
+                    return true;
+                }
+            };
+
+            new GUIButton(new RectTransform(new Vector2(1f, 0.333f), buttonLayout.RectTransform), TextManager.Get("cancel"))
+            {
+                OnClicked = (_, _) =>
+                {
+                    msgBox.Close();
+                    return true;
+                }
+            };
+
+            foreach (var child in listBox.Content.GetAllChildren<GUITickBox>())
+            {
+                child.OnSelected += _ =>
+                {
+                    reportAndHideButton.Enabled = reportButton.Enabled = GetUserSelectedReasons().Any();
+                    return true;
+                };
+            }
+
+            IEnumerable<ReportReason> GetUserSelectedReasons()
+                => listBox.Content.Children
+                          .Where(static c => c.UserData is ReportReason && c.Selected)
+                          .Select(static c => (ReportReason)c.UserData).ToArray();
+        }
+
+        private static void ReportServer(ServerInfo info, IEnumerable<ReportReason> reasons)
+        {
+            if (!reasons.Any()) { return; }
+            GameAnalyticsManager.AddErrorEvent(GameAnalyticsManager.ErrorSeverity.Info, $"[Spam] Reported server: Name: \"{info.ServerName}\", Message: \"{info.ServerMessage}\", Endpoint: \"{info.Endpoint.StringRepresentation}\". Reason: \"{string.Join(", ", reasons)}\".");
        }

        private void UpdateServerInfoUI(ServerInfo serverInfo)
@@ -1571,7 +1734,6 @@ namespace Barotrauma

            serverFrame.UserData = serverInfo;

-            serverFrame.ToolTip = "";
            var serverContent = serverFrame.Children.First() as GUILayoutGroup;
            serverContent.ClearChildren();

@@ -1583,15 +1745,14 @@ namespace Barotrauma
                        new RectTransform(new Vector2(columns[label].RelativeWidth, 1.0f), serverContent.RectTransform),
                        style: null);
            }
-            
-            void errorTooltip(RichString toolTip)
+
+            void disableElementFocus()
            {
                sections.Values.ForEach(c =>
                {
                    c.CanBeFocused = false;
                    c.Children.First().CanBeFocused = false;
                });
-                serverFrame.ToolTip = toolTip;
            }

            RectTransform columnRT(ColumnLabel label, float scale = 0.95f)
@@ -1611,7 +1772,7 @@ namespace Barotrauma
                    NetworkMember.IsCompatible(GameMain.Version, serverInfo.GameVersion),
                UserData = "compatible"
            };
-            
+
            var passwordBox = new GUITickBox(columnRT(ColumnLabel.ServerListHasPassword, scale: 0.6f), label: "", style: "GUIServerListPasswordTickBox")
            {
 				Selected = serverInfo.HasPassword,
@@ -1664,9 +1825,10 @@ namespace Barotrauma
                serverPingText.TextColor = Color.DarkRed;
            }

+            LocalizedString toolTip = "";
            if (!serverInfo.Checked)
            {
-                errorTooltip(TextManager.Get("ServerOffline"));
+                toolTip = TextManager.Get("ServerOffline");
                serverName.TextColor *= 0.8f;
                serverPlayers.TextColor *= 0.8f;
            }
@@ -1681,7 +1843,6 @@ namespace Barotrauma
            }
            else if (!compatibleBox.Selected)
            {
-                LocalizedString toolTip = "";
                if (serverInfo.GameVersion != GameMain.Version)
                {
                    toolTip = TextManager.GetWithVariable("ServerListIncompatibleVersion", "[version]", serverInfo.GameVersion.ToString());
@@ -1707,14 +1868,12 @@ namespace Barotrauma
                        toolTip += '\n' + TextManager.GetWithVariable("workshopitemdownloadprompttruncated", "[number]", (incompatibleModNames.Count - maxIncompatibleToList).ToString());
                    }
                }
-                errorTooltip(toolTip);

                serverName.TextColor *= 0.5f;
                serverPlayers.TextColor *= 0.5f;
            }
            else
            {
-                LocalizedString toolTip = "";
                foreach (var contentPackage in serverInfo.ContentPackages)
                {
                    if (ContentPackageManager.EnabledPackages.All.None(cp => cp.Hash.StringRepresentation == contentPackage.Hash))
@@ -1724,8 +1883,11 @@ namespace Barotrauma
                        break;
                    }
                }
-                errorTooltip(toolTip);
            }
+            disableElementFocus();
+
+            string separator = toolTip.IsNullOrWhiteSpace() ? "" : "\n\n";
+            serverFrame.ToolTip = RichString.Rich(toolTip + separator + $"‖color:gui.blue‖{TextManager.GetWithVariable("serverlisttooltip", "[button]", PlayerInput.SecondaryMouseLabel)}‖end‖");

            foreach (var section in sections.Values)
            {
@@ -16,9 +16,6 @@ namespace Barotrauma
 {
    class SubEditorScreen : EditorScreen
    {
-        public const string CircuitBoxDeletionWarningHeader = "Selection contains circuit boxes",
-                            CircuitBoxDeletionWarningBody = "Are you sure you want to delete the selection? Any wiring inside circuit boxes will be lost and cannot be recovered.";
-
        public const int MaxStructures = 2000;
        public const int MaxWalls = 500;
        public const int MaxItems = 5000;
@@ -1560,8 +1557,17 @@ namespace Barotrauma
            if (editorSelectedTime.TryUnwrap(out DateTime selectedTime))
            {
                TimeSpan timeInEditor = DateTime.Now - selectedTime;
-                SteamAchievementManager.IncrementStat("hoursineditor".ToIdentifier(), (float)timeInEditor.TotalHours);
-                editorSelectedTime = Option<DateTime>.None();
+                if (timeInEditor.TotalSeconds > Timing.TotalTime)
+                {
+                    DebugConsole.ThrowErrorAndLogToGA(
+                        "SubEditorScreen.DeselectEditorSpecific:InvalidTimeInEditor",
+                        $"Error in sub editor screen. Calculated time in editor {timeInEditor} was larger than the time the game has run ({Timing.TotalTime} s).");
+                }
+                else
+                {
+                    SteamAchievementManager.IncrementStat("hoursineditor".ToIdentifier(), (float)timeInEditor.TotalHours);
+                    editorSelectedTime = Option<DateTime>.None();
+                }
            }
 #endif

@@ -3933,28 +3939,15 @@ namespace Barotrauma
                    new ContextMenuOption("editor.cut", isEnabled: hasTargets, onSelected: () => MapEntity.Cut(targets)),
                    new ContextMenuOption("editor.copytoclipboard", isEnabled: hasTargets, onSelected: () => MapEntity.Copy(targets)),
                    new ContextMenuOption("editor.paste", isEnabled: MapEntity.CopiedList.Any(), onSelected: () => MapEntity.Paste(cam.ScreenToWorld(PlayerInput.MousePosition))),
-                    new ContextMenuOption("delete", isEnabled: hasTargets, onSelected: () => RemoveEntitiesWithPossibleWarning(targets)),
-                    new ContextMenuOption(TextManager.Get("editortip.shiftforextraoptions") + '\n' + TextManager.Get("editortip.altforruler"), isEnabled: false, onSelected: null));
-            }
-        }
-
-        public static void RemoveEntitiesWithPossibleWarning(List<MapEntity> targets)
-        {
-            if (targets.Any(static t => t is Item it && it.GetComponent<CircuitBox>() is not null))
-            {
-                GUI.AskForConfirmation(CircuitBoxDeletionWarningHeader, CircuitBoxDeletionWarningBody, onConfirm: Delete);
-                return;
-            }
-
-            Delete();
-
-            void Delete()
-            {
-                StoreCommand(new AddOrDeleteCommand(targets, true));
-                foreach (var me in targets)
-                {
-                    if (!me.Removed) { me.Remove(); }
-                }
+                    new ContextMenuOption("delete", isEnabled: hasTargets, onSelected: () =>
+                    {
+                        StoreCommand(new AddOrDeleteCommand(targets, true));
+                        foreach (var me in targets)
+                        {
+                            if (!me.Removed) { me.Remove(); }
+                        }
+                    }),
+                    new ContextMenuOption(TextManager.GetWithVariable("editortip.shiftforextraoptions", "[button]", PlayerInput.SecondaryMouseLabel) + '\n' + TextManager.Get("editortip.altforruler"), isEnabled: false, onSelected: null));
            }
        }

@@ -5485,9 +5478,11 @@ namespace Barotrauma
                {
                    foreach (LightComponent lightComponent in item.GetComponents<LightComponent>())
                    {
-                        lightComponent.Light.Color = item.Container != null || (item.body != null && !item.body.Enabled) ?
-                            Color.Transparent :
-                            lightComponent.LightColor;
+                        lightComponent.Light.Color = 
+                            item.body == null || item.body.Enabled ||
+                            (item.ParentInventory is ItemInventory itemInventory && !itemInventory.Container.HideItems) ?
+                                lightComponent.LightColor :
+                                Color.Transparent;
                        lightComponent.Light.LightSpriteEffect = lightComponent.Item.SpriteEffects;
                    }
                }