Toilet (#3012)
* Ported sprites from eris * Added yml * lid open/close logic * interactivity * Working on new secret stash component * Object will drop on destruction * Can get item and examine message * Reagent container and some cleaning * Moved potted plant to stash * New base prefab * Now you can deconstruct toilet * Small fixes * Fixed unknown components errors * Fixed grammar errors Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Now use prob * More grammar * Update Content.Server/Construction/Conditions/ToiletLidClosed.cs Aaaaaaaa Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * No delays * Amazing sound design * Moved sound to mono * Toilet viz Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Alex Evgrashin
@@ -0,0 +1,119 @@
|
||||
#nullable enable
|
||||
using Content.Server.GameObjects.Components.GUI;
|
||||
using Content.Server.Interfaces.GameObjects.Components.Items;
|
||||
using Content.Shared.GameObjects.EntitySystems;
|
||||
using Content.Shared.Interfaces;
|
||||
using Robust.Server.GameObjects.Components.Container;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Server.GameObjects.Components.Items.Storage
|
||||
{
|
||||
/// <summary>
|
||||
/// Logic for secret single slot stash, like plant pot or toilet cistern
|
||||
/// </summary>
|
||||
[RegisterComponent]
|
||||
public class SecretStashComponent : Component, IDestroyAct
|
||||
{
|
||||
public override string Name => "SecretStash";
|
||||
|
||||
[ViewVariables] private int _maxItemSize;
|
||||
[ViewVariables] private string _secretPartName = "";
|
||||
|
||||
[ViewVariables] private ContainerSlot _itemContainer = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
_itemContainer = ContainerManagerComponent.Ensure<ContainerSlot>("stash", Owner, out _);
|
||||
}
|
||||
public override void ExposeData(ObjectSerializer serializer)
|
||||
{
|
||||
base.ExposeData(serializer);
|
||||
serializer.DataField(ref _maxItemSize, "maxItemSize", (int) ReferenceSizes.Pocket);
|
||||
serializer.DataField(ref _secretPartName, "secretPartName", Loc.GetString("{0:theName}"));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Tries to hide item inside secret stash from hands of user
|
||||
/// </summary>
|
||||
/// <param name="user"></param>
|
||||
/// <param name="itemToHide"></param>
|
||||
/// <returns>True if item was hidden inside stash</returns>
|
||||
public bool TryHideItem(IEntity user, IEntity itemToHide)
|
||||
{
|
||||
if (_itemContainer.ContainedEntity != null)
|
||||
{
|
||||
Owner.PopupMessage(user, Loc.GetString("There's already something in here?!"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!itemToHide.TryGetComponent(out ItemComponent? item))
|
||||
return false;
|
||||
|
||||
if (item.Size > _maxItemSize)
|
||||
{
|
||||
Owner.PopupMessage(user,
|
||||
Loc.GetString("{0:TheName} is too big to fit in {1}!", itemToHide, _secretPartName));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!user.TryGetComponent(out IHandsComponent? hands))
|
||||
return false;
|
||||
|
||||
if (!hands.Drop(itemToHide, _itemContainer))
|
||||
return false;
|
||||
|
||||
Owner.PopupMessage(user, Loc.GetString("You hide {0:theName} in {1}.", itemToHide, _secretPartName));
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Try get item and place it in users hand
|
||||
/// If user can't take it by hands, will drop item from container
|
||||
/// </summary>
|
||||
/// <param name="user"></param>
|
||||
/// <returns>True if user recieved item</returns>
|
||||
public bool TryGetItem(IEntity user)
|
||||
{
|
||||
if (_itemContainer.ContainedEntity == null)
|
||||
return false;
|
||||
|
||||
Owner.PopupMessage(user, Loc.GetString("There was something inside {0}!", _secretPartName));
|
||||
|
||||
if (user.TryGetComponent(out HandsComponent? hands))
|
||||
{
|
||||
if (!_itemContainer.ContainedEntity.TryGetComponent(out ItemComponent? item))
|
||||
return false;
|
||||
hands.PutInHandOrDrop(item);
|
||||
}
|
||||
else if (_itemContainer.Remove(_itemContainer.ContainedEntity))
|
||||
{
|
||||
_itemContainer.ContainedEntity.Transform.Coordinates = Owner.Transform.Coordinates;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Is there something inside secret stash item container?
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool HasItemInside()
|
||||
{
|
||||
return _itemContainer.ContainedEntity != null;
|
||||
}
|
||||
|
||||
public void OnDestroy(DestructionEventArgs eventArgs)
|
||||
{
|
||||
// drop item inside
|
||||
if (_itemContainer.ContainedEntity != null)
|
||||
{
|
||||
_itemContainer.ContainedEntity.Transform.Coordinates = Owner.Transform.Coordinates;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,74 +17,33 @@ namespace Content.Server.GameObjects.Components
|
||||
[RegisterComponent]
|
||||
public class PottedPlantHideComponent : Component, IInteractUsing, IInteractHand
|
||||
{
|
||||
private const int MaxItemSize = (int) ReferenceSizes.Pocket;
|
||||
|
||||
public override string Name => "PottedPlantHide";
|
||||
|
||||
[ViewVariables] private ContainerSlot _itemContainer;
|
||||
[ViewVariables] private SecretStashComponent _secretStash = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
_itemContainer =
|
||||
ContainerManagerComponent.Ensure<ContainerSlot>("potted_plant_hide", Owner, out _);
|
||||
_secretStash = Owner.EnsureComponent<SecretStashComponent>();
|
||||
}
|
||||
|
||||
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
|
||||
{
|
||||
if (_itemContainer.ContainedEntity != null)
|
||||
{
|
||||
Rustle();
|
||||
|
||||
Owner.PopupMessage(eventArgs.User, Loc.GetString("There's already something in here?!"));
|
||||
return false;
|
||||
}
|
||||
|
||||
var size = eventArgs.Using.GetComponent<ItemComponent>().Size;
|
||||
|
||||
// TODO: use proper text macro system for this.
|
||||
|
||||
if (size > MaxItemSize)
|
||||
{
|
||||
Owner.PopupMessage(eventArgs.User,
|
||||
Loc.GetString("{0:TheName} is too big to fit in the plant!", eventArgs.Using));
|
||||
return false;
|
||||
}
|
||||
|
||||
var handsComponent = eventArgs.User.GetComponent<IHandsComponent>();
|
||||
|
||||
if (!handsComponent.Drop(eventArgs.Using, _itemContainer))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Owner.PopupMessage(eventArgs.User, Loc.GetString("You hide {0:theName} in the plant.", eventArgs.Using));
|
||||
Rustle();
|
||||
return true;
|
||||
return _secretStash.TryHideItem(eventArgs.User, eventArgs.Using);
|
||||
}
|
||||
|
||||
bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
|
||||
{
|
||||
Rustle();
|
||||
|
||||
if (_itemContainer.ContainedEntity == null)
|
||||
var gotItem = _secretStash.TryGetItem(eventArgs.User);
|
||||
if (!gotItem)
|
||||
{
|
||||
Owner.PopupMessage(eventArgs.User, Loc.GetString("You root around in the roots."));
|
||||
return true;
|
||||
}
|
||||
|
||||
Owner.PopupMessage(eventArgs.User, Loc.GetString("There was something in there!"));
|
||||
if (eventArgs.User.TryGetComponent(out HandsComponent hands))
|
||||
{
|
||||
hands.PutInHandOrDrop(_itemContainer.ContainedEntity.GetComponent<ItemComponent>());
|
||||
}
|
||||
else if (_itemContainer.Remove(_itemContainer.ContainedEntity))
|
||||
{
|
||||
_itemContainer.ContainedEntity.Transform.Coordinates = Owner.Transform.Coordinates;
|
||||
}
|
||||
|
||||
return true;
|
||||
return gotItem;
|
||||
}
|
||||
|
||||
private void Rustle()
|
||||
|
||||
@@ -0,0 +1,174 @@
|
||||
#nullable enable
|
||||
using Content.Server.GameObjects.Components.Interactable;
|
||||
using Content.Server.GameObjects.Components.Items.Storage;
|
||||
using Content.Server.GameObjects.Components.Strap;
|
||||
using Content.Server.Interfaces.Chat;
|
||||
using Content.Server.Interfaces.GameObjects;
|
||||
using Content.Server.Utility;
|
||||
using Content.Shared.Audio;
|
||||
using Content.Shared.GameObjects.Components.Body;
|
||||
using Content.Shared.GameObjects.Components.Body.Part;
|
||||
using Content.Shared.GameObjects.Components.Interactable;
|
||||
using Content.Shared.GameObjects.Components.Watercloset;
|
||||
using Content.Shared.GameObjects.EntitySystems;
|
||||
using Content.Shared.Interfaces;
|
||||
using Content.Shared.Interfaces.GameObjects.Components;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Server.GameObjects.EntitySystems;
|
||||
using Robust.Server.Interfaces.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.GameObjects.Systems;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Interfaces.Random;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Random;
|
||||
using Robust.Shared.Utility;
|
||||
using Robust.Shared.ViewVariables;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Content.Server.GameObjects.Components.Watercloset
|
||||
{
|
||||
[RegisterComponent]
|
||||
public class ToiletComponent : Component, IInteractUsing,
|
||||
IInteractHand, IMapInit, IExamine, ISuicideAct
|
||||
{
|
||||
public sealed override string Name => "Toilet";
|
||||
|
||||
private const float PryLidTime = 1f;
|
||||
|
||||
private bool _isPrying = false;
|
||||
|
||||
[ViewVariables] public bool LidOpen { get; private set; }
|
||||
[ViewVariables] public bool IsSeatUp { get; private set; }
|
||||
|
||||
[ViewVariables] private SecretStashComponent _secretStash = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
_secretStash = Owner.EnsureComponent<SecretStashComponent>();
|
||||
}
|
||||
|
||||
public void MapInit()
|
||||
{
|
||||
// roll is toilet seat will be up or down
|
||||
var random = IoCManager.Resolve<IRobustRandom>();
|
||||
IsSeatUp = random.Prob(0.5f);
|
||||
UpdateSprite();
|
||||
}
|
||||
|
||||
public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
|
||||
{
|
||||
// are player trying place or lift of cistern lid?
|
||||
if (eventArgs.Using.TryGetComponent(out ToolComponent? tool)
|
||||
&& tool!.HasQuality(ToolQuality.Prying))
|
||||
{
|
||||
// check if someone is already prying this toilet
|
||||
if (_isPrying)
|
||||
return false;
|
||||
_isPrying = true;
|
||||
|
||||
if (!await tool.UseTool(eventArgs.User, Owner, PryLidTime, ToolQuality.Prying))
|
||||
{
|
||||
_isPrying = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
_isPrying = false;
|
||||
|
||||
// all cool - toggle lid
|
||||
LidOpen = !LidOpen;
|
||||
UpdateSprite();
|
||||
|
||||
return true;
|
||||
}
|
||||
// maybe player trying to hide something inside cistern?
|
||||
else if (LidOpen)
|
||||
{
|
||||
return _secretStash.TryHideItem(eventArgs.User, eventArgs.Using);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool InteractHand(InteractHandEventArgs eventArgs)
|
||||
{
|
||||
// trying get something from stash?
|
||||
if (LidOpen)
|
||||
{
|
||||
var gotItem = _secretStash.TryGetItem(eventArgs.User);
|
||||
|
||||
if (gotItem)
|
||||
return true;
|
||||
}
|
||||
|
||||
// just want to up/down seat?
|
||||
// check that nobody seats on seat right now
|
||||
if (Owner.TryGetComponent(out StrapComponent? strap))
|
||||
{
|
||||
if (strap.BuckledEntities.Count != 0)
|
||||
return false;
|
||||
}
|
||||
|
||||
ToggleToiletSeat();
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Examine(FormattedMessage message, bool inDetailsRange)
|
||||
{
|
||||
if (inDetailsRange && LidOpen)
|
||||
{
|
||||
if (_secretStash.HasItemInside())
|
||||
{
|
||||
message.AddMarkup(Loc.GetString("There is [color=darkgreen]something[/color] inside cistern!"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void ToggleToiletSeat()
|
||||
{
|
||||
IsSeatUp = !IsSeatUp;
|
||||
EntitySystem.Get<AudioSystem>()
|
||||
.PlayFromEntity("/Audio/Effects/toilet_seat_down.ogg", Owner, AudioHelpers.WithVariation(0.05f));
|
||||
|
||||
UpdateSprite();
|
||||
}
|
||||
|
||||
private void UpdateSprite()
|
||||
{
|
||||
if (Owner.TryGetComponent(out AppearanceComponent? appearance))
|
||||
{
|
||||
appearance.SetData(ToiletVisuals.LidOpen, LidOpen);
|
||||
appearance.SetData(ToiletVisuals.SeatUp, IsSeatUp);
|
||||
}
|
||||
}
|
||||
|
||||
public SuicideKind Suicide(IEntity victim, IChatManager chat)
|
||||
{
|
||||
// check that victim even have head
|
||||
if (victim.TryGetComponent<IBody>(out var body) &&
|
||||
body.GetPartsOfType(BodyPartType.Head).Count != 0)
|
||||
{
|
||||
var othersMessage = Loc.GetString("{0:theName} sticks their head into {1:theName} and flushes it!", victim, Owner);
|
||||
victim.PopupMessageOtherClients(othersMessage);
|
||||
|
||||
var selfMessage = Loc.GetString("You stick your head into {0:theName} and flush it!", Owner);
|
||||
victim.PopupMessage(selfMessage);
|
||||
|
||||
return SuicideKind.Asphyxiation;
|
||||
}
|
||||
else
|
||||
{
|
||||
var othersMessage = Loc.GetString("{0:theName} bashes themselves with {1:theName}!", victim, Owner);
|
||||
victim.PopupMessageOtherClients(othersMessage);
|
||||
|
||||
var selfMessage = Loc.GetString("You bash yourself with {0:theName}!", Owner);
|
||||
victim.PopupMessage(selfMessage);
|
||||
|
||||
return SuicideKind.Blunt;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user