v1.1.18.0 (Treacherous Tides Update)

2023-10-19 17:18:51 +03:00
parent 12e43d95ef
commit 34ffc520cc
20 changed files with 179 additions and 43 deletions
@@ -16,6 +16,9 @@ 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;
@@ -3915,18 +3918,31 @@ 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: delegate
-                    {
-                        StoreCommand(new AddOrDeleteCommand(targets, true));
-                        foreach (var me in targets)
-                        {
-                            if (!me.Removed) { me.Remove(); }
-                        }
-                    }),
+                    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(); }
+                }
+            }
+        }
+
        private void MoveToLayer(string layer, List<MapEntity> content)
        {
            layer ??= string.Empty;