Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rework the ChemMaster's output handling (#11207)

Browse Source 
* Fix doc comment on FitsInDispenserComponent

It's clearly intended to be a doc comment, but wasn't.

* Allow the ChemMaster to accept canisters and bottles

* Give the ChemMaster an output container slot

* Tweak ChemMaster UI layout

* Make more ChemMaster UI tweaks

* Update ChemMaster SpinBox max handling

* Rework the ChemMaster

* Apply suggestions from code review

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>

* Implement PR feedback

* Switch ChemMaster to a tabbed UI layout

* Rename Amount to Dosage for clarity

* Replace Amount with Dosage in messages

* Clarify dose in UI

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
This commit is contained in:
Illiux
2022-09-14 17:10:12 -07:00
committed by GitHub
parent f54c1cb2b3
commit 71e46de0fc
9 changed files with 472 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Chemistry/Components/FitsInDispenserComponent.cs
View File

@@ -2,11 +2,13 @@ using Robust.Shared.GameStates;
namespace Content.Shared.Chemistry.Components
{
/// <summary>
/// Allows the entity with this component to be placed in a <c>SharedReagentDispenserComponent</c>.
/// <para>Otherwise it's considered to be too large or the improper shape to fit.</para>
/// <para>Allows us to have obscenely large containers that are harder to abuse in chem dispensers
/// since they can't be placed directly in them.</para>
/// <see cref="Dispenser.SharedReagentDispenserComponent"/>
/// </summary>
[RegisterComponent]
[NetworkedComponent] // only needed for white-lists. Client doesn't actually need Solution data;
public sealed class FitsInDispenserComponent : Component

94
Content.Shared/Chemistry/SharedChemMaster.cs
View File

@@ -11,7 +11,8 @@ namespace Content.Shared.Chemistry
{
public const uint PillTypes = 20;
public const string BufferSolutionName = "buffer";
public const string ContainerSlotName = "beakerSlot";
public const string InputSlotName = "beakerSlot";
public const string OutputSlotName = "outputSlot";
public const string PillSolutionName = "food";
public const string BottleSolutionName = "drink";
}
@@ -56,25 +57,27 @@ namespace Content.Shared.Chemistry
[Serializable, NetSerializable]
public sealed class ChemMasterCreatePillsMessage : BoundUserInterfaceMessage
{
public readonly uint Amount;
public readonly uint Dosage;
public readonly uint Number;
public readonly string Label;
public ChemMasterCreatePillsMessage(uint amount, string label)
public ChemMasterCreatePillsMessage(uint dosage, uint number, string label)
{
Amount = amount;
Dosage = dosage;
Number = number;
Label = label;
}
}
[Serializable, NetSerializable]
public sealed class ChemMasterCreateBottlesMessage : BoundUserInterfaceMessage
public sealed class ChemMasterOutputToBottleMessage : BoundUserInterfaceMessage
{
public readonly uint Amount;
public readonly uint Dosage;
public readonly string Label;
public ChemMasterCreateBottlesMessage(uint amount, string label)
public ChemMasterOutputToBottleMessage(uint dosage, string label)
{
Amount = amount;
Dosage = dosage;
Label = label;
}
}
@@ -105,17 +108,53 @@ namespace Content.Shared.Chemistry
}
}
/// <summary>
/// Information about the capacity and contents of a container for display in the UI
/// </summary>
[Serializable, NetSerializable]
public sealed class ContainerInfo
{
/// <summary>
/// The container name to show to the player
/// </summary>
public readonly string DisplayName;
/// <summary>
/// Whether the container holds reagents or entities
/// </summary>
public readonly bool HoldsReagents;
/// <summary>
/// The currently used volume of the container
/// </summary>
public readonly FixedPoint2 CurrentVolume;
/// <summary>
/// The maximum volume of the container
/// </summary>
public readonly FixedPoint2 MaxVolume;
/// <summary>
/// A list of the reagents/entities and their sizes within the container
/// </summary>
// todo: this causes NetSerializer exceptions if it's an IReadOnlyList (which would be preferred)
public readonly List<(string Id, FixedPoint2 Quantity)> Contents;
public ContainerInfo(
string displayName, bool holdsReagents,
FixedPoint2 currentVolume, FixedPoint2 maxVolume,
List<(string, FixedPoint2)> contents)
{
DisplayName = displayName;
HoldsReagents = holdsReagents;
CurrentVolume = currentVolume;
MaxVolume = maxVolume;
Contents = contents;
}
}
[Serializable, NetSerializable]
public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
{
public readonly FixedPoint2? ContainerCurrentVolume;
public readonly FixedPoint2? ContainerMaxVolume;
public readonly string? ContainerName;
public readonly ContainerInfo? InputContainerInfo;
public readonly ContainerInfo? OutputContainerInfo;
/// <summary>
/// A list of the reagents and their amounts within the beaker/reagent container, if applicable.
/// </summary>
public readonly IReadOnlyList<Solution.ReagentQuantity>? ContainerReagents;
/// <summary>
/// A list of the reagents and their amounts within the buffer, if applicable.
/// </summary>
@@ -127,33 +166,26 @@ namespace Content.Shared.Chemistry
public readonly FixedPoint2? BufferCurrentVolume;
public readonly uint SelectedPillType;
public readonly uint PillProductionLimit;
public readonly uint BottleProductionLimit;
public readonly uint PillDosageLimit;
public readonly bool UpdateLabel;
public ChemMasterBoundUserInterfaceState(FixedPoint2? containerCurrentVolume, FixedPoint2? containerMaxVolume, string? containerName,
string dispenserName, IReadOnlyList<Solution.ReagentQuantity>? containerReagents, IReadOnlyList<Solution.ReagentQuantity> bufferReagents, ChemMasterMode mode,
FixedPoint2 bufferCurrentVolume, uint selectedPillType, uint pillProdictionLimit, uint bottleProdictionLimit, bool updateLabel)
public ChemMasterBoundUserInterfaceState(
ChemMasterMode mode, string dispenserName,
ContainerInfo? inputContainerInfo, ContainerInfo? outputContainerInfo,
IReadOnlyList<Solution.ReagentQuantity> bufferReagents, FixedPoint2 bufferCurrentVolume,
uint selectedPillType, uint pillDosageLimit, bool updateLabel)
{
ContainerCurrentVolume = containerCurrentVolume;
ContainerMaxVolume = containerMaxVolume;
ContainerName = containerName;
InputContainerInfo = inputContainerInfo;
OutputContainerInfo = outputContainerInfo;
DispenserName = dispenserName;
ContainerReagents = containerReagents;
BufferReagents = bufferReagents;
Mode = mode;
BufferCurrentVolume = bufferCurrentVolume;
SelectedPillType = selectedPillType;
PillProductionLimit = pillProdictionLimit;
BottleProductionLimit = bottleProdictionLimit;
PillDosageLimit = pillDosageLimit;
UpdateLabel = updateLabel;
}
public bool HasContainer()
{
return ContainerCurrentVolume is not null;
}
}
[Serializable, NetSerializable]