Debody Food and Drink Systems, Combine Food and Drink into One System. (#39031)

* Shelve * 22 file diff * What if it was just better * Hold that thought * Near final Commit, then YAML hell * 95% done with cs * Working Commit * Final Commit (Before reviews tear it apart and kill me) * Add a really stupid comment. * KILL * EXPLODE TEST FAILS WITH MY MIND * I hate it here * TACTICAL NUCLEAR STRIKE * Wait what the fuck was I doing? * Comments * Me when I'm stupid * Food doesn't need solutions * API improvements with some API weirdness * Move non-API out of API * Better comment * Fixes and spelling mistakes * Final fixes * Final fixes for real... * Kill food and drink localization files because I hate them. * Water droplet fix * Utensil fixes * Fix verb priority (It should've been 2) * A few minor localization fixes * merge conflict and stuff * MERGE CONFLICT NUCLEAR WAR!!! * Cleanup --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-06 09:53:38 -07:00
parent 02382045ab
commit 91854e0776
52 changed files with 2169 additions and 1024 deletions
--- a/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
@@ -1,73 +0,0 @@
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Interaction;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Tools.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-public sealed class UtensilSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly FoodSystem _foodSystem = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem), typeof(ToolOpenableSystem) });
-    }
-
-    /// <summary>
-    /// Clicked with utensil
-    /// </summary>
-    private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
-    {
-        if (ev.Handled || ev.Target == null || !ev.CanReach)
-            return;
-
-        var result = TryUseUtensil(ev.User, ev.Target.Value, entity);
-        ev.Handled = result.Handled;
-    }
-
-    public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
-    {
-        if (!TryComp(target, out FoodComponent? food))
-            return (false, false);
-
-        //Prevents food usage with a wrong utensil
-        if ((food.Utensil & utensil.Comp.Types) == 0)
-        {
-            _popupSystem.PopupClient(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", utensil.Owner)), user, user);
-            return (false, true);
-        }
-
-        if (!_interactionSystem.InRangeUnobstructed(user, target, popup: true))
-            return (false, true);
-
-        return _foodSystem.TryFeed(user, user, target, food);
-    }
-
-    /// <summary>
-    /// Attempt to break the utensil after interaction.
-    /// </summary>
-    /// <param name="uid">Utensil.</param>
-    /// <param name="userUid">User of the utensil.</param>
-    public void TryBreak(EntityUid uid, EntityUid userUid, UtensilComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (_robustRandom.Prob(component.BreakChance))
-        {
-            _audio.PlayPredicted(component.BreakSound, userUid, userUid, AudioParams.Default.WithVolume(-2f));
-            Del(uid);
-        }
-    }
-}