mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 13:37:47 +03:00
## Mirror of PR #25928: [Fix cream pie bomb when eaten or sliced](https://github.com/space-wizards/space-station-14/pull/25928) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `0d0edbba4a1c2af7ecef3318b5f9fe287a63fab5` PR opened by <img src="https://avatars.githubusercontent.com/u/40753025?v=4" width="16"/><a href="https://github.com/Slava0135"> Slava0135</a> at 2024-03-08 13:16:38 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-13 08:36:08 UTC --- PR changed 4 files with 22 additions and 4 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > >  > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > 🆑 > - fix: Fixed pie bomb not detonating when eaten or sliced (remember to keep hungry mice away from it)! > - tweak: Pie bomb now cannot be ejected or swapped (just hope there is no bomb inside) > </details> --------- Co-authored-by: Vyacheslav Kovalevsky <40753025+Slava0135@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
194 lines
7.6 KiB
C#
194 lines
7.6 KiB
C#
using Content.Server.Nutrition; // DeltaV
|
|
using Content.Server.Chemistry.Containers.EntitySystems;
|
|
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.FixedPoint;
|
|
using Content.Shared.Hands.EntitySystems;
|
|
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
|
|
{
|
|
public sealed class SliceableFoodSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
|
|
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
|
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
|
|
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
|
[Dependency] private readonly TransformSystem _xformSystem = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<SliceableFoodComponent, ExaminedEvent>(OnExamined);
|
|
SubscribeLocalEvent<SliceableFoodComponent, InteractUsingEvent>(OnInteractUsing);
|
|
SubscribeLocalEvent<SliceableFoodComponent, ComponentStartup>(OnComponentStartup);
|
|
}
|
|
|
|
private void OnInteractUsing(Entity<SliceableFoodComponent> entity, ref InteractUsingEvent args)
|
|
{
|
|
if (args.Handled)
|
|
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)
|
|
{
|
|
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))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (!TryComp<UtensilComponent>(usedItem, out var utensil) || (utensil.Types & UtensilType.Knife) == 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
var sliceUid = Slice(uid, user, component, transform);
|
|
|
|
var lostSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume / FixedPoint2.New(component.Count));
|
|
|
|
// Fill new slice
|
|
FillSlice(sliceUid, lostSolution);
|
|
|
|
_audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
|
|
var ev = new SliceFoodEvent(uid, user, usedItem);
|
|
RaiseLocalEvent(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;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 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)
|
|
{
|
|
if (!Resolve(uid, ref comp, ref transform))
|
|
return EntityUid.Invalid;
|
|
|
|
var sliceUid = Spawn(comp.Slice, _xformSystem.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
|
|
if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(sliceUid, container))
|
|
{
|
|
_containerSystem.Insert(sliceUid, container);
|
|
}
|
|
else // puts it down "right-side up"
|
|
{
|
|
_xformSystem.AttachToGridOrMap(sliceUid);
|
|
_xformSystem.SetLocalRotation(sliceUid, 0);
|
|
}
|
|
|
|
// DeltaV - Begin deep frier related code
|
|
var sliceEvent = new SliceFoodEvent(user, uid, sliceUid);
|
|
RaiseLocalEvent(uid, sliceEvent);
|
|
// DeltaV - End deep frier related code
|
|
|
|
return sliceUid;
|
|
}
|
|
|
|
private void DeleteFood(EntityUid uid, EntityUid user, FoodComponent foodComp)
|
|
{
|
|
var ev = new BeforeFullySlicedEvent
|
|
{
|
|
User = user
|
|
};
|
|
RaiseLocalEvent(uid, ev);
|
|
if (ev.Cancelled)
|
|
return;
|
|
|
|
if (string.IsNullOrEmpty(foodComp.Trash))
|
|
{
|
|
QueueDel(uid);
|
|
return;
|
|
}
|
|
|
|
// Locate the sliced food and spawn its trash
|
|
var trashUid = Spawn(foodComp.Trash, _xformSystem.GetMapCoordinates(uid));
|
|
|
|
// try putting the trash in the food's container too, to be consistent with slice spawning?
|
|
if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(trashUid, container))
|
|
{
|
|
_containerSystem.Insert(trashUid, container);
|
|
}
|
|
else // puts it down "right-side up"
|
|
{
|
|
_xformSystem.AttachToGridOrMap(trashUid);
|
|
_xformSystem.SetLocalRotation(trashUid, 0);
|
|
}
|
|
|
|
QueueDel(uid);
|
|
}
|
|
|
|
private void FillSlice(EntityUid sliceUid, Solution solution)
|
|
{
|
|
// 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))
|
|
{
|
|
_solutionContainerSystem.RemoveAllSolution(itsSoln.Value);
|
|
|
|
var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
|
|
_solutionContainerSystem.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);
|
|
}
|
|
|
|
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)));
|
|
}
|
|
}
|
|
}
|