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

Sliceable doAfter (#30824)

Browse Source 
* init

* wtf git
This commit is contained in:
Ed
2024-08-13 13:53:59 +03:00
committed by GitHub
parent bf7c32737b
commit cc180e54e6
3 changed files with 147 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Nutrition/Components/SliceableFoodComponent.cs
View File

@@ -11,21 +11,27 @@ public sealed partial class SliceableFoodComponent : Component
/// Prototype to spawn after slicing.
/// If null then it can't be sliced.
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public EntProtoId? Slice;
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/Culinary/chop.ogg");
/// <summary>
/// Number of slices the food starts with.
/// </summary>
[DataField("count"), ViewVariables(VVAccess.ReadWrite)]
[DataField("count")]
public ushort TotalCount = 5;
/// <summary>
/// Number of slices left.
/// how long it takes for this food to be sliced
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public ushort Count;
[DataField]
public float SliceTime = 1f;
/// <summary>
/// all the pieces will be shifted in random directions.
/// </summary>
[DataField]
public float SpawnOffset = 0.5f;
}

123
Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
View File

@@ -1,30 +1,31 @@
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Server.DoAfter;
using Content.Server.Nutrition.Components;
using Content.Shared.Nutrition;
using Content.Shared.Nutrition.Components;
using Content.Shared.Chemistry.Components;
using Content.Shared.Examine;
using Content.Shared.DoAfter;
using Content.Shared.FixedPoint;
using Content.Shared.Interaction;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
namespace Content.Server.Nutrition.EntitySystems
{
namespace Content.Server.Nutrition.EntitySystems;
public sealed class SliceableFoodSystem : EntitySystem
{
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly TransformSystem _xformSystem = default!;
[Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly DoAfterSystem _doAfter = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<SliceableFoodComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<SliceableFoodComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<SliceableFoodComponent, SliceFoodDoAfterEvent>(OnSlicedoAfter);
SubscribeLocalEvent<SliceableFoodComponent, ComponentStartup>(OnComponentStartup);
}
@@ -33,65 +34,63 @@ namespace Content.Server.Nutrition.EntitySystems
if (args.Handled)
return;
var doAfterArgs = new DoAfterArgs(EntityManager,
args.User,
entity.Comp.SliceTime,
new SliceFoodDoAfterEvent(),
entity,
entity,
args.Used)
{
BreakOnDamage = true,
BreakOnMove = true,
NeedHand = true,
};
_doAfter.TryStartDoAfter(doAfterArgs);
}
private void OnSlicedoAfter(Entity<SliceableFoodComponent> entity, ref SliceFoodDoAfterEvent args)
{
if (args.Cancelled || args.Handled || args.Args.Target == null)
return;
if (TrySliceFood(entity, args.User, args.Used, entity.Comp))
args.Handled = true;
}
private bool TrySliceFood(EntityUid uid, EntityUid user, EntityUid usedItem,
SliceableFoodComponent? component = null, FoodComponent? food = null, TransformComponent? transform = null)
private bool TrySliceFood(EntityUid uid,
EntityUid user,
EntityUid? usedItem,
SliceableFoodComponent? component = null,
FoodComponent? food = null,
TransformComponent? transform = null)
{
if (!Resolve(uid, ref component, ref food, ref transform) ||
string.IsNullOrEmpty(component.Slice))
{
return false;
}
if (!_solutionContainerSystem.TryGetSolution(uid, food.Solution, out var soln, out var solution))
{
if (!_solutionContainer.TryGetSolution(uid, food.Solution, out var soln, out var solution))
return false;
}
if (!TryComp<UtensilComponent>(usedItem, out var utensil) || (utensil.Types & UtensilType.Knife) == 0)
{
return false;
}
var sliceVolume = solution.Volume / FixedPoint2.New(component.TotalCount);
for (int i = 0; i < component.TotalCount; i++)
{
var sliceUid = Slice(uid, user, component, transform);
var lostSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume / FixedPoint2.New(component.Count));
var lostSolution =
_solutionContainer.SplitSolution(soln.Value, sliceVolume);
// Fill new slice
FillSlice(sliceUid, lostSolution);
}
_audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
var ev = new SliceFoodEvent();
RaiseLocalEvent(uid, ref ev);
// Decrease size of item based on count - Could implement in the future
// Bug with this currently is the size in a container is not updated
// if (TryComp(uid, out ItemComponent? itemComp) && TryComp(sliceUid, out ItemComponent? sliceComp))
// {
// itemComp.Size -= sliceComp.Size;
// }
component.Count--;
// If someone makes food proto with 1 slice...
if (component.Count < 1)
{
DeleteFood(uid, user, food);
return true;
}
// Split last slice
if (component.Count > 1)
return true;
sliceUid = Slice(uid, user, component, transform);
// Fill last slice with the rest of the solution
FillSlice(sliceUid, solution);
DeleteFood(uid, user, food);
return true;
}
@@ -100,17 +99,20 @@ namespace Content.Server.Nutrition.EntitySystems
/// Create a new slice in the world and returns its entity.
/// The solutions must be set afterwards.
/// </summary>
public EntityUid Slice(EntityUid uid, EntityUid user, SliceableFoodComponent? comp = null, TransformComponent? transform = null)
public EntityUid Slice(EntityUid uid,
EntityUid user,
SliceableFoodComponent? comp = null,
TransformComponent? transform = null)
{
if (!Resolve(uid, ref comp, ref transform))
return EntityUid.Invalid;
var sliceUid = Spawn(comp.Slice, _xformSystem.GetMapCoordinates(uid));
var sliceUid = Spawn(comp.Slice, _transform.GetMapCoordinates(uid));
// try putting the slice into the container if the food being sliced is in a container!
// this lets you do things like slice a pizza up inside of a hot food cart without making a food-everywhere mess
_xformSystem.DropNextTo(sliceUid, (uid, transform));
_xformSystem.SetLocalRotation(sliceUid, 0);
_transform.DropNextTo(sliceUid, (uid, transform));
_transform.SetLocalRotation(sliceUid, 0);
return sliceUid;
}
@@ -125,20 +127,14 @@ namespace Content.Server.Nutrition.EntitySystems
if (ev.Cancelled)
return;
if (foodComp.Trash.Count == 0)
{
QueueDel(uid);
return;
}
// Locate the sliced food and spawn its trash
foreach (var trash in foodComp.Trash)
{
var trashUid = Spawn(trash, _xformSystem.GetMapCoordinates(uid));
var trashUid = Spawn(trash, _transform.GetMapCoordinates(uid));
// try putting the trash in the food's container too, to be consistent with slice spawning?
_xformSystem.DropNextTo(trashUid, uid);
_xformSystem.SetLocalRotation(trashUid, 0);
_transform.DropNextTo(trashUid, uid);
_transform.SetLocalRotation(trashUid, 0);
}
QueueDel(uid);
@@ -148,26 +144,19 @@ namespace Content.Server.Nutrition.EntitySystems
{
// Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
if (TryComp<FoodComponent>(sliceUid, out var sliceFoodComp) &&
_solutionContainerSystem.TryGetSolution(sliceUid, sliceFoodComp.Solution, out var itsSoln, out var itsSolution))
_solutionContainer.TryGetSolution(sliceUid, sliceFoodComp.Solution, out var itsSoln, out var itsSolution))
{
_solutionContainerSystem.RemoveAllSolution(itsSoln.Value);
_solutionContainer.RemoveAllSolution(itsSoln.Value);
var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
_solutionContainerSystem.TryAddSolution(itsSoln.Value, lostSolutionPart);
_solutionContainer.TryAddSolution(itsSoln.Value, lostSolutionPart);
}
}
private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref ComponentStartup args)
{
entity.Comp.Count = entity.Comp.TotalCount;
var foodComp = EnsureComp<FoodComponent>(entity);
_solutionContainerSystem.EnsureSolution(entity.Owner, foodComp.Solution);
_solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution);
}
}
private void OnExamined(Entity<SliceableFoodComponent> entity, ref ExaminedEvent args)
{
args.PushMarkup(Loc.GetString("sliceable-food-component-on-examine-remaining-slices-text", ("remainingCount", entity.Comp.Count)));
}
}
}

8
Content.Shared/Nutrition/Events.cs
View File

@@ -59,3 +59,11 @@ public sealed partial class VapeDoAfterEvent : DoAfterEvent
/// </summary>
[ByRefEvent]
public record struct SliceFoodEvent();
/// <summary>
/// is called after a successful attempt at slicing food.
/// </summary>
[Serializable, NetSerializable]
public sealed partial class SliceFoodDoAfterEvent : SimpleDoAfterEvent
{
}