tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds eating with utensils (#1136)

Browse Source 
* Add Utensil component

For eating. With utensils.
Added to fork, plastic fork, spoon, plastic spoon and plastic knife.
Ignored component on the client.

* Add break chance to utensils

Set to 20% for plastic ones

* Add break sound to utensils

* Add utensil kinds

None, fork, spoon and knife.
For sporks, forknifes and sporknifes, of course.

* Add restricting foods by utensils needed

* Fix utensils breaking when food isn't eaten

* Moved getting held utensils to FoodComponent

* Add breaking a clicking utensil even if its not necessary to eat the food

* Move use utensil code to a separate method

* Add telling a handless entity when they need an utensil to eat

The immersion is off the charts

* Change food trash to only be held when the food was also being held

* Fix Wi-Fi utensils

* Remove unnecessary utensil ItemGroup

* Made TryUseFood public, removed redundant trash position update

* Renamed UtensilKind to UtensilType

* Remove eating food when clicking with it on nothing

* Disable eating food when clicked directly if it requires an untensil to eat
This commit is contained in:
DrSmugleaf
2020-06-19 15:20:59 +02:00
committed by GitHub
parent cda8f8b2bc
commit 99a5e06b98
6 changed files with 263 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/EntryPoint.cs
View File

@@ -167,6 +167,7 @@ namespace Content.Client
"SecureEntityStorage",
"PresetIdCard",
"SolarControlConsole",
"Utensil",
};
foreach (var ignoreName in registerIgnore)

119
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
View File

@@ -1,8 +1,11 @@
using System;
using System.Collections.Generic;
using Content.Server.GameObjects.Components.Chemistry;
using Content.Server.GameObjects.Components.Sound;
using Content.Server.GameObjects.Components.Utensil;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Utility;
using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Utensil;
using Content.Shared.Interfaces;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.Audio;
@@ -10,6 +13,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -32,18 +36,28 @@ namespace Content.Server.GameObjects.Components.Nutrition
private SolutionComponent _contents;
[ViewVariables]
private ReagentUnit _transferAmount;
private UtensilType _utensilsNeeded;
public int UsesRemaining => _contents.CurrentVolume == 0
?
0 : Math.Max(1, (int)Math.Ceiling((_contents.CurrentVolume / _transferAmount).Float()));
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg");
serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5));
serializer.DataField(ref _trashPrototype, "trash", "TrashPlate");
if (serializer.Reading)
{
var utensils = serializer.ReadDataField("utensils", new List<UtensilType>());
foreach (var utensil in utensils)
{
_utensilsNeeded |= utensil;
Dirty();
}
}
}
public override void Initialize()
@@ -55,15 +69,27 @@ namespace Content.Server.GameObjects.Components.Nutrition
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (_utensilsNeeded != UtensilType.None)
{
eventArgs.User.PopupMessage(eventArgs.User, Loc.GetString("You need to use a {0} to eat that!", _utensilsNeeded));
return false;
}
return TryUseFood(eventArgs.User, null);
}
// Feeding someone else
void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
{
if (eventArgs.Target == null)
{
return;
}
TryUseFood(eventArgs.User, eventArgs.Target);
}
private bool TryUseFood(IEntity user, IEntity target)
public bool TryUseFood(IEntity user, IEntity target, UtensilComponent utensilUsed = null)
{
if (user == null)
{
@@ -78,20 +104,65 @@ namespace Content.Server.GameObjects.Components.Nutrition
var trueTarget = target ?? user;
if (trueTarget.TryGetComponent(out StomachComponent stomachComponent))
if (!trueTarget.TryGetComponent(out StomachComponent stomach))
{
var transferAmount = ReagentUnit.Min(_transferAmount, _contents.CurrentVolume);
var split = _contents.SplitSolution(transferAmount);
if (stomachComponent.TryTransferSolution(split))
return false;
}
var utensils = utensilUsed != null
? new List<UtensilComponent> {utensilUsed}
: null;
if (_utensilsNeeded != UtensilType.None)
{
utensils = new List<UtensilComponent>();
var types = UtensilType.None;
if (user.TryGetComponent(out HandsComponent hands))
{
_entitySystem.GetEntitySystem<AudioSystem>()
.PlayFromEntity(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f));
trueTarget.PopupMessage(user, Loc.GetString("Nom"));
foreach (var item in hands.GetAllHeldItems())
{
if (!item.Owner.TryGetComponent(out UtensilComponent utensil))
{
continue;
}
utensils.Add(utensil);
types |= utensil.Types;
}
}
else
if (!types.HasFlag(_utensilsNeeded))
{
_contents.TryAddSolution(split);
trueTarget.PopupMessage(user, Loc.GetString("You can't eat any more!"));
trueTarget.PopupMessage(user, Loc.GetString("You need to be holding a {0} to eat that!", _utensilsNeeded));
return false;
}
}
if (!InteractionChecks.InRangeUnobstructed(user, trueTarget.Transform.MapPosition))
{
return false;
}
var transferAmount = ReagentUnit.Min(_transferAmount, _contents.CurrentVolume);
var split = _contents.SplitSolution(transferAmount);
if (!stomach.TryTransferSolution(split))
{
_contents.TryAddSolution(split);
trueTarget.PopupMessage(user, Loc.GetString("You can't eat any more!"));
return false;
}
_entitySystem.GetEntitySystem<AudioSystem>()
.PlayFromEntity(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f));
trueTarget.PopupMessage(user, Loc.GetString("Nom"));
// If utensils were used
if (utensils != null)
{
foreach (var utensil in utensils)
{
utensil.TryBreak(user);
}
}
@@ -102,19 +173,27 @@ namespace Content.Server.GameObjects.Components.Nutrition
//We're empty. Become trash.
var position = Owner.Transform.GridPosition;
Owner.Delete();
var finisher = Owner.EntityManager.SpawnEntity(_trashPrototype, position);
if (user.TryGetComponent(out HandsComponent handsComponent) && finisher.TryGetComponent(out ItemComponent itemComponent))
// If the user is holding the item
if (user.TryGetComponent(out HandsComponent handsComponent) &&
handsComponent.IsHolding(Owner))
{
if (handsComponent.CanPutInHand(itemComponent))
Owner.Delete();
// Put the trash in the user's hand
if (finisher.TryGetComponent(out ItemComponent item) &&
handsComponent.CanPutInHand(item))
{
handsComponent.PutInHand(itemComponent);
return true;
handsComponent.PutInHand(item);
}
}
finisher.Transform.GridPosition = user.Transform.GridPosition;
return true;
else
{
Owner.Delete();
}
return true;
}
}
}

124
Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs Normal file
View File

@@ -0,0 +1,124 @@
using System.Collections.Generic;
using Content.Server.GameObjects.Components.Nutrition;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Utility;
using Content.Shared.GameObjects.Components.Utensil;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Utensil
{
[RegisterComponent]
public class UtensilComponent : SharedUtensilComponent, IAfterInteract
{
#pragma warning disable 649
[Dependency] private readonly IEntitySystemManager _entitySystem;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
protected UtensilType _types = UtensilType.None;
[ViewVariables]
public override UtensilType Types
{
get => _types;
set
{
_types = value;
Dirty();
}
}
/// <summary>
/// The chance that the utensil has to break with each use.
/// A value of 0 means that it is unbreakable.
/// </summary>
[ViewVariables]
private float _breakChance;
/// <summary>
/// The sound to be played if the utensil breaks.
/// </summary>
[ViewVariables]
private string _breakSound;
public void AddType(UtensilType type)
{
Types |= type;
}
public bool HasAnyType(UtensilType type)
{
return (_types & type) != UtensilType.None;
}
public bool HasType(UtensilType type)
{
return _types.HasFlag(type);
}
public void RemoveType(UtensilType type)
{
Types &= ~type;
}
internal void TryBreak(IEntity user)
{
if (_random.Prob(_breakChance))
{
_entitySystem.GetEntitySystem<AudioSystem>()
.PlayFromEntity(_breakSound, user, AudioParams.Default.WithVolume(-2f));
Owner.Delete();
}
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
if (serializer.Reading)
{
var types = serializer.ReadDataField("types", new List<UtensilType>());
foreach (var type in types)
{
AddType(type);
}
}
serializer.DataField(ref _breakChance, "breakChance", 0);
serializer.DataField(ref _breakSound, "breakSound", "/Audio/items/snap.ogg");
}
void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
{
TryUseUtensil(eventArgs.User, eventArgs.Target);
}
private void TryUseUtensil(IEntity user, IEntity target)
{
if (user == null || target == null)
{
return;
}
if (!target.TryGetComponent(out FoodComponent food))
{
return;
}
if (!InteractionChecks.InRangeUnobstructed(user, target.Transform.MapPosition))
{
return;
}
food.TryUseFood(user, null, this);
}
}
}

21
Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using Robust.Shared.GameObjects;
namespace Content.Shared.GameObjects.Components.Utensil
{
[Flags]
public enum UtensilType : byte
{
None = 0,
Fork = 1,
Spoon = 1 << 1,
Knife = 1 << 2
}
public class SharedUtensilComponent : Component
{
public override string Name => "Utensil";
public virtual UtensilType Types { get; set; }
}
}

BIN
Resources/Audio/items/snap.ogg Normal file
View File

Binary file not shown.

24
Resources/Prototypes/Entities/Items/utensils.yml
View File

@@ -5,7 +5,6 @@
components:
- type: Sprite
sprite: Objects/utensils.rsi
- type: Icon
sprite: Objects/utensils.rsi
@@ -17,9 +16,11 @@
components:
- type: Sprite
state: fork
- type: Icon
state: fork
- type: Utensil
types:
- Fork
- type: entity
parent: UtensilBase
@@ -28,9 +29,12 @@
components:
- type: Sprite
state: plastic_fork
- type: Icon
state: plastic_fork
- type: Utensil
types:
- Fork
breakChance: 0.20
- type: entity
parent: UtensilBase
@@ -40,9 +44,11 @@
components:
- type: Sprite
state: spoon
- type: Icon
state: spoon
- type: Utensil
types:
- Spoon
- type: entity
parent: UtensilBase
@@ -52,9 +58,12 @@
components:
- type: Sprite
state: plastic_spoon
- type: Icon
state: plastic_spoon
- type: Utensil
types:
- Spoon
breakChance: 0.20
- type: entity
parent: UtensilBase
@@ -63,6 +72,9 @@
components:
- type: Sprite
state: plastic_knife
- type: Icon
state: plastic_knife
- type: Utensil
types:
- Knife
breakChance: 0.20