[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
@@ -12,14 +12,16 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// Used for entities that can hold items in different slots. Needed by ItemSlotSystem to support basic
|
||||
/// insert/eject interactions.
|
||||
/// </summary>
|
||||
[RegisterComponent, Access(typeof(ItemSlotsSystem)), NetworkedComponent]
|
||||
[RegisterComponent]
|
||||
[Access(typeof(ItemSlotsSystem))]
|
||||
[NetworkedComponent]
|
||||
public sealed partial class ItemSlotsComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// The dictionary that stores all of the item slots whose interactions will be managed by the <see
|
||||
/// cref="ItemSlotsSystem"/>.
|
||||
/// </summary>
|
||||
[DataField(readOnly: true)]
|
||||
[DataField("slots", readOnly:true)]
|
||||
public Dictionary<string, ItemSlot> Slots = new();
|
||||
|
||||
// There are two ways to use item slots:
|
||||
@@ -39,21 +41,26 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class ItemSlotsComponentState(Dictionary<string, ItemSlot> slots) : ComponentState
|
||||
public sealed class ItemSlotsComponentState : ComponentState
|
||||
{
|
||||
public readonly Dictionary<string, ItemSlot> Slots = slots;
|
||||
public readonly Dictionary<string, ItemSlot> Slots;
|
||||
|
||||
public ItemSlotsComponentState(Dictionary<string, ItemSlot> slots)
|
||||
{
|
||||
Slots = slots;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This is effectively a wrapper for a ContainerSlot that adds content functionality like entity whitelists and
|
||||
/// insert/eject sounds.
|
||||
/// </summary>
|
||||
[DataDefinition, Access(typeof(ItemSlotsSystem)), Serializable, NetSerializable]
|
||||
[DataDefinition]
|
||||
[Access(typeof(ItemSlotsSystem))]
|
||||
[Serializable, NetSerializable]
|
||||
public sealed partial class ItemSlot
|
||||
{
|
||||
public ItemSlot()
|
||||
{
|
||||
}
|
||||
public ItemSlot() { }
|
||||
|
||||
public ItemSlot(ItemSlot other)
|
||||
{
|
||||
@@ -61,6 +68,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
}
|
||||
|
||||
[DataField]
|
||||
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
|
||||
public EntityWhitelist? Whitelist;
|
||||
|
||||
[DataField]
|
||||
@@ -79,8 +87,8 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// This will be passed through Loc.GetString. If the name is an empty string, then verbs will use the name
|
||||
/// of the currently held or currently inserted entity instead.
|
||||
/// </remarks>
|
||||
[DataField(readOnly: true), Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
|
||||
// FIXME Friends
|
||||
[DataField(readOnly: true)]
|
||||
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
|
||||
public string Name = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
@@ -91,9 +99,9 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// property of that component (e.g., cell slot size category), and this can lead to unnecessary changes
|
||||
/// when mapping.
|
||||
/// </remarks>
|
||||
[DataField(readOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>)),
|
||||
Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute), NonSerialized]
|
||||
// FIXME Friends
|
||||
[DataField(readOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
|
||||
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
|
||||
[NonSerialized]
|
||||
public string? StartingItem;
|
||||
|
||||
/// <summary>
|
||||
@@ -103,8 +111,9 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// This doesn't have to mean the slot is somehow physically locked. In the case of the item cabinet, the
|
||||
/// cabinet may simply be closed at the moment and needs to be opened first.
|
||||
/// </remarks>
|
||||
[DataField(readOnly: true), ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool Locked;
|
||||
[DataField(readOnly: true)]
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool Locked = false;
|
||||
|
||||
/// <summary>
|
||||
/// Prevents adding the eject alt-verb, but still lets you swap items.
|
||||
@@ -113,7 +122,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// This does not affect EjectOnInteract, since if you do that you probably want ejecting to work.
|
||||
/// </remarks>
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool DisableEject;
|
||||
public bool DisableEject = false;
|
||||
|
||||
/// <summary>
|
||||
/// Whether the item slots system will attempt to insert item from the user's hands into this slot when interacted with.
|
||||
@@ -131,7 +140,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// contents when clicked on normally.
|
||||
/// </remarks>
|
||||
[DataField]
|
||||
public bool EjectOnInteract;
|
||||
public bool EjectOnInteract = false;
|
||||
|
||||
/// <summary>
|
||||
/// If true, and if this slot is attached to an item, then it will attempt to eject slot when to the slot is
|
||||
@@ -143,7 +152,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// menu, nor will it disable alt-click interactions.
|
||||
/// </remarks>
|
||||
[DataField]
|
||||
public bool EjectOnUse;
|
||||
public bool EjectOnUse = false;
|
||||
|
||||
/// <summary>
|
||||
/// Override the insert verb text. Defaults to using the slot's name (if specified) or the name of the
|
||||
@@ -160,7 +169,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
public string? EjectVerbText;
|
||||
|
||||
[ViewVariables, NonSerialized]
|
||||
public ContainerSlot? ContainerSlot;
|
||||
public ContainerSlot? ContainerSlot = default!;
|
||||
|
||||
/// <summary>
|
||||
/// If this slot belongs to some de-constructible component, should the item inside the slot be ejected upon
|
||||
@@ -169,15 +178,19 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// <remarks>
|
||||
/// The actual deconstruction logic is handled by the server-side EmptyOnMachineDeconstructSystem.
|
||||
/// </remarks>
|
||||
[DataField, NonSerialized]
|
||||
[DataField]
|
||||
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
|
||||
[NonSerialized]
|
||||
public bool EjectOnDeconstruct = true;
|
||||
|
||||
/// <summary>
|
||||
/// If this slot belongs to some breakable or destructible entity, should the item inside the slot be
|
||||
/// ejected when it is broken or destroyed?
|
||||
/// </summary>
|
||||
[DataField, NonSerialized]
|
||||
public bool EjectOnBreak;
|
||||
[DataField]
|
||||
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
|
||||
[NonSerialized]
|
||||
public bool EjectOnBreak = false;
|
||||
|
||||
/// <summary>
|
||||
/// When specified, a popup will be generated whenever someone attempts to insert a bad item into this slot.
|
||||
@@ -207,23 +220,20 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// want to insert more than one item that matches the same whitelist.
|
||||
/// </remarks>
|
||||
[DataField]
|
||||
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
|
||||
public bool Swap = true;
|
||||
|
||||
public string? ID => ContainerSlot?.ID;
|
||||
|
||||
// Convenience properties
|
||||
public bool HasItem => ContainerSlot?.ContainedEntity != null;
|
||||
|
||||
public EntityUid? Item => ContainerSlot?.ContainedEntity;
|
||||
|
||||
/// <summary>
|
||||
/// Priority for use with the eject & insert verbs for this slot.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public int Priority;
|
||||
|
||||
[DataField("maxStackAmount")] // WD
|
||||
public int MaxStackAmount;
|
||||
public int Priority = 0;
|
||||
|
||||
/// <summary>
|
||||
/// If false, errors when adding an item slot with a duplicate key are suppressed. Local==true implies that
|
||||
@@ -232,6 +242,9 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
[NonSerialized]
|
||||
public bool Local = true;
|
||||
|
||||
[DataField] // WD
|
||||
public int MaxStackAmount;
|
||||
|
||||
public void CopyFrom(ItemSlot other)
|
||||
{
|
||||
// These fields are mutable reference types. But they generally don't get modified, so this should be fine.
|
||||
@@ -247,10 +260,10 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
InsertVerbText = other.InsertVerbText;
|
||||
EjectVerbText = other.EjectVerbText;
|
||||
WhitelistFailPopup = other.WhitelistFailPopup;
|
||||
LockedFailPopup = other.LockedFailPopup;
|
||||
InsertSuccessPopup = other.InsertSuccessPopup;
|
||||
Swap = other.Swap;
|
||||
Priority = other.Priority;
|
||||
|
||||
MaxStackAmount = other.MaxStackAmount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -258,21 +271,11 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// Event raised on the slot entity and the item being inserted to determine if an item can be inserted into an item slot.
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct ItemSlotInsertAttemptEvent(
|
||||
EntityUid SlotEntity,
|
||||
EntityUid Item,
|
||||
EntityUid? User,
|
||||
ItemSlot Slot,
|
||||
bool Cancelled = false);
|
||||
public record struct ItemSlotInsertAttemptEvent(EntityUid SlotEntity, EntityUid Item, EntityUid? User, ItemSlot Slot, bool Cancelled = false);
|
||||
|
||||
/// <summary>
|
||||
/// Event raised on the slot entity and the item being inserted to determine if an item can be ejected from an item slot.
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct ItemSlotEjectAttemptEvent(
|
||||
EntityUid SlotEntity,
|
||||
EntityUid Item,
|
||||
EntityUid? User,
|
||||
ItemSlot Slot,
|
||||
bool Cancelled = false);
|
||||
}
|
||||
public record struct ItemSlotEjectAttemptEvent(EntityUid SlotEntity, EntityUid Item, EntityUid? User, ItemSlot Slot, bool Cancelled = false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user