Allow ChemMaster to draw from inserted container for pillmaking

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -47,6 +47,13 @@ protected override void Open()
                 new ChemMasterOutputToBottleMessage(
                     (uint) _window.BottleDosage.Value, _window.LabelLine));
 
+            // Begin DeltaV - chemmaster sources
+            _window.SourceBufferButton.OnPressed += _ => SendMessage(
+                new ChemMasterSetSourceMessage(ChemMasterSource.InternalBuffer));
+            _window.SourceInsertedButton.OnPressed += _ => SendMessage(
+                new ChemMasterSetSourceMessage(ChemMasterSource.InsertedContainer));
+            // End DeltaV - chemmaster sources
+
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {
                 var pillType = i;

Content.Client/Chemistry/UI/ChemMasterWindow.xaml

@@ -125,6 +125,16 @@
                         <SpinBox MinSize="100 0" Name="BottleDosage" Access="Public" Value="0" />
                         <Button MinSize="80 0" Name="CreateBottleButton" Access="Public" Text="{Loc 'chem-master-window-create-button'}" />
                     </BoxContainer>
+
+                    <!-- Begin DeltaV - chemmaster sources -->
+                    <BoxContainer Orientation="Horizontal">
+                        <Label Text="{Loc 'chem-master-window-source-label'}" />
+                        <Control HorizontalExpand="True" MinSize="50 0" />
+
+                        <Button MinSize="80 0" Name="SourceBufferButton" Access="Public" Text="{Loc 'chem-master-source-buffer-button'}" Pressed="True" />
+                        <Button MinSize="80 0" Name="SourceInsertedButton" Access="Public" Text="{Loc 'chem-master-source-inserted-button'}" />
+                    </BoxContainer>
+                    <!-- End DeltaV - chemmaster sources -->
                 </BoxContainer>
             </PanelContainer>
         </BoxContainer>

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -81,6 +81,12 @@ public ChemMasterWindow()
             PillNumber.InitDefaultButtons();
             BottleDosage.InitDefaultButtons();
 
+            // Begin DeltaV - chemmaster sources
+            var sourceGroup = new ButtonGroup(false);
+            SourceBufferButton.Group = sourceGroup;
+            SourceInsertedButton.Group = sourceGroup;
+            // End DeltaV - chemmaster sources
+
             // Ensure label length is within the character limit.
             LabelLineEdit.IsValid = s => s.Length <= SharedChemMaster.LabelMaxLength;
 
@@ -126,6 +132,14 @@ public void UpdateState(BoundUserInterfaceState state)
             PillDosage.IsValid = x => x > 0 && x <= castState.PillDosageLimit;
             BottleDosage.IsValid = x => x >= 0 && x <= bottleAmountMax;
 
+            // Begin DeltaV - chemmaster sources
+            var activeButton = castState.Source switch {
+                ChemMasterSource.InternalBuffer => SourceBufferButton,
+                ChemMasterSource.InsertedContainer => SourceInsertedButton,
+            };
+            activeButton.Pressed = true;
+            // End DeltaV - chemmaster sources
+
             if (PillNumber.Value > pillNumberMax)
                 PillNumber.Value = pillNumberMax;
             if (BottleDosage.Value > bottleAmountMax)

Content.Server/Chemistry/Components/ChemMasterComponent.cs

@@ -18,6 +18,11 @@ public sealed partial class ChemMasterComponent : Component
         [DataField("mode"), ViewVariables(VVAccess.ReadWrite)]
         public ChemMasterMode Mode = ChemMasterMode.Transfer;
 
+        // Begin DeltaV - chemmaster sources
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public ChemMasterSource Source = ChemMasterSource.InternalBuffer;
+        // End DeltaV - chemmaster sources
+
         [DataField("pillDosageLimit", required: true), ViewVariables(VVAccess.ReadWrite)]
         public uint PillDosageLimit;
 

Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs

@@ -53,6 +53,7 @@ public override void Initialize()
             SubscribeLocalEvent<ChemMasterComponent, BoundUIOpenedEvent>(SubscribeUpdateUiState);
 
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterSetModeMessage>(OnSetModeMessage);
+            SubscribeLocalEvent<ChemMasterComponent, ChemMasterSetSourceMessage>(OnSetSourceMessage); // DeltaV - chemmaster sources
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterSetPillTypeMessage>(OnSetPillTypeMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterReagentAmountButtonMessage>(OnReagentButtonMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterCreatePillsMessage>(OnCreatePillsMessage);
@@ -75,9 +76,12 @@ private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = f
             var bufferReagents = bufferSolution.Contents;
             var bufferCurrentVolume = bufferSolution.Volume;
 
+            // Begin DeltaV - chemmaster sources
             var state = new ChemMasterBoundUserInterfaceState(
                 chemMaster.Mode, BuildInputContainerInfo(inputContainer), BuildOutputContainerInfo(outputContainer),
-                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
+                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel,
+                chemMaster.Source);
+            // End DeltaV - chemmaster sources
 
             _userInterfaceSystem.SetUiState(owner, ChemMasterUiKey.Key, state);
         }
@@ -93,6 +97,15 @@ private void OnSetModeMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMa
             ClickSound(chemMaster);
         }
 
+        // Begin DeltaV - chemmaster sources
+        private void OnSetSourceMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterSetSourceMessage message)
+        {
+            chemMaster.Comp.Source = message.ChemMasterSource;
+            UpdateUiState(chemMaster);
+            ClickSound(chemMaster);
+        }
+        // End DeltaV - chemmaster sources
+
         private void OnSetPillTypeMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterSetPillTypeMessage message)
         {
             // Ensure valid pill type. There are 20 pills selectable, 0-19.
@@ -261,17 +274,49 @@ private void OnOutputToBottleMessage(Entity<ChemMasterComponent> chemMaster, ref
             ClickSound(chemMaster);
         }
 
+        // Begin DeltaV - chemmaster sources
+        private Entity<SolutionComponent>? GetSourceSolution(
+            Entity<ChemMasterComponent> chemMaster)
+        {
+            switch (chemMaster.Comp.Source) {
+                case ChemMasterSource.InternalBuffer: {
+                    if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner,
+                        SharedChemMaster.BufferSolutionName, out var component, out _))
+                    {
+                        return null;
+                    }
+                    return component;
+                }
+                case ChemMasterSource.InsertedContainer: {
+                    var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
+                    if (container is null ||
+                        !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var component, out _))
+                    {
+                        return null;
+                    }
+                    return component;
+                }
+                default: {
+                    return null;
+                }
+            }
+        }
+        // End DeltaV - chemmaster sources
+
         private bool WithdrawFromBuffer(
             Entity<ChemMasterComponent> chemMaster,
             FixedPoint2 neededVolume, EntityUid? user,
             [NotNullWhen(returnValue: true)] out Solution? outputSolution)
         {
             outputSolution = null;
 
-            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var solution))
+            // Begin DeltaV - chemmaster sources
+            if (GetSourceSolution(chemMaster) is not {} source)
             {
                 return false;
             }
+            var solution = source.Comp.Solution;
+            // End DeltaV - chemmaster sources
 
             if (solution.Volume == 0)
             {
@@ -288,7 +333,7 @@ private bool WithdrawFromBuffer(
                 return false;
             }
 
-            outputSolution = solution.SplitSolution(neededVolume);
+            outputSolution = _solutionContainerSystem.SplitSolution(source, neededVolume); // DeltaV - chemmaster sources
             return true;
         }
 

Content.Shared/Chemistry/SharedChemMaster.cs

@@ -29,6 +29,19 @@ public ChemMasterSetModeMessage(ChemMasterMode mode)
         }
     }
 
+    // Begin DeltaV - chemmaster sources
+    [Serializable, NetSerializable]
+    public sealed class ChemMasterSetSourceMessage : BoundUserInterfaceMessage
+    {
+        public readonly ChemMasterSource ChemMasterSource;
+
+        public ChemMasterSetSourceMessage(ChemMasterSource source)
+        {
+            ChemMasterSource = source;
+        }
+    }
+    // End DeltaV - chemmaster sources
+
     [Serializable, NetSerializable]
     public sealed class ChemMasterSetPillTypeMessage : BoundUserInterfaceMessage
     {
@@ -83,6 +96,14 @@ public ChemMasterOutputToBottleMessage(uint dosage, string label)
         }
     }
 
+    // Begin DeltaV - chemmaster sources
+    public enum ChemMasterSource
+    {
+        InternalBuffer,
+        InsertedContainer,
+    }
+    // End DeltaV - chemmaster sources
+
     public enum ChemMasterMode
     {
         Transfer,
@@ -159,6 +180,7 @@ public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
         public readonly IReadOnlyList<ReagentQuantity> BufferReagents;
 
         public readonly ChemMasterMode Mode;
+        public readonly ChemMasterSource Source; // DeltaV - chemmaster sources
 
         public readonly FixedPoint2? BufferCurrentVolume;
         public readonly uint SelectedPillType;
@@ -170,7 +192,7 @@ public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
         public ChemMasterBoundUserInterfaceState(
             ChemMasterMode mode, ContainerInfo? inputContainerInfo, ContainerInfo? outputContainerInfo,
             IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2 bufferCurrentVolume,
-            uint selectedPillType, uint pillDosageLimit, bool updateLabel)
+            uint selectedPillType, uint pillDosageLimit, bool updateLabel, ChemMasterSource source) // DeltaV - chemmaster sources
         {
             InputContainerInfo = inputContainerInfo;
             OutputContainerInfo = outputContainerInfo;
@@ -180,6 +202,7 @@ public ChemMasterBoundUserInterfaceState(
             SelectedPillType = selectedPillType;
             PillDosageLimit = pillDosageLimit;
             UpdateLabel = updateLabel;
+            Source = source; // DeltaV - chemmaster sources
         }
     }
 

Resources/Locale/en-US/deltav/chemistry/chem-master.ftl

@@ -0,0 +1,3 @@
+chem-master-window-source-label = Draw from:
+chem-master-source-buffer-button = Internal Buffer
+chem-master-source-inserted-button = Inserted Container