juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DoAfter Refactor (#13225)

Browse Source 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
This commit is contained in:
keronshb
2023-02-24 19:01:25 -05:00
committed by GitHub
parent 7a9baa79c2
commit 9ebb452a3c
129 changed files with 2624 additions and 4132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -1,4 +1,3 @@
using System.Threading;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Server.Chemistry.Components.SolutionManager;
@@ -9,8 +8,11 @@ using Content.Server.Nutrition.Components;
using Content.Server.Popups;
using Content.Shared.Administration.Logs;
using Content.Shared.Body.Components;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Database;
using Content.Shared.DoAfter;
using Content.Shared.Examine;
using Content.Shared.FixedPoint;
using Content.Shared.IdentityManagement;
@@ -46,6 +48,7 @@ namespace Content.Server.Nutrition.EntitySystems
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly ReactiveSystem _reaction = default!;
public override void Initialize()
{
@@ -59,8 +62,7 @@ namespace Content.Server.Nutrition.EntitySystems
SubscribeLocalEvent<DrinkComponent, GetVerbsEvent<AlternativeVerb>>(AddDrinkVerb);
SubscribeLocalEvent<DrinkComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<DrinkComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
SubscribeLocalEvent<BodyComponent, DrinkEvent>(OnDrink);
SubscribeLocalEvent<DrinkCancelledEvent>(OnDrinkCancelled);
SubscribeLocalEvent<DrinkComponent, DoAfterEvent<DrinkData>>(OnDoAfter);
}
public bool IsEmpty(EntityUid uid, DrinkComponent? component = null)
@@ -126,12 +128,13 @@ namespace Content.Server.Nutrition.EntitySystems
if (args.Handled || args.Target == null || !args.CanReach)
return;
args.Handled = TryDrink(args.User, args.Target.Value, component);
args.Handled = TryDrink(args.User, args.Target.Value, component, uid);
}
private void OnUse(EntityUid uid, DrinkComponent component, UseInHandEvent args)
{
if (args.Handled) return;
if (args.Handled)
return;
if (!component.Opened)
{
@@ -142,7 +145,7 @@ namespace Content.Server.Nutrition.EntitySystems
return;
}
args.Handled = TryDrink(args.User, args.User, component);
args.Handled = TryDrink(args.User, args.User, component, uid);
}
private void HandleLand(EntityUid uid, DrinkComponent component, ref LandEvent args)
@@ -212,36 +215,30 @@ namespace Content.Server.Nutrition.EntitySystems
}
}
private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink)
private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item)
{
// cannot stack do-afters
if (drink.CancelToken != null)
{
return true;
}
if (!EntityManager.HasComponent<BodyComponent>(target))
return false;
if (!drink.Opened)
{
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-not-open",
("owner", EntityManager.GetComponent<MetaDataComponent>(drink.Owner).EntityName)), drink.Owner, user);
("owner", EntityManager.GetComponent<MetaDataComponent>(item).EntityName)), item, user);
return true;
}
if (!_solutionContainerSystem.TryGetDrainableSolution(drink.Owner, out var drinkSolution) ||
if (!_solutionContainerSystem.TryGetDrainableSolution(item, out var drinkSolution) ||
drinkSolution.Volume <= 0)
{
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty",
("entity", EntityManager.GetComponent<MetaDataComponent>(drink.Owner).EntityName)), drink.Owner, user);
("entity", EntityManager.GetComponent<MetaDataComponent>(item).EntityName)), item, user);
return true;
}
if (_foodSystem.IsMouthBlocked(target, user))
return true;
if (!_interactionSystem.InRangeUnobstructed(user, drink.Owner, popup: true))
if (!_interactionSystem.InRangeUnobstructed(user, item, popup: true))
return true;
var forceDrink = user != target;
@@ -254,20 +251,21 @@ namespace Content.Server.Nutrition.EntitySystems
user, target);
// logging
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to drink {ToPrettyString(drink.Owner):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}");
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to drink {ToPrettyString(item):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}");
}
else
{
// log voluntary drinking
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is drinking {ToPrettyString(drink.Owner):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}");
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is drinking {ToPrettyString(item):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}");
}
drink.CancelToken = new CancellationTokenSource();
var moveBreak = user != target;
var flavors = _flavorProfileSystem.GetLocalizedFlavorsMessage(user, drinkSolution);
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, forceDrink ? drink.ForceFeedDelay : drink.Delay, drink.CancelToken.Token, target, drink.Owner)
var drinkData = new DrinkData(drinkSolution, flavors);
var doAfterEventArgs = new DoAfterEventArgs(user, forceDrink ? drink.ForceFeedDelay : drink.Delay,
target: target, used: item)
{
BreakOnUserMove = moveBreak,
BreakOnDamage = true,
@@ -275,10 +273,10 @@ namespace Content.Server.Nutrition.EntitySystems
BreakOnTargetMove = moveBreak,
MovementThreshold = 0.01f,
DistanceThreshold = 1.0f,
TargetFinishedEvent = new DrinkEvent(user, drink, drinkSolution, flavors),
BroadcastCancelledEvent = new DrinkCancelledEvent(drink),
NeedHand = true,
});
NeedHand = true
};
_doAfterSystem.DoAfter(doAfterEventArgs, drinkData);
return true;
}
@@ -286,103 +284,93 @@ namespace Content.Server.Nutrition.EntitySystems
/// <summary>
/// Raised directed at a victim when someone has force fed them a drink.
/// </summary>
private void OnDrink(EntityUid uid, BodyComponent body, DrinkEvent args)
private void OnDoAfter(EntityUid uid, DrinkComponent component, DoAfterEvent<DrinkData> args)
{
if (args.Drink.Deleted)
if (args.Handled || args.Cancelled || component.Deleted)
return;
args.Drink.CancelToken = null;
var transferAmount = FixedPoint2.Min(args.Drink.TransferAmount, args.DrinkSolution.Volume);
var drained = _solutionContainerSystem.Drain(args.Drink.Owner, args.DrinkSolution, transferAmount);
if (!TryComp<BodyComponent>(args.Args.Target, out var body))
return;
var forceDrink = uid != args.User;
var transferAmount = FixedPoint2.Min(component.TransferAmount, args.AdditionalData.DrinkSolution.Volume);
var drained = _solutionContainerSystem.Drain(uid, args.AdditionalData.DrinkSolution, transferAmount);
if (!_bodySystem.TryGetBodyOrganComponents<StomachComponent>(uid, out var stomachs, body))
var forceDrink = args.Args.Target.Value != args.Args.User;
if (!_bodySystem.TryGetBodyOrganComponents<StomachComponent>(args.Args.Target.Value, out var stomachs, body))
{
_popupSystem.PopupEntity(
forceDrink ?
Loc.GetString("drink-component-try-use-drink-cannot-drink-other") :
Loc.GetString("drink-component-try-use-drink-had-enough"),
uid, args.User);
_popupSystem.PopupEntity(forceDrink ? Loc.GetString("drink-component-try-use-drink-cannot-drink-other") : Loc.GetString("drink-component-try-use-drink-had-enough"), args.Args.Target.Value, args.Args.User);
if (EntityManager.HasComponent<RefillableSolutionComponent>(uid))
if (HasComp<RefillableSolutionComponent>(args.Args.Target.Value))
{
_spillableSystem.SpillAt(args.User, drained, "PuddleSmear");
_spillableSystem.SpillAt(args.Args.User, drained, "PuddleSmear");
args.Handled = true;
return;
}
_solutionContainerSystem.Refill(uid, args.DrinkSolution, drained);
_solutionContainerSystem.Refill(args.Args.Target.Value, args.AdditionalData.DrinkSolution, drained);
args.Handled = true;
return;
}
var firstStomach = stomachs.FirstOrNull(
stomach => _stomachSystem.CanTransferSolution((stomach.Comp).Owner, drained));
var firstStomach = stomachs.FirstOrNull(stomach => _stomachSystem.CanTransferSolution(stomach.Comp.Owner, drained));
// All stomach are full or can't handle whatever solution we have.
//All stomachs are full or can't handle whatever solution we have.
if (firstStomach == null)
{
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"),
uid, uid);
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"), args.Args.Target.Value, args.Args.Target.Value);
if (forceDrink)
{
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"),
uid, args.User);
_spillableSystem.SpillAt(uid, drained, "PuddleSmear");
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Args.Target.Value, args.Args.User);
_spillableSystem.SpillAt(args.Args.Target.Value, drained, "PuddleSmear");
}
else
{
_solutionContainerSystem.TryAddSolution(args.Drink.Owner, args.DrinkSolution, drained);
}
_solutionContainerSystem.TryAddSolution(uid, args.AdditionalData.DrinkSolution, drained);
args.Handled = true;
return;
}
var flavors = args.FlavorMessage;
var flavors = args.AdditionalData.FlavorMessage;
if (forceDrink)
{
var targetName = Identity.Entity(uid, EntityManager);
var userName = Identity.Entity(args.User, EntityManager);
var targetName = Identity.Entity(args.Args.Target.Value, EntityManager);
var userName = Identity.Entity(args.Args.User, EntityManager);
_popupSystem.PopupEntity(
Loc.GetString("drink-component-force-feed-success", ("user", userName), ("flavors", flavors)), uid, uid);
_popupSystem.PopupEntity(Loc.GetString("drink-component-force-feed-success", ("user", userName), ("flavors", flavors)), args.Args.Target.Value, args.Args.Target.Value);
_popupSystem.PopupEntity(
Loc.GetString("drink-component-force-feed-success-user", ("target", targetName)),
args.User, args.User);
args.Args.User, args.Args.User);
// log successful forced drinking
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(args.User):user} forced {ToPrettyString(uid):target} to drink {ToPrettyString(args.Drink.Owner):drink}");
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(uid):user} forced {ToPrettyString(args.Args.User):target} to drink {ToPrettyString(component.Owner):drink}");
}
else
{
_popupSystem.PopupEntity(
Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User,
args.User);
Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.Args.User,
args.Args.User);
_popupSystem.PopupEntity(
Loc.GetString("drink-component-try-use-drink-success-slurp"), args.User, Filter.PvsExcept(args.User), true);
Loc.GetString("drink-component-try-use-drink-success-slurp"), args.Args.User, Filter.PvsExcept(args.Args.User), true);
// log successful voluntary drinking
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(args.Drink.Owner):drink}");
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.Args.User):target} drank {ToPrettyString(uid):drink}");
}
_audio.PlayPvs(_audio.GetSound(args.Drink.UseSound), uid, AudioParams.Default.WithVolume(-2f));
_audio.PlayPvs(_audio.GetSound(component.UseSound), args.Args.Target.Value, AudioParams.Default.WithVolume(-2f));
drained.DoEntityReaction(uid, ReactionMethod.Ingestion);
_reaction.DoEntityReaction(args.Args.Target.Value, args.AdditionalData.DrinkSolution, ReactionMethod.Ingestion);
//TODO: Grab the stomach UIDs somehow without using Owner
_stomachSystem.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp);
}
private static void OnDrinkCancelled(DrinkCancelledEvent args)
{
args.Drink.CancelToken = null;
args.Handled = true;
}
private void AddDrinkVerb(EntityUid uid, DrinkComponent component, GetVerbsEvent<AlternativeVerb> ev)
{
if (component.CancelToken != null)
return;
if (uid == ev.User ||
!ev.CanInteract ||
!ev.CanAccess ||
@@ -397,7 +385,7 @@ namespace Content.Server.Nutrition.EntitySystems
{
Act = () =>
{
TryDrink(ev.User, ev.User, component);
TryDrink(ev.User, ev.User, component, uid);
},
IconTexture = "/Textures/Interface/VerbIcons/drink.svg.192dpi.png",
Text = Loc.GetString("drink-system-verb-drink"),
@@ -418,5 +406,11 @@ namespace Content.Server.Nutrition.EntitySystems
return remainingString;
}
private record struct DrinkData(Solution DrinkSolution, string FlavorMessage)
{
public readonly Solution DrinkSolution = DrinkSolution;
public readonly string FlavorMessage = FlavorMessage;
}
}
}

159
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View File

@@ -1,4 +1,3 @@
using System.Threading;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Server.Chemistry.EntitySystems;
@@ -8,8 +7,11 @@ using Content.Server.Nutrition.Components;
using Content.Server.Popups;
using Content.Shared.Administration.Logs;
using Content.Shared.Body.Components;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Database;
using Content.Shared.DoAfter;
using Content.Shared.FixedPoint;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
@@ -42,6 +44,8 @@ namespace Content.Server.Nutrition.EntitySystems
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly ReactiveSystem _reaction = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
public override void Initialize()
{
@@ -50,8 +54,7 @@ namespace Content.Server.Nutrition.EntitySystems
SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand);
SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
SubscribeLocalEvent<FoodComponent, GetVerbsEvent<AlternativeVerb>>(AddEatVerb);
SubscribeLocalEvent<BodyComponent, FeedEvent>(OnFeed);
SubscribeLocalEvent<ForceFeedCancelledEvent>(OnFeedCancelled);
SubscribeLocalEvent<FoodComponent, DoAfterEvent<FoodData>>(OnDoAfter);
SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(OnInventoryIngestAttempt);
}
@@ -63,7 +66,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (ev.Handled)
return;
ev.Handled = TryFeed(ev.User, ev.User, foodComponent);
ev.Handled = TryFeed(ev.User, ev.User, uid, foodComponent);
}
/// <summary>
@@ -74,49 +77,41 @@ namespace Content.Server.Nutrition.EntitySystems
if (args.Handled || args.Target == null || !args.CanReach)
return;
args.Handled = TryFeed(args.User, args.Target.Value, foodComponent);
args.Handled = TryFeed(args.User, args.Target.Value, uid, foodComponent);
}
public bool TryFeed(EntityUid user, EntityUid target, FoodComponent food)
public bool TryFeed(EntityUid user, EntityUid target, EntityUid food, FoodComponent foodComp)
{
// if currently being used to feed, cancel that action.
if (food.CancelToken != null)
{
return true;
}
if (food.Owner == user || //Suppresses self-eating
EntityManager.TryGetComponent<MobStateComponent>(food.Owner, out var mobState) && _mobStateSystem.IsAlive(food.Owner, mobState)) // Suppresses eating alive mobs
//Suppresses self-eating
if (food == user || EntityManager.TryGetComponent<MobStateComponent>(food, out var mobState) && _mobStateSystem.IsAlive(food, mobState)) // Suppresses eating alive mobs
return false;
// Target can't be fed
if (!EntityManager.HasComponent<BodyComponent>(target))
return false;
if (!_solutionContainerSystem.TryGetSolution(food.Owner, food.SolutionName, out var foodSolution))
if (!_solutionContainerSystem.TryGetSolution(food, foodComp.SolutionName, out var foodSolution))
return false;
var flavors = _flavorProfileSystem.GetLocalizedFlavorsMessage(food.Owner, user, foodSolution);
var flavors = _flavorProfileSystem.GetLocalizedFlavorsMessage(food, user, foodSolution);
if (food.UsesRemaining <= 0)
if (foodComp.UsesRemaining <= 0)
{
_popupSystem.PopupEntity(Loc.GetString("food-system-try-use-food-is-empty",
("entity", food.Owner)), user, user);
DeleteAndSpawnTrash(food, user);
_popupSystem.PopupEntity(Loc.GetString("food-system-try-use-food-is-empty", ("entity", food)), user, user);
DeleteAndSpawnTrash(foodComp, food, user);
return false;
}
if (IsMouthBlocked(target, user))
return false;
if (!TryGetRequiredUtensils(user, food, out var utensils))
if (!TryGetRequiredUtensils(user, foodComp, out var utensils))
return false;
if (!_interactionSystem.InRangeUnobstructed(user, food.Owner, popup: true))
if (!_interactionSystem.InRangeUnobstructed(user, food, popup: true))
return true;
var forceFeed = user != target;
food.CancelToken = new CancellationTokenSource();
if (forceFeed)
{
@@ -125,17 +120,19 @@ namespace Content.Server.Nutrition.EntitySystems
user, target);
// logging
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food.Owner):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
}
else
{
// log voluntary eating
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food.Owner):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
}
var moveBreak = user != target;
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, forceFeed ? food.ForceFeedDelay : food.Delay, food.CancelToken.Token, target, food.Owner)
var foodData = new FoodData(foodSolution, flavors, utensils);
var doAfterEventArgs = new DoAfterEventArgs(user, forceFeed ? foodComp.ForceFeedDelay : foodComp.Delay, target: target, used: food)
{
BreakOnUserMove = moveBreak,
BreakOnDamage = true,
@@ -143,116 +140,114 @@ namespace Content.Server.Nutrition.EntitySystems
BreakOnTargetMove = moveBreak,
MovementThreshold = 0.01f,
DistanceThreshold = 1.0f,
TargetFinishedEvent = new FeedEvent(user, food, foodSolution, flavors, utensils),
BroadcastCancelledEvent = new ForceFeedCancelledEvent(food),
NeedHand = true,
});
NeedHand = true
};
_doAfterSystem.DoAfter(doAfterEventArgs, foodData);
return true;
}
private void OnFeed(EntityUid uid, BodyComponent body, FeedEvent args)
private void OnDoAfter(EntityUid uid, FoodComponent component, DoAfterEvent<FoodData> args)
{
if (args.Food.Deleted)
if (args.Cancelled || args.Handled || component.Deleted || args.Args.Target == null)
return;
args.Food.CancelToken = null;
if (!_bodySystem.TryGetBodyOrganComponents<StomachComponent>(uid, out var stomachs, body))
if (!TryComp<BodyComponent>(args.Args.Target.Value, out var body))
return;
var transferAmount = args.Food.TransferAmount != null
? FixedPoint2.Min((FixedPoint2) args.Food.TransferAmount, args.FoodSolution.Volume)
: args.FoodSolution.Volume;
if (!_bodySystem.TryGetBodyOrganComponents<StomachComponent>(args.Args.Target.Value, out var stomachs, body))
return;
var split = _solutionContainerSystem.SplitSolution((args.Food).Owner, args.FoodSolution, transferAmount);
var transferAmount = component.TransferAmount != null ? FixedPoint2.Min((FixedPoint2) component.TransferAmount, args.AdditionalData.FoodSolution.Volume) : args.AdditionalData.FoodSolution.Volume;
var split = _solutionContainerSystem.SplitSolution(uid, args.AdditionalData.FoodSolution, transferAmount);
//TODO: Get the stomach UID somehow without nabbing owner
var firstStomach = stomachs.FirstOrNull(stomach => _stomachSystem.CanTransferSolution(stomach.Comp.Owner, split));
var firstStomach = stomachs.FirstOrNull(
stomach => _stomachSystem.CanTransferSolution((stomach.Comp).Owner, split));
var forceFeed = uid != args.User;
var forceFeed = args.Args.Target.Value != args.Args.User;
// No stomach so just popup a message that they can't eat.
if (firstStomach == null)
{
_solutionContainerSystem.TryAddSolution(uid, args.FoodSolution, split);
_popupSystem.PopupEntity(
forceFeed ?
Loc.GetString("food-system-you-cannot-eat-any-more-other") :
Loc.GetString("food-system-you-cannot-eat-any-more")
, uid, args.User);
_solutionContainerSystem.TryAddSolution(uid, args.AdditionalData.FoodSolution, split);
_popupSystem.PopupEntity(forceFeed ? Loc.GetString("food-system-you-cannot-eat-any-more-other") : Loc.GetString("food-system-you-cannot-eat-any-more"), args.Args.Target.Value, args.Args.User);
args.Handled = true;
return;
}
split.DoEntityReaction(uid, ReactionMethod.Ingestion);
_reaction.DoEntityReaction(args.Args.Target.Value, args.AdditionalData.FoodSolution, ReactionMethod.Ingestion);
_stomachSystem.TryTransferSolution(firstStomach.Value.Comp.Owner, split, firstStomach.Value.Comp);
var flavors = args.FlavorMessage;
var flavors = args.AdditionalData.FlavorMessage;
if (forceFeed)
{
var targetName = Identity.Entity(uid, EntityManager);
var userName = Identity.Entity(args.User, EntityManager);
var targetName = Identity.Entity(args.Args.Target.Value, EntityManager);
var userName = Identity.Entity(args.Args.User, EntityManager);
_popupSystem.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName), ("flavors", flavors)),
uid, uid);
_popupSystem.PopupEntity(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)),
args.User, args.User);
_popupSystem.PopupEntity(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)), args.Args.User, args.Args.User);
// log successful force feed
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(args.User):user} forced {ToPrettyString(uid):target} to eat {ToPrettyString(args.Food.Owner):food}");
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(uid):user} forced {ToPrettyString(args.Args.User):target} to eat {ToPrettyString(uid):food}");
}
else
{
_popupSystem.PopupEntity(Loc.GetString(args.Food.EatMessage, ("food", args.Food.Owner), ("flavors", flavors)), args.User, args.User);
_popupSystem.PopupEntity(Loc.GetString(component.EatMessage, ("foodComp", uid), ("flavors", flavors)), args.Args.User, args.Args.User);
// log successful voluntary eating
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(args.Food.Owner):food}");
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.Args.User):target} ate {ToPrettyString(uid):food}");
}
SoundSystem.Play(args.Food.UseSound.GetSound(), Filter.Pvs(uid), uid, AudioParams.Default.WithVolume(-1f));
_audio.Play(component.UseSound, Filter.Pvs(args.Args.Target.Value), args.Args.Target.Value, true, AudioParams.Default.WithVolume(-1f));
// Try to break all used utensils
foreach (var utensil in args.Utensils)
//TODO: Replace utensil owner with actual UID
foreach (var utensil in args.AdditionalData.Utensils)
{
_utensilSystem.TryBreak((utensil).Owner, args.User);
_utensilSystem.TryBreak(utensil.Owner, args.Args.User);
}
if (args.Food.UsesRemaining > 0)
if (component.UsesRemaining > 0)
{
args.Handled = true;
return;
}
if (string.IsNullOrEmpty(component.TrashPrototype))
EntityManager.QueueDeleteEntity(uid);
if (string.IsNullOrEmpty(args.Food.TrashPrototype))
EntityManager.QueueDeleteEntity(args.Food.Owner);
else
DeleteAndSpawnTrash(args.Food, args.User);
DeleteAndSpawnTrash(component, uid, args.Args.User);
args.Handled = true;
}
private void DeleteAndSpawnTrash(FoodComponent component, EntityUid? user = null)
private void DeleteAndSpawnTrash(FoodComponent component, EntityUid food, EntityUid? user = null)
{
//We're empty. Become trash.
var position = Transform(component.Owner).MapPosition;
var position = Transform(food).MapPosition;
var finisher = EntityManager.SpawnEntity(component.TrashPrototype, position);
// If the user is holding the item
if (user != null && _handsSystem.IsHolding(user.Value, component.Owner, out var hand))
if (user != null && _handsSystem.IsHolding(user.Value, food, out var hand))
{
EntityManager.DeleteEntity((component).Owner);
EntityManager.DeleteEntity(food);
// Put the trash in the user's hand
_handsSystem.TryPickup(user.Value, finisher, hand);
return;
}
EntityManager.QueueDeleteEntity(component.Owner);
EntityManager.QueueDeleteEntity(food);
}
private void AddEatVerb(EntityUid uid, FoodComponent component, GetVerbsEvent<AlternativeVerb> ev)
{
if (component.CancelToken != null)
return;
if (uid == ev.User ||
!ev.CanInteract ||
!ev.CanAccess ||
@@ -267,7 +262,7 @@ namespace Content.Server.Nutrition.EntitySystems
{
Act = () =>
{
TryFeed(ev.User, ev.User, component);
TryFeed(ev.User, ev.User, uid, component);
},
IconTexture = "/Textures/Interface/VerbIcons/cutlery.svg.192dpi.png",
Text = Loc.GetString("food-system-verb-eat"),
@@ -296,7 +291,7 @@ namespace Content.Server.Nutrition.EntitySystems
return;
if (food.UsesRemaining <= 0)
DeleteAndSpawnTrash(food);
DeleteAndSpawnTrash(food, uid);
var firstStomach = stomachs.FirstOrNull(
stomach => _stomachSystem.CanTransferSolution(((IComponent) stomach.Comp).Owner, foodSolution));
@@ -320,7 +315,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (string.IsNullOrEmpty(food.TrashPrototype))
EntityManager.QueueDeleteEntity(food.Owner);
else
DeleteAndSpawnTrash(food);
DeleteAndSpawnTrash(food, uid);
}
private bool TryGetRequiredUtensils(EntityUid user, FoodComponent component,
@@ -361,11 +356,6 @@ namespace Content.Server.Nutrition.EntitySystems
return true;
}
private static void OnFeedCancelled(ForceFeedCancelledEvent args)
{
args.Food.CancelToken = null;
}
/// <summary>
/// Block ingestion attempts based on the equipped mask or head-wear
/// </summary>
@@ -415,5 +405,12 @@ namespace Content.Server.Nutrition.EntitySystems
return attempt.Cancelled;
}
private record struct FoodData(Solution FoodSolution, string FlavorMessage, List<UtensilComponent> Utensils)
{
public readonly Solution FoodSolution = FoodSolution;
public readonly string FlavorMessage = FlavorMessage;
public readonly List<UtensilComponent> Utensils = Utensils;
}
}
}

4
Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
View File

@@ -44,14 +44,14 @@ namespace Content.Server.Nutrition.EntitySystems
//Prevents food usage with a wrong utensil
if ((food.Utensil & component.Types) == 0)
{
_popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", food.Owner), ("utensil", component.Owner)), user, user);
_popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", component.Owner)), user, user);
return false;
}
if (!_interactionSystem.InRangeUnobstructed(user, target, popup: true))
return false;
return _foodSystem.TryFeed(user, user, food);
return _foodSystem.TryFeed(user, user, target, food);
}
/// <summary>