[WIP] [Tweak] Ограничение раздатчиков реагентов и прочих жидкостей. (#498)
* Reapply "Add limited-reagent dispensers (#23907)" This reverts commit531becd592. # Conflicts: # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Shared/Chemistry/SharedReagentDispenser.cs # Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs # Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml # Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml # Resources/Prototypes/Entities/Structures/Dispensers/chem.yml * Reapply "Fix comp.Owner (#24206)" This reverts commit2d2405ff93. * Reapply "Use old reagent dispenser beaker slot ID (#24209)" This reverts commit388424e2f3. * Add a container display to dispenser UI (#25391) * Implemented contents display for dispenser UI * Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Resolve the netent into a euid first --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Add prediction to hand labeler labels (#25869) Added prediction to labels * scoopable ash and foam, solution transfer prediction (#25832) * move SolutionTransfer to shared and predict as much as possible * fully move OpenableSystem to shared now that SolutionTransfer is * fix imports for everything * doc for solution transfer system * trolling * add scoopable system * make ash and foam scoopable * untroll * untroll real * make clickable it work * troll * the scooping room --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> # Conflicts: # Resources/Prototypes/Entities/Effects/chemistry_effects.yml * Reagent dispenser UI (#27831) * reagent dispenser: fancy window * reagent dispenser: dispense button grid * reagent dispenser: rearrange containers & info * reagent dispenser: remove `reagent-dispenser-window-container-label` * reagent dispenser: add `Scrollcontainer` on right side * reagent dispenser: get rid of pointless actions * reagent dispenser: cleanup actions and `inventory` field on bound ui state * reagent dispenser: cool reagent cards & finishing touches * reagent dispenser: final cleanup and formatting * reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor * reagent dispenser: cleanup code & address minor concerns * reagent dispenser: text in reagent cards no longer clips * reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably * reagent dispenser mayybe this * reagent dispenser: remove `using FastAccessors;` # Conflicts: # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs * Reagent dispenser UI (Again) (#27958) * reagent dispenser: fancy window * reagent dispenser: dispense button grid * reagent dispenser: rearrange containers & info * reagent dispenser: remove `reagent-dispenser-window-container-label` * reagent dispenser: add `Scrollcontainer` on right side * reagent dispenser: get rid of pointless actions * reagent dispenser: cleanup actions and `inventory` field on bound ui state * reagent dispenser: cool reagent cards & finishing touches * reagent dispenser: final cleanup and formatting * reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor * reagent dispenser: cleanup code & address minor concerns * reagent dispenser: text in reagent cards no longer clips * reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably * reagent dispenser mayybe this * reagent dispenser: remove `using FastAccessors;` * delete unused classes * disable reagent button when container is empty * Make things a bit bigger * remove obsolete text color override * пару фиксов поверх * переводики хихиххи * еще переводы * feat: химические картриджи --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com>
This commit is contained in:
Remuchi
GitHub
@@ -1,11 +1,9 @@
|
||||
using System.Linq;
|
||||
using Content.Client.Stylesheets;
|
||||
using Content.Client.UserInterface.Controls;
|
||||
using Content.Shared.Chemistry;
|
||||
using Content.Shared.Chemistry.Reagent;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.CustomControls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Prototypes;
|
||||
using static Robust.Client.UserInterface.Controls.BoxContainer;
|
||||
@@ -16,14 +14,12 @@ namespace Content.Client.Chemistry.UI
|
||||
/// Client-side UI used to control a <see cref="ReagentDispenserComponent"/>.
|
||||
/// </summary>
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class ReagentDispenserWindow : DefaultWindow
|
||||
public sealed partial class ReagentDispenserWindow : FancyWindow
|
||||
{
|
||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||
[Dependency] private readonly IEntityManager _entityManager = default!;
|
||||
|
||||
public event Action<BaseButton.ButtonEventArgs, DispenseReagentButton>? OnDispenseReagentButtonPressed;
|
||||
public event Action<GUIMouseHoverEventArgs, DispenseReagentButton>? OnDispenseReagentButtonMouseEntered;
|
||||
public event Action<GUIMouseHoverEventArgs, DispenseReagentButton>? OnDispenseReagentButtonMouseExited;
|
||||
public event Action<string>? OnDispenseReagentButtonPressed;
|
||||
public event Action<string>? OnEjectJugButtonPressed;
|
||||
|
||||
/// <summary>
|
||||
/// Create and initialize the dispenser UI client-side. Creates the basic layout,
|
||||
@@ -33,45 +29,27 @@ namespace Content.Client.Chemistry.UI
|
||||
{
|
||||
RobustXamlLoader.Load(this);
|
||||
IoCManager.InjectDependencies(this);
|
||||
|
||||
var dispenseAmountGroup = new ButtonGroup();
|
||||
DispenseButton1.Group = dispenseAmountGroup;
|
||||
DispenseButton5.Group = dispenseAmountGroup;
|
||||
DispenseButton10.Group = dispenseAmountGroup;
|
||||
DispenseButton15.Group = dispenseAmountGroup;
|
||||
DispenseButton20.Group = dispenseAmountGroup;
|
||||
DispenseButton25.Group = dispenseAmountGroup;
|
||||
DispenseButton30.Group = dispenseAmountGroup;
|
||||
DispenseButton50.Group = dispenseAmountGroup;
|
||||
DispenseButton100.Group = dispenseAmountGroup;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Update the button grid of reagents which can be dispensed.
|
||||
/// </summary>
|
||||
/// <param name="inventory">Reagents which can be dispensed by this dispenser</param>
|
||||
public void UpdateReagentsList(List<ReagentId> inventory)
|
||||
public void UpdateReagentsList(List<ReagentInventoryItem> inventory)
|
||||
{
|
||||
if (ChemicalList == null)
|
||||
if (ReagentList == null)
|
||||
return;
|
||||
|
||||
ChemicalList.Children.Clear();
|
||||
ReagentList.Children.Clear();
|
||||
//Sort inventory by reagentLabel
|
||||
inventory.Sort((x, y) => x.ReagentLabel.CompareTo(y.ReagentLabel));
|
||||
|
||||
foreach (var entry in inventory.OrderBy(r =>
|
||||
{
|
||||
_prototypeManager.TryIndex(r.Prototype, out ReagentPrototype? p);
|
||||
return p?.LocalizedName;
|
||||
}))
|
||||
foreach (var item in inventory)
|
||||
{
|
||||
var localizedName = _prototypeManager.TryIndex(entry.Prototype, out ReagentPrototype? p)
|
||||
? p.LocalizedName
|
||||
: Loc.GetString("reagent-dispenser-window-reagent-name-not-found-text");
|
||||
|
||||
var button = new DispenseReagentButton(entry, localizedName);
|
||||
button.OnPressed += args => OnDispenseReagentButtonPressed?.Invoke(args, button);
|
||||
button.OnMouseEntered += args => OnDispenseReagentButtonMouseEntered?.Invoke(args, button);
|
||||
button.OnMouseExited += args => OnDispenseReagentButtonMouseExited?.Invoke(args, button);
|
||||
ChemicalList.AddChild(button);
|
||||
var card = new ReagentCardControl(item);
|
||||
card.OnPressed += OnDispenseReagentButtonPressed;
|
||||
card.OnEjectButtonPressed += OnEjectJugButtonPressed;
|
||||
ReagentList.Children.Add(card);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,36 +70,7 @@ namespace Content.Client.Chemistry.UI
|
||||
ClearButton.Disabled = castState.OutputContainer is null;
|
||||
EjectButton.Disabled = castState.OutputContainer is null;
|
||||
|
||||
switch (castState.SelectedDispenseAmount)
|
||||
{
|
||||
case ReagentDispenserDispenseAmount.U1:
|
||||
DispenseButton1.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U5:
|
||||
DispenseButton5.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U10:
|
||||
DispenseButton10.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U15:
|
||||
DispenseButton15.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U20:
|
||||
DispenseButton20.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U25:
|
||||
DispenseButton25.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U30:
|
||||
DispenseButton30.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U50:
|
||||
DispenseButton50.Pressed = true;
|
||||
break;
|
||||
case ReagentDispenserDispenseAmount.U100:
|
||||
DispenseButton100.Pressed = true;
|
||||
break;
|
||||
}
|
||||
AmountGrid.Selected = ((int)castState.SelectedDispenseAmount).ToString();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -129,31 +78,22 @@ namespace Content.Client.Chemistry.UI
|
||||
/// <para>Also highlights a reagent if it's dispense button is being mouse hovered.</para>
|
||||
/// </summary>
|
||||
/// <param name="state">State data for the dispenser.</param>
|
||||
/// <param name="highlightedReagentId">Prototype ID of the reagent whose dispense button is currently being mouse hovered,
|
||||
/// or null if no button is being hovered.</param>
|
||||
public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state, ReagentId? highlightedReagentId = null)
|
||||
public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state)
|
||||
{
|
||||
ContainerInfo.Children.Clear();
|
||||
|
||||
if (state.OutputContainer is null)
|
||||
{
|
||||
ContainerInfoName.Text = "";
|
||||
ContainerInfoFill.Text = "";
|
||||
ContainerInfo.Children.Add(new Label { Text = Loc.GetString("reagent-dispenser-window-no-container-loaded-text") });
|
||||
return;
|
||||
}
|
||||
|
||||
ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
|
||||
{
|
||||
Orientation = LayoutOrientation.Horizontal,
|
||||
Children =
|
||||
{
|
||||
new Label {Text = $"{state.OutputContainer.DisplayName}: "},
|
||||
new Label
|
||||
{
|
||||
Text = $"{state.OutputContainer.CurrentVolume}/{state.OutputContainer.MaxVolume}",
|
||||
StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
|
||||
}
|
||||
}
|
||||
});
|
||||
// Set Name of the container and its fill status (Ex: 44/100u)
|
||||
ContainerInfoName.Text = state.OutputContainer.DisplayName;
|
||||
ContainerInfoFill.Text = state.OutputContainer.CurrentVolume + "/" + state.OutputContainer.MaxVolume;
|
||||
|
||||
foreach (var (reagent, quantity) in state.OutputContainer.Reagents!)
|
||||
{
|
||||
@@ -169,12 +109,6 @@ namespace Content.Client.Chemistry.UI
|
||||
StyleClasses = { StyleNano.StyleClassLabelSecondaryColor },
|
||||
};
|
||||
|
||||
// Check if the reagent is being moused over. If so, color it green.
|
||||
if (reagent == highlightedReagentId) {
|
||||
nameLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
|
||||
quantityLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
|
||||
}
|
||||
|
||||
ContainerInfo.Children.Add(new BoxContainer
|
||||
{
|
||||
Orientation = LayoutOrientation.Horizontal,
|
||||
@@ -187,14 +121,4 @@ namespace Content.Client.Chemistry.UI
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DispenseReagentButton : Button {
|
||||
public ReagentId ReagentId { get; }
|
||||
|
||||
public DispenseReagentButton(ReagentId reagentId, string text)
|
||||
{
|
||||
ReagentId = reagentId;
|
||||
Text = text;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user