Cloning Rework (#8972)

Co-authored-by: fishfish458 <fishfish458>

Content.Shared/Cloning/SharedCloningConsole.cs

@@ -0,0 +1,64 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cloning.CloningConsole
+{
+    [Serializable, NetSerializable]
+    public sealed class CloningConsoleBoundUserInterfaceState : BoundUserInterfaceState
+    {
+        public readonly string? ScannerBodyInfo;
+        public readonly string? ClonerBodyInfo;
+        public readonly bool MindPresent;
+        public readonly ClonerStatus CloningStatus;
+        public readonly bool ScannerConnected;
+        public readonly bool ScannerInRange;
+        public readonly bool ClonerConnected;
+        public readonly bool ClonerInRange;
+        public CloningConsoleBoundUserInterfaceState(string? scannerBodyInfo, string? cloningBodyInfo, bool mindPresent, ClonerStatus cloningStatus, bool scannerConnected, bool scannerInRange, bool clonerConnected, bool clonerInRange)
+        {
+            ScannerBodyInfo = scannerBodyInfo;
+            ClonerBodyInfo = cloningBodyInfo;
+            MindPresent = mindPresent;
+            CloningStatus = cloningStatus;
+            ScannerConnected = scannerConnected;
+            ScannerInRange = scannerInRange;
+            ClonerConnected = clonerConnected;
+            ClonerInRange = clonerInRange;
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public enum ClonerStatus : byte
+    {
+        Ready,
+        ScannerEmpty,
+        ScannerOccupantAlive,
+        OccupantMetaphyiscal,
+        ClonerOccupied,
+        NoClonerDetected,
+        NoMindDetected
+    }
+
+    [Serializable, NetSerializable]
+    public enum CloningConsoleUiKey : byte
+    {
+        Key
+    }
+
+    [Serializable, NetSerializable]
+    public enum UiButton : byte
+    {
+        Clone,
+        Eject
+    }
+
+    [Serializable, NetSerializable]
+    public sealed class UiButtonPressedMessage : BoundUserInterfaceMessage
+    {
+        public readonly UiButton Button;
+
+        public UiButtonPressedMessage(UiButton button)
+        {
+            Button = button;
+        }
+    }
+}

Content.Shared/Cloning/SharedCloningPodComponent.cs

@@ -1,78 +1,18 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cloning
 {
-    [Virtual]
-    public class SharedCloningPodComponent : Component
+    [Serializable, NetSerializable]
+    public enum CloningPodVisuals : byte
     {
-        [Serializable, NetSerializable]
-        public sealed class CloningPodBoundUserInterfaceState : BoundUserInterfaceState
-        {
-            public readonly Dictionary<int, string?> MindIdName;
-            // When this state was created.
-            // The reason this is used rather than a start time is because cloning can be interrupted.
-            public readonly TimeSpan ReferenceTime;
-            // Both of these are in seconds.
-            // They're not TimeSpans because of complicated reasons.
-            // CurTime of receipt is combined with Progress.
-            public readonly float Progress;
-            public readonly float Maximum;
-            // If true, cloning is progressing (predict clone progress)
-            public readonly bool Progressing;
-            public readonly bool MindPresent;
-
-            public CloningPodBoundUserInterfaceState(Dictionary<int, string?> mindIdName, TimeSpan refTime, float progress, float maximum, bool progressing, bool mindPresent)
-            {
-                MindIdName = mindIdName;
-                ReferenceTime = refTime;
-                Progress = progress;
-                Maximum = maximum;
-                Progressing = progressing;
-                MindPresent = mindPresent;
-            }
-        }
-
-
-        [Serializable, NetSerializable]
-        public enum CloningPodUIKey
-        {
-            Key
-        }
-
-        [Serializable, NetSerializable]
-        public enum CloningPodVisuals : byte
-        {
-            Status
-        }
-
-        [Serializable, NetSerializable]
-        public enum CloningPodStatus : byte
-        {
-            Idle,
-            Cloning,
-            Gore,
-            NoMind
-        }
-
-        [Serializable, NetSerializable]
-        public enum UiButton
-        {
-            Clone,
-            Eject
-        }
-
-        [Serializable, NetSerializable]
-        public sealed class CloningPodUiButtonPressedMessage : BoundUserInterfaceMessage
-        {
-            public readonly UiButton Button;
-            public readonly int? ScanId;
-
-            public CloningPodUiButtonPressedMessage(UiButton button, int? scanId)
-            {
-                Button = button;
-                ScanId = scanId;
-            }
-        }
-
+        Status
+    }
+    [Serializable, NetSerializable]
+    public enum CloningPodStatus : byte
+    {
+        Idle,
+        Cloning,
+        Gore,
+        NoMind
     }
 }