From 063f75ca2906fa4cfd2b2ff2056570d95a7a6d11 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:32:10 +0000 Subject: [PATCH] let animals drink things (#18236) * thirst .Owner removal * thirst file scope * drink update + minor refactor * drink file scope * let animals drink things * dont eat/drink when dont need to * admeme mouse override * moo --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Queries/Considerations/DrinkValueCon.cs | 6 + .../NPC/Systems/NPCUtilitySystem.cs | 33 +- .../Nutrition/Components/BadDrinkComponent.cs | 12 + .../Nutrition/EntitySystems/DrinkSystem.cs | 723 +++++++++--------- .../Nutrition/EntitySystems/ThirstSystem.cs | 283 +++---- .../Prototypes/Entities/Effects/puddle.yml | 197 ++--- Resources/Prototypes/NPCs/nutrition.yml | 24 +- Resources/Prototypes/NPCs/utility_queries.yml | 21 +- 8 files changed, 705 insertions(+), 594 deletions(-) create mode 100644 Content.Server/NPC/Queries/Considerations/DrinkValueCon.cs create mode 100644 Content.Server/Nutrition/Components/BadDrinkComponent.cs diff --git a/Content.Server/NPC/Queries/Considerations/DrinkValueCon.cs b/Content.Server/NPC/Queries/Considerations/DrinkValueCon.cs new file mode 100644 index 0000000000..1ab5b20438 --- /dev/null +++ b/Content.Server/NPC/Queries/Considerations/DrinkValueCon.cs @@ -0,0 +1,6 @@ +namespace Content.Server.NPC.Queries.Considerations; + +public sealed class DrinkValueCon : UtilityConsideration +{ + +} diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs index 35621bd3ed..535eba6a54 100644 --- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs +++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs @@ -12,6 +12,7 @@ using Content.Server.Storage.Components; using Content.Shared.Examine; using Content.Shared.Fluids.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.Nutrition.Components; using Robust.Server.Containers; using Robust.Shared.Collections; using Robust.Shared.Prototypes; @@ -23,12 +24,13 @@ namespace Content.Server.NPC.Systems; /// public sealed class NPCUtilitySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly ContainerSystem _container = default!; + [Dependency] private readonly DrinkSystem _drink = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; [Dependency] private readonly FoodSystem _food = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly NpcFactionSystem _npcFaction = default!; [Dependency] private readonly PuddleSystem _puddle = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SolutionContainerSystem _solutions = default!; @@ -132,13 +134,38 @@ public sealed class NPCUtilitySystem : EntitySystem if (!_food.IsDigestibleBy(owner, targetUid, food)) return 0f; - // no mouse don't eat the uranium-235 var avoidBadFood = !HasComp(owner); + + // only eat when hungry or if it will eat anything + if (TryComp(owner, out var hunger) && hunger.CurrentThreshold > HungerThreshold.Okay && avoidBadFood) + return 0f; + + // no mouse don't eat the uranium-235 if (avoidBadFood && HasComp(targetUid)) return 0f; return 1f; } + case DrinkValueCon: + { + if (!TryComp(targetUid, out var drink) || !drink.Opened) + return 0f; + + // only drink when thirsty + if (TryComp(owner, out var thirst) && thirst.CurrentThirstThreshold > ThirstThreshold.Okay) + return 0f; + + // no janicow don't drink the blood puddle + if (HasComp(targetUid)) + return 0f; + + // needs to have something that will satiate thirst, mice wont try to drink 100% pure mutagen. + var hydration = _drink.TotalHydration(targetUid, drink); + if (hydration <= 1.0f) + return 0f; + + return 1f; + } case TargetAccessibleCon: { if (_container.TryGetContainingContainer(targetUid, out var container)) diff --git a/Content.Server/Nutrition/Components/BadDrinkComponent.cs b/Content.Server/Nutrition/Components/BadDrinkComponent.cs new file mode 100644 index 0000000000..6512f44466 --- /dev/null +++ b/Content.Server/Nutrition/Components/BadDrinkComponent.cs @@ -0,0 +1,12 @@ +using Content.Server.Nutrition.EntitySystems; + +namespace Content.Server.Nutrition.Components; + +/// +/// This component prevents NPC mobs like mice or cows from wanting to drink something that shouldn't be drank from. +/// Including but not limited to: puddles +/// +[RegisterComponent, Access(typeof(DrinkSystem))] +public sealed class BadDrinkComponent : Component +{ +} diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 99e71f1f8d..36521568a1 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Chemistry.EntitySystems; +using Content.Server.Chemistry.ReagentEffects; using Content.Server.Fluids.EntitySystems; using Content.Server.Forensics; using Content.Server.Nutrition.Components; @@ -24,421 +25,453 @@ using Content.Shared.Nutrition; using Content.Shared.Nutrition.Components; using Content.Shared.Throwing; using Content.Shared.Verbs; -using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.Player; +using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Utility; -namespace Content.Server.Nutrition.EntitySystems +namespace Content.Server.Nutrition.EntitySystems; + +public sealed class DrinkSystem : EntitySystem { - [UsedImplicitly] - public sealed class DrinkSystem : EntitySystem + [Dependency] private readonly BodySystem _body = default!; + [Dependency] private readonly FoodSystem _food = default!; + [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly MobStateSystem _mobStateSystem = default!; + [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private readonly PuddleSystem _puddleSystem = default!; + [Dependency] private readonly ReactiveSystem _reaction = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly StomachSystem _stomach = default!; + + public override void Initialize() { - [Dependency] private readonly FoodSystem _foodSystem = default!; - [Dependency] private readonly FlavorProfileSystem _flavorProfileSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly BodySystem _bodySystem = default!; - [Dependency] private readonly StomachSystem _stomachSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly PuddleSystem _puddleSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ReactiveSystem _reaction = default!; + base.Initialize(); - public override void Initialize() + // TODO add InteractNoHandEvent for entities like mice. + SubscribeLocalEvent(OnSolutionChange); + SubscribeLocalEvent(OnDrinkInit); + SubscribeLocalEvent(HandleLand); + SubscribeLocalEvent(OnUse); + SubscribeLocalEvent(AfterInteract); + SubscribeLocalEvent>(AddDrinkVerb); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnTransferAttempt); + SubscribeLocalEvent(OnDoAfter); + } + + private FixedPoint2 DrinkVolume(EntityUid uid, DrinkComponent? component = null) + { + if (!Resolve(uid, ref component)) + return FixedPoint2.Zero; + + if (!_solutionContainer.TryGetSolution(uid, component.SolutionName, out var sol)) + return FixedPoint2.Zero; + + return sol.Volume; + } + + public bool IsEmpty(EntityUid uid, DrinkComponent? component = null) + { + if (!Resolve(uid, ref component)) + return true; + + return DrinkVolume(uid, component) <= 0; + } + + /// + /// Get the total hydration factor contained in a drink's solution. + /// + public float TotalHydration(EntityUid uid, DrinkComponent? comp = null) + { + if (!Resolve(uid, ref comp)) + return 0f; + + if (!_solutionContainer.TryGetSolution(uid, comp.SolutionName, out var solution)) + return 0f; + + var total = 0f; + foreach (var quantity in solution.Contents) { - base.Initialize(); + var reagent = _proto.Index(quantity.ReagentId); + if (reagent.Metabolisms == null) + continue; - // TODO add InteractNoHandEvent for entities like mice. - SubscribeLocalEvent(OnSolutionChange); - SubscribeLocalEvent(OnDrinkInit); - SubscribeLocalEvent(HandleLand); - SubscribeLocalEvent(OnUse); - SubscribeLocalEvent(AfterInteract); - SubscribeLocalEvent>(AddDrinkVerb); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnTransferAttempt); - SubscribeLocalEvent(OnDoAfter); - } - - private FixedPoint2 DrinkVolume(EntityUid uid, DrinkComponent? component = null) - { - if(!Resolve(uid, ref component)) - return FixedPoint2.Zero; - - if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var sol)) - return FixedPoint2.Zero; - - return sol.Volume; - } - - public bool IsEmpty(EntityUid uid, DrinkComponent? component = null) - { - if(!Resolve(uid, ref component)) - return true; - - return DrinkVolume(uid, component) <= 0; - } - - private void OnExamined(EntityUid uid, DrinkComponent component, ExaminedEvent args) - { - if (!component.Opened || !args.IsInDetailsRange || !component.Examinable) - return; - - var color = IsEmpty(uid, component) ? "gray" : "yellow"; - var openedText = - Loc.GetString(IsEmpty(uid, component) ? "drink-component-on-examine-is-empty" : "drink-component-on-examine-is-opened"); - args.Message.AddMarkup($"\n{Loc.GetString("drink-component-on-examine-details-text", ("colorName", color), ("text", openedText))}"); - if (!IsEmpty(uid, component)) + foreach ((var _, var entry) in reagent.Metabolisms) { - if (TryComp(uid, out var comp)) + foreach (var effect in entry.Effects) { - //provide exact measurement for beakers - args.Message.AddMarkup($" - {Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(uid, component)))}"); - } - else - { - //general approximation - var remainingString = (int) _solutionContainerSystem.PercentFull(uid) switch + // ignores any effect conditions, just cares about how much it can hydrate + if (effect is SatiateThirst thirst) { - 100 => "drink-component-on-examine-is-full", - > 66 => "drink-component-on-examine-is-mostly-full", - > 33 => HalfEmptyOrHalfFull(args), - _ => "drink-component-on-examine-is-mostly-empty", - }; - args.Message.AddMarkup($" - {Loc.GetString(remainingString)}"); + total += thirst.HydrationFactor * quantity.Quantity.Float(); + } } } } - private void SetOpen(EntityUid uid, bool opened = false, DrinkComponent? component = null) + return total; + } + + private void OnExamined(EntityUid uid, DrinkComponent component, ExaminedEvent args) + { + if (!component.Opened || !args.IsInDetailsRange || !component.Examinable) + return; + + var color = IsEmpty(uid, component) ? "gray" : "yellow"; + var openedText = + Loc.GetString(IsEmpty(uid, component) ? "drink-component-on-examine-is-empty" : "drink-component-on-examine-is-opened"); + args.Message.AddMarkup($"\n{Loc.GetString("drink-component-on-examine-details-text", ("colorName", color), ("text", openedText))}"); + if (!IsEmpty(uid, component)) { - if(!Resolve(uid, ref component)) - return; - - if (opened == component.Opened) - return; - - component.Opened = opened; - - if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out _)) - return; - - if (EntityManager.TryGetComponent(uid, out var appearance)) + if (TryComp(uid, out var comp)) { - _appearanceSystem.SetData(uid, DrinkCanStateVisual.Opened, opened, appearance); - } - } - - private void AfterInteract(EntityUid uid, DrinkComponent component, AfterInteractEvent args) - { - if (args.Handled || args.Target == null || !args.CanReach) - return; - - args.Handled = TryDrink(args.User, args.Target.Value, component, uid); - } - - private void OnUse(EntityUid uid, DrinkComponent component, UseInHandEvent args) - { - if (args.Handled) - return; - - if (!component.Opened) - { - //Do the opening stuff like playing the sounds. - _audio.PlayPvs(_audio.GetSound(component.OpenSounds), args.User); - - SetOpen(uid, true, component); - return; - } - - args.Handled = TryDrink(args.User, args.User, component, uid); - } - - private void HandleLand(EntityUid uid, DrinkComponent component, ref LandEvent args) - { - if (component.Pressurized && - !component.Opened && - _random.Prob(0.25f) && - _solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var interactions)) - { - component.Opened = true; - UpdateAppearance(component); - - var solution = _solutionContainerSystem.SplitSolution(uid, interactions, interactions.Volume); - _puddleSystem.TrySpillAt(uid, solution, out _); - - _audio.PlayPvs(_audio.GetSound(component.BurstSound), uid, AudioParams.Default.WithVolume(-4)); - } - } - - private void OnDrinkInit(EntityUid uid, DrinkComponent component, ComponentInit args) - { - SetOpen(uid, component.DefaultToOpened, component); - - if (EntityManager.TryGetComponent(uid, out DrainableSolutionComponent? existingDrainable)) - { - // Beakers have Drink component but they should use the existing Drainable - component.SolutionName = existingDrainable.Solution; + //provide exact measurement for beakers + args.Message.AddMarkup($" - {Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(uid, component)))}"); } else { - _solutionContainerSystem.EnsureSolution(uid, component.SolutionName); - } - - UpdateAppearance(component); - - if (TryComp(uid, out RefillableSolutionComponent? refillComp)) - refillComp.Solution = component.SolutionName; - - if (TryComp(uid, out DrainableSolutionComponent? drainComp)) - drainComp.Solution = component.SolutionName; - } - - private void OnSolutionChange(EntityUid uid, DrinkComponent component, SolutionChangedEvent args) - { - UpdateAppearance(component); - } - - public void UpdateAppearance(DrinkComponent component) - { - if (!EntityManager.TryGetComponent((component).Owner, out AppearanceComponent? appearance) || - !EntityManager.HasComponent((component).Owner)) - { - return; - } - - var drainAvailable = DrinkVolume((component.Owner), component); - _appearanceSystem.SetData(component.Owner, FoodVisuals.Visual, drainAvailable.Float(), appearance); - _appearanceSystem.SetData(component.Owner, DrinkCanStateVisual.Opened, component.Opened, appearance); - } - - private void OnTransferAttempt(EntityUid uid, DrinkComponent component, SolutionTransferAttemptEvent args) - { - if (!component.Opened) - { - args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", - ("owner", EntityManager.GetComponent(component.Owner).EntityName))); + //general approximation + var remainingString = (int) _solutionContainer.PercentFull(uid) switch + { + 100 => "drink-component-on-examine-is-full", + > 66 => "drink-component-on-examine-is-mostly-full", + > 33 => HalfEmptyOrHalfFull(args), + _ => "drink-component-on-examine-is-mostly-empty", + }; + args.Message.AddMarkup($" - {Loc.GetString(remainingString)}"); } } + } - private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item) + private void SetOpen(EntityUid uid, bool opened = false, DrinkComponent? component = null) + { + if(!Resolve(uid, ref component)) + return; + + if (opened == component.Opened) + return; + + component.Opened = opened; + + if (!_solutionContainer.TryGetSolution(uid, component.SolutionName, out _)) + return; + + if (EntityManager.TryGetComponent(uid, out var appearance)) { - if (!EntityManager.HasComponent(target)) - return false; + _appearance.SetData(uid, DrinkCanStateVisual.Opened, opened, appearance); + } + } - if (!drink.Opened) - { - _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-not-open", - ("owner", EntityManager.GetComponent(item).EntityName)), item, user); - return true; - } + private void AfterInteract(EntityUid uid, DrinkComponent component, AfterInteractEvent args) + { + if (args.Handled || args.Target == null || !args.CanReach) + return; - if (!_solutionContainerSystem.TryGetSolution(item, drink.SolutionName, out var drinkSolution) || - drinkSolution.Volume <= 0) - { - _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty", - ("entity", EntityManager.GetComponent(item).EntityName)), item, user); - return true; - } + args.Handled = TryDrink(args.User, args.Target.Value, component, uid); + } - if (drinkSolution.Name == null) - return false; + private void OnUse(EntityUid uid, DrinkComponent component, UseInHandEvent args) + { + if (args.Handled) + return; - if (_foodSystem.IsMouthBlocked(target, user)) - return true; + if (!component.Opened) + { + //Do the opening stuff like playing the sounds. + _audio.PlayPvs(_audio.GetSound(component.OpenSounds), args.User); - if (!_interactionSystem.InRangeUnobstructed(user, item, popup: true)) - return true; + SetOpen(uid, true, component); + return; + } - var forceDrink = user != target; + args.Handled = TryDrink(args.User, args.User, component, uid); + } - if (forceDrink) - { - var userName = Identity.Entity(user, EntityManager); + private void HandleLand(EntityUid uid, DrinkComponent component, ref LandEvent args) + { + if (component.Pressurized && + !component.Opened && + _random.Prob(0.25f) && + _solutionContainer.TryGetSolution(uid, component.SolutionName, out var interactions)) + { + component.Opened = true; + UpdateAppearance(uid, component); - _popupSystem.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)), - user, target); + var solution = _solutionContainer.SplitSolution(uid, interactions, interactions.Volume); + _puddleSystem.TrySpillAt(uid, solution, out _); - // logging - _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(item):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}"); - } + _audio.PlayPvs(_audio.GetSound(component.BurstSound), uid, AudioParams.Default.WithVolume(-4)); + } + } - var flavors = _flavorProfileSystem.GetLocalizedFlavorsMessage(user, drinkSolution); + private void OnDrinkInit(EntityUid uid, DrinkComponent component, ComponentInit args) + { + SetOpen(uid, component.DefaultToOpened, component); - var doAfterEventArgs = new DoAfterArgs( - user, - forceDrink ? drink.ForceFeedDelay : drink.Delay, - new ConsumeDoAfterEvent(drinkSolution.Name, flavors), - eventTarget: item, - target: target, - used: item) - { - BreakOnUserMove = forceDrink, - BreakOnDamage = true, - BreakOnTargetMove = forceDrink, - MovementThreshold = 0.01f, - DistanceThreshold = 1.0f, - // Mice and the like can eat without hands. - // TODO maybe set this based on some CanEatWithoutHands event or component? - NeedHand = forceDrink, - }; + if (EntityManager.TryGetComponent(uid, out DrainableSolutionComponent? existingDrainable)) + { + // Beakers have Drink component but they should use the existing Drainable + component.SolutionName = existingDrainable.Solution; + } + else + { + _solutionContainer.EnsureSolution(uid, component.SolutionName); + } - _doAfterSystem.TryStartDoAfter(doAfterEventArgs); + UpdateAppearance(uid, component); + + if (TryComp(uid, out RefillableSolutionComponent? refillComp)) + refillComp.Solution = component.SolutionName; + + if (TryComp(uid, out DrainableSolutionComponent? drainComp)) + drainComp.Solution = component.SolutionName; + } + + private void OnSolutionChange(EntityUid uid, DrinkComponent component, SolutionChangedEvent args) + { + UpdateAppearance(uid, component); + } + + public void UpdateAppearance(EntityUid uid, DrinkComponent component) + { + if (!TryComp(uid, out var appearance) || + !HasComp(uid)) + { + return; + } + + var drainAvailable = DrinkVolume(uid, component); + _appearance.SetData(uid, FoodVisuals.Visual, drainAvailable.Float(), appearance); + _appearance.SetData(uid, DrinkCanStateVisual.Opened, component.Opened, appearance); + } + + private void OnTransferAttempt(EntityUid uid, DrinkComponent component, SolutionTransferAttemptEvent args) + { + if (!component.Opened) + { + args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", uid))); + } + } + + private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item) + { + if (!EntityManager.HasComponent(target)) + return false; + + if (!drink.Opened) + { + _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-not-open", + ("owner", EntityManager.GetComponent(item).EntityName)), item, user); return true; } - /// - /// Raised directed at a victim when someone has force fed them a drink. - /// - private void OnDoAfter(EntityUid uid, DrinkComponent component, ConsumeDoAfterEvent args) + if (!_solutionContainer.TryGetSolution(item, drink.SolutionName, out var drinkSolution) || + drinkSolution.Volume <= 0) { - if (args.Handled || args.Cancelled || component.Deleted) - return; + _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty", + ("entity", EntityManager.GetComponent(item).EntityName)), item, user); + return true; + } - if (!TryComp(args.Target, out var body)) - return; + if (drinkSolution.Name == null) + return false; - if (!_solutionContainerSystem.TryGetSolution(args.Used, args.Solution, out var solution)) - return; + if (_food.IsMouthBlocked(target, user)) + return true; - // TODO this should really be checked every tick. - if (_foodSystem.IsMouthBlocked(args.Target.Value)) - return; + if (!_interaction.InRangeUnobstructed(user, item, popup: true)) + return true; - // TODO this should really be checked every tick. - if (!_interactionSystem.InRangeUnobstructed(args.User, args.Target.Value)) - return; + var forceDrink = user != target; - var transferAmount = FixedPoint2.Min(component.TransferAmount, solution.Volume); - var drained = _solutionContainerSystem.SplitSolution(uid, solution, transferAmount); - var forceDrink = args.User != args.Target; + if (forceDrink) + { + var userName = Identity.Entity(user, EntityManager); - args.Handled = true; - if (transferAmount <= 0) - return; + _popup.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)), + user, target); - if (!_bodySystem.TryGetBodyOrganComponents(args.Target.Value, out var stomachs, body)) + // logging + _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(item):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}"); + } + + var flavors = _flavorProfile.GetLocalizedFlavorsMessage(user, drinkSolution); + + var doAfterEventArgs = new DoAfterArgs( + user, + forceDrink ? drink.ForceFeedDelay : drink.Delay, + new ConsumeDoAfterEvent(drinkSolution.Name, flavors), + eventTarget: item, + target: target, + used: item) + { + BreakOnUserMove = forceDrink, + BreakOnDamage = true, + BreakOnTargetMove = forceDrink, + MovementThreshold = 0.01f, + DistanceThreshold = 1.0f, + // Mice and the like can eat without hands. + // TODO maybe set this based on some CanEatWithoutHands event or component? + NeedHand = forceDrink, + }; + + _doAfter.TryStartDoAfter(doAfterEventArgs); + return true; + } + + /// + /// Raised directed at a victim when someone has force fed them a drink. + /// + private void OnDoAfter(EntityUid uid, DrinkComponent component, ConsumeDoAfterEvent args) + { + if (args.Handled || args.Cancelled || component.Deleted) + return; + + if (!TryComp(args.Target, out var body)) + return; + + if (!_solutionContainer.TryGetSolution(args.Used, args.Solution, out var solution)) + return; + + // TODO this should really be checked every tick. + if (_food.IsMouthBlocked(args.Target.Value)) + return; + + // TODO this should really be checked every tick. + if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value)) + return; + + var transferAmount = FixedPoint2.Min(component.TransferAmount, solution.Volume); + var drained = _solutionContainer.SplitSolution(uid, solution, transferAmount); + var forceDrink = args.User != args.Target; + + args.Handled = true; + if (transferAmount <= 0) + return; + + if (!_body.TryGetBodyOrganComponents(args.Target.Value, out var stomachs, body)) + { + _popup.PopupEntity(forceDrink ? Loc.GetString("drink-component-try-use-drink-cannot-drink-other") : Loc.GetString("drink-component-try-use-drink-had-enough"), args.Target.Value, args.User); + + if (HasComp(args.Target.Value)) { - _popupSystem.PopupEntity(forceDrink ? Loc.GetString("drink-component-try-use-drink-cannot-drink-other") : Loc.GetString("drink-component-try-use-drink-had-enough"), args.Target.Value, args.User); - - if (HasComp(args.Target.Value)) - { - _puddleSystem.TrySpillAt(args.User, drained, out _); - return; - } - - _solutionContainerSystem.Refill(args.Target.Value, solution, drained); + _puddleSystem.TrySpillAt(args.User, drained, out _); return; } - var firstStomach = stomachs.FirstOrNull(stomach => _stomachSystem.CanTransferSolution(stomach.Comp.Owner, drained)); + _solutionContainer.Refill(args.Target.Value, solution, drained); + return; + } - //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"), args.Target.Value, args.Target.Value); + var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Comp.Owner, drained)); - if (forceDrink) - { - _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Target.Value, args.User); - _puddleSystem.TrySpillAt(args.Target.Value, drained, out _); - } - else - _solutionContainerSystem.TryAddSolution(uid, solution, drained); - - return; - } - - var flavors = args.FlavorMessage; + //All stomachs are full or can't handle whatever solution we have. + if (firstStomach == null) + { + _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"), args.Target.Value, args.Target.Value); if (forceDrink) { - var targetName = Identity.Entity(args.Target.Value, EntityManager); - var userName = Identity.Entity(args.User, EntityManager); - - _popupSystem.PopupEntity(Loc.GetString("drink-component-force-feed-success", ("user", userName), ("flavors", flavors)), args.Target.Value, args.Target.Value); - - _popupSystem.PopupEntity( - Loc.GetString("drink-component-force-feed-success-user", ("target", targetName)), - args.User, args.User); - - // log successful forced drinking - _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(uid):user} forced {ToPrettyString(args.User):target} to drink {ToPrettyString(component.Owner):drink}"); + _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Target.Value, args.User); + _puddleSystem.TrySpillAt(args.Target.Value, drained, out _); } else - { - _popupSystem.PopupEntity( - Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User, - args.User); - _popupSystem.PopupEntity( - Loc.GetString("drink-component-try-use-drink-success-slurp"), args.User, Filter.PvsExcept(args.User), true); + _solutionContainer.TryAddSolution(uid, solution, drained); - // log successful voluntary drinking - _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(uid):drink}"); - } - - _audio.PlayPvs(_audio.GetSound(component.UseSound), args.Target.Value, AudioParams.Default.WithVolume(-2f)); - - _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); - //TODO: Grab the stomach UIDs somehow without using Owner - _stomachSystem.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp); - - var comp = EnsureComp(uid); - if (TryComp(args.Target, out var dna)) - comp.DNAs.Add(dna.DNA); - - if (!forceDrink && solution.Volume > 0) - args.Repeat = true; + return; } - private void AddDrinkVerb(EntityUid uid, DrinkComponent component, GetVerbsEvent ev) + var flavors = args.FlavorMessage; + + if (forceDrink) { - if (uid == ev.User || - !ev.CanInteract || - !ev.CanAccess || - !EntityManager.TryGetComponent(ev.User, out BodyComponent? body) || - !_bodySystem.TryGetBodyOrganComponents(ev.User, out var stomachs, body)) - return; + var targetName = Identity.Entity(args.Target.Value, EntityManager); + var userName = Identity.Entity(args.User, EntityManager); - if (EntityManager.TryGetComponent(uid, out var mobState) && _mobStateSystem.IsAlive(uid, mobState)) - return; + _popup.PopupEntity(Loc.GetString("drink-component-force-feed-success", ("user", userName), ("flavors", flavors)), args.Target.Value, args.Target.Value); - AlternativeVerb verb = new() - { - Act = () => - { - TryDrink(ev.User, ev.User, component, uid); - }, - Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/drink.svg.192dpi.png")), - Text = Loc.GetString("drink-system-verb-drink"), - Priority = 2 - }; + _popup.PopupEntity( + Loc.GetString("drink-component-force-feed-success-user", ("target", targetName)), + args.User, args.User); - ev.Verbs.Add(verb); + // log successful forced drinking + _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(uid):user} forced {ToPrettyString(args.User):target} to drink {ToPrettyString(uid):drink}"); } - - // some see half empty, and others see half full - private string HalfEmptyOrHalfFull(ExaminedEvent args) + else { - string remainingString = "drink-component-on-examine-is-half-full"; + _popup.PopupEntity( + Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User, + args.User); + _popup.PopupEntity( + Loc.GetString("drink-component-try-use-drink-success-slurp"), args.User, Filter.PvsExcept(args.User), true); - if (TryComp(args.Examiner, out var examiner) && examiner.EntityName.Length > 0 - && string.Compare(examiner.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0) - remainingString = "drink-component-on-examine-is-half-empty"; - - return remainingString; + // log successful voluntary drinking + _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(uid):drink}"); } + + _audio.PlayPvs(_audio.GetSound(component.UseSound), args.Target.Value, AudioParams.Default.WithVolume(-2f)); + + _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); + //TODO: Grab the stomach UIDs somehow without using Owner + _stomach.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp); + + var comp = EnsureComp(uid); + if (TryComp(args.Target, out var dna)) + comp.DNAs.Add(dna.DNA); + + if (!forceDrink && solution.Volume > 0) + args.Repeat = true; + } + + private void AddDrinkVerb(EntityUid uid, DrinkComponent component, GetVerbsEvent ev) + { + if (uid == ev.User || + !ev.CanInteract || + !ev.CanAccess || + !EntityManager.TryGetComponent(ev.User, out BodyComponent? body) || + !_body.TryGetBodyOrganComponents(ev.User, out var stomachs, body)) + return; + + if (EntityManager.TryGetComponent(uid, out var mobState) && _mobStateSystem.IsAlive(uid, mobState)) + return; + + AlternativeVerb verb = new() + { + Act = () => + { + TryDrink(ev.User, ev.User, component, uid); + }, + Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/drink.svg.192dpi.png")), + Text = Loc.GetString("drink-system-verb-drink"), + Priority = 2 + }; + + ev.Verbs.Add(verb); + } + + // some see half empty, and others see half full + private string HalfEmptyOrHalfFull(ExaminedEvent args) + { + string remainingString = "drink-component-on-examine-is-half-full"; + + if (TryComp(args.Examiner, out var examiner) && examiner.EntityName.Length > 0 + && string.Compare(examiner.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0) + remainingString = "drink-component-on-examine-is-half-empty"; + + return remainingString; } } diff --git a/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs index ab966e3e90..2e9c1134a2 100644 --- a/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs @@ -6,167 +6,170 @@ using Content.Shared.Alert; using Content.Shared.Movement.Systems; using Content.Shared.Rejuvenate; -namespace Content.Server.Nutrition.EntitySystems +namespace Content.Server.Nutrition.EntitySystems; + +[UsedImplicitly] +public sealed class ThirstSystem : EntitySystem { - [UsedImplicitly] - public sealed class ThirstSystem : EntitySystem + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; + [Dependency] private readonly SharedJetpackSystem _jetpack = default!; + + private ISawmill _sawmill = default!; + private float _accumulatedFrameTime; + + public override void Initialize() { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; - [Dependency] private readonly SharedJetpackSystem _jetpack = default!; + base.Initialize(); - private ISawmill _sawmill = default!; - private float _accumulatedFrameTime; + _sawmill = Logger.GetSawmill("thirst"); - public override void Initialize() + SubscribeLocalEvent(OnRefreshMovespeed); + SubscribeLocalEvent(OnComponentStartup); + SubscribeLocalEvent(OnRejuvenate); + } + + private void OnComponentStartup(EntityUid uid, ThirstComponent component, ComponentStartup args) + { + // Do not change behavior unless starting value is explicitly defined + if (component.CurrentThirst < 0) { - base.Initialize(); - - _sawmill = Logger.GetSawmill("thirst"); - SubscribeLocalEvent(OnRefreshMovespeed); - SubscribeLocalEvent(OnComponentStartup); - SubscribeLocalEvent(OnRejuvenate); + component.CurrentThirst = _random.Next( + (int) component.ThirstThresholds[ThirstThreshold.Thirsty] + 10, + (int) component.ThirstThresholds[ThirstThreshold.Okay] - 1); } - private void OnComponentStartup(EntityUid uid, ThirstComponent component, ComponentStartup args) + component.CurrentThirstThreshold = GetThirstThreshold(component, component.CurrentThirst); + component.LastThirstThreshold = ThirstThreshold.Okay; // TODO: Potentially change this -> Used Okay because no effects. + // TODO: Check all thresholds make sense and throw if they don't. + UpdateEffects(uid, component); + } + + private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args) + { + // TODO: This should really be taken care of somewhere else + if (_jetpack.IsUserFlying(uid)) + return; + + var mod = component.CurrentThirstThreshold <= ThirstThreshold.Parched ? 0.75f : 1.0f; + args.ModifySpeed(mod, mod); + } + + private void OnRejuvenate(EntityUid uid, ThirstComponent component, RejuvenateEvent args) + { + ResetThirst(component); + } + + private ThirstThreshold GetThirstThreshold(ThirstComponent component, float amount) + { + ThirstThreshold result = ThirstThreshold.Dead; + var value = component.ThirstThresholds[ThirstThreshold.OverHydrated]; + foreach (var threshold in component.ThirstThresholds) { - // Do not change behavior unless starting value is explicitly defined - if (component.CurrentThirst < 0) + if (threshold.Value <= value && threshold.Value >= amount) { - component.CurrentThirst = _random.Next( - (int) component.ThirstThresholds[ThirstThreshold.Thirsty] + 10, - (int) component.ThirstThresholds[ThirstThreshold.Okay] - 1); + result = threshold.Key; + value = threshold.Value; } - component.CurrentThirstThreshold = GetThirstThreshold(component, component.CurrentThirst); - component.LastThirstThreshold = ThirstThreshold.Okay; // TODO: Potentially change this -> Used Okay because no effects. - // TODO: Check all thresholds make sense and throw if they don't. - UpdateEffects(component); } - private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args) + return result; + } + + public void UpdateThirst(ThirstComponent component, float amount) + { + component.CurrentThirst = Math.Clamp(component.CurrentThirst + amount, component.ThirstThresholds[ThirstThreshold.Dead], component.ThirstThresholds[ThirstThreshold.OverHydrated]); + } + + public void ResetThirst(ThirstComponent component) + { + component.CurrentThirst = component.ThirstThresholds[ThirstThreshold.Okay]; + } + + private bool IsMovementThreshold(ThirstThreshold threshold) + { + switch (threshold) { - // TODO: This should really be taken care of somewhere else - if (_jetpack.IsUserFlying(component.Owner)) + case ThirstThreshold.Dead: + case ThirstThreshold.Parched: + return true; + case ThirstThreshold.Thirsty: + case ThirstThreshold.Okay: + case ThirstThreshold.OverHydrated: + return false; + default: + throw new ArgumentOutOfRangeException(nameof(threshold), threshold, null); + } + } + + private void UpdateEffects(EntityUid uid, ThirstComponent component) + { + if (IsMovementThreshold(component.LastThirstThreshold) != IsMovementThreshold(component.CurrentThirstThreshold) && + TryComp(uid, out MovementSpeedModifierComponent? movementSlowdownComponent)) + { + _movement.RefreshMovementSpeedModifiers(uid, movementSlowdownComponent); + } + + // Update UI + if (ThirstComponent.ThirstThresholdAlertTypes.TryGetValue(component.CurrentThirstThreshold, out var alertId)) + { + _alerts.ShowAlert(uid, alertId); + } + else + { + _alerts.ClearAlertCategory(uid, AlertCategory.Thirst); + } + + switch (component.CurrentThirstThreshold) + { + case ThirstThreshold.OverHydrated: + component.LastThirstThreshold = component.CurrentThirstThreshold; + component.ActualDecayRate = component.BaseDecayRate * 1.2f; return; - var mod = component.CurrentThirstThreshold <= ThirstThreshold.Parched ? 0.75f : 1.0f; - args.ModifySpeed(mod, mod); - } + case ThirstThreshold.Okay: + component.LastThirstThreshold = component.CurrentThirstThreshold; + component.ActualDecayRate = component.BaseDecayRate; + return; - private void OnRejuvenate(EntityUid uid, ThirstComponent component, RejuvenateEvent args) - { - ResetThirst(component); - } + case ThirstThreshold.Thirsty: + // Same as okay except with UI icon saying drink soon. + component.LastThirstThreshold = component.CurrentThirstThreshold; + component.ActualDecayRate = component.BaseDecayRate * 0.8f; + return; + case ThirstThreshold.Parched: + _movement.RefreshMovementSpeedModifiers(uid); + component.LastThirstThreshold = component.CurrentThirstThreshold; + component.ActualDecayRate = component.BaseDecayRate * 0.6f; + return; - private ThirstThreshold GetThirstThreshold(ThirstComponent component, float amount) + case ThirstThreshold.Dead: + return; + + default: + _sawmill.Error($"No thirst threshold found for {component.CurrentThirstThreshold}"); + throw new ArgumentOutOfRangeException($"No thirst threshold found for {component.CurrentThirstThreshold}"); + } + } + + public override void Update(float frameTime) + { + _accumulatedFrameTime += frameTime; + + if (_accumulatedFrameTime > 1) { - ThirstThreshold result = ThirstThreshold.Dead; - var value = component.ThirstThresholds[ThirstThreshold.OverHydrated]; - foreach (var threshold in component.ThirstThresholds) + var query = EntityManager.EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var comp)) { - if (threshold.Value <= value && threshold.Value >= amount) + UpdateThirst(comp, - comp.ActualDecayRate); + var calculatedThirstThreshold = GetThirstThreshold(comp, comp.CurrentThirst); + if (calculatedThirstThreshold != comp.CurrentThirstThreshold) { - result = threshold.Key; - value = threshold.Value; + comp.CurrentThirstThreshold = calculatedThirstThreshold; + UpdateEffects(uid, comp); } } - - return result; - } - - public void UpdateThirst(ThirstComponent component, float amount) - { - component.CurrentThirst = Math.Clamp(component.CurrentThirst + amount, component.ThirstThresholds[ThirstThreshold.Dead], component.ThirstThresholds[ThirstThreshold.OverHydrated]); - } - - public void ResetThirst(ThirstComponent component) - { - component.CurrentThirst = component.ThirstThresholds[ThirstThreshold.Okay]; - } - - private bool IsMovementThreshold(ThirstThreshold threshold) - { - switch (threshold) - { - case ThirstThreshold.Dead: - case ThirstThreshold.Parched: - return true; - case ThirstThreshold.Thirsty: - case ThirstThreshold.Okay: - case ThirstThreshold.OverHydrated: - return false; - default: - throw new ArgumentOutOfRangeException(nameof(threshold), threshold, null); - } - } - - private void UpdateEffects(ThirstComponent component) - { - if (IsMovementThreshold(component.LastThirstThreshold) != IsMovementThreshold(component.CurrentThirstThreshold) && - TryComp(component.Owner, out MovementSpeedModifierComponent? movementSlowdownComponent)) - { - _movement.RefreshMovementSpeedModifiers(component.Owner, movementSlowdownComponent); - } - - // Update UI - if (ThirstComponent.ThirstThresholdAlertTypes.TryGetValue(component.CurrentThirstThreshold, out var alertId)) - { - _alerts.ShowAlert(component.Owner, alertId); - } - else - { - _alerts.ClearAlertCategory(component.Owner, AlertCategory.Thirst); - } - - switch (component.CurrentThirstThreshold) - { - case ThirstThreshold.OverHydrated: - component.LastThirstThreshold = component.CurrentThirstThreshold; - component.ActualDecayRate = component.BaseDecayRate * 1.2f; - return; - - case ThirstThreshold.Okay: - component.LastThirstThreshold = component.CurrentThirstThreshold; - component.ActualDecayRate = component.BaseDecayRate; - return; - - case ThirstThreshold.Thirsty: - // Same as okay except with UI icon saying drink soon. - component.LastThirstThreshold = component.CurrentThirstThreshold; - component.ActualDecayRate = component.BaseDecayRate * 0.8f; - return; - case ThirstThreshold.Parched: - _movement.RefreshMovementSpeedModifiers(component.Owner); - component.LastThirstThreshold = component.CurrentThirstThreshold; - component.ActualDecayRate = component.BaseDecayRate * 0.6f; - return; - - case ThirstThreshold.Dead: - return; - - default: - _sawmill.Error($"No thirst threshold found for {component.CurrentThirstThreshold}"); - throw new ArgumentOutOfRangeException($"No thirst threshold found for {component.CurrentThirstThreshold}"); - } - } - public override void Update(float frameTime) - { - _accumulatedFrameTime += frameTime; - - if (_accumulatedFrameTime > 1) - { - foreach (var component in EntityManager.EntityQuery()) - { - UpdateThirst(component, - component.ActualDecayRate); - var calculatedThirstThreshold = GetThirstThreshold(component, component.CurrentThirst); - if (calculatedThirstThreshold != component.CurrentThirstThreshold) - { - component.CurrentThirstThreshold = calculatedThirstThreshold; - UpdateEffects(component); - } - } - _accumulatedFrameTime -= 1; - } + _accumulatedFrameTime -= 1; } } } diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index bf2b56067e..884b4add36 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -4,9 +4,9 @@ parent: Puddle abstract: true components: - - type: Transform - anchored: true - noRot: false + - type: Transform + anchored: true + noRot: false - type: entity id: PuddleSmear @@ -16,67 +16,67 @@ id: PuddleVomit parent: PuddleTemporary components: - - type: SolutionContainerManager - solutions: - puddle: - maxVol: 1000 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Water - Quantity: 5 + - type: SolutionContainerManager + solutions: + puddle: + maxVol: 1000 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Water + Quantity: 5 - type: entity id: PuddleEgg parent: PuddleTemporary components: - - type: SolutionContainerManager - solutions: - puddle: - maxVol: 1000 - reagents: - - ReagentId: Egg - Quantity: 6 # same as when cooking + - type: SolutionContainerManager + solutions: + puddle: + maxVol: 1000 + reagents: + - ReagentId: Egg + Quantity: 6 # same as when cooking - type: entity id: PuddleTomato parent: PuddleTemporary components: - - type: SolutionContainerManager - solutions: - puddle: - maxVol: 1000 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Water - Quantity: 5 + - type: SolutionContainerManager + solutions: + puddle: + maxVol: 1000 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Water + Quantity: 5 - type: entity id: PuddleWatermelon parent: PuddleTemporary components: - - type: SolutionContainerManager - solutions: - puddle: - maxVol: 1000 - reagents: - - ReagentId: Nutriment - Quantity: 15 - - ReagentId: Water - Quantity: 15 + - type: SolutionContainerManager + solutions: + puddle: + maxVol: 1000 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Water + Quantity: 15 - type: entity id: PuddleFlour parent: PuddleTemporary components: - - type: SolutionContainerManager - solutions: - puddle: - maxVol: 1000 - reagents: - - ReagentId: Flour - Quantity: 15 + - type: SolutionContainerManager + solutions: + puddle: + maxVol: 1000 + reagents: + - ReagentId: Flour + Quantity: 15 - type: entity id: PuddleSparkle @@ -105,57 +105,58 @@ placement: mode: SnapgridCenter components: - - type: Clickable - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepWater - params: - volume: 6 - - type: Slippery - launchForwardsMultiplier: 2.0 - - type: Transform - noRot: true - anchored: true - - type: Sprite - layers: - - sprite: Fluids/puddle.rsi - state: splat0 - drawdepth: FloorObjects - color: "#FFFFFF80" - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - slipFixture: - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.4,0.4,0.4" - mask: - - ItemMask - layer: - - SlipLayer - hard: false - - type: IconSmooth - key: puddles - base: splat - mode: CardinalFlags - - type: SolutionContainerManager - solutions: - puddle: { maxVol: 1000 } - - type: Puddle - - type: Appearance - - type: EdgeSpreader - - type: StepTrigger - - type: NodeContainer - nodes: - puddle: - !type:SpreaderNode - nodeGroupID: Spreader - - type: Drink - isOpen: true - delay: 3 - transferAmount: 1 - solution: puddle - examinable: false - - type: ExaminableSolution - solution: puddle + - type: Clickable + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepWater + params: + volume: 6 + - type: Slippery + launchForwardsMultiplier: 2.0 + - type: Transform + noRot: true + anchored: true + - type: Sprite + layers: + - sprite: Fluids/puddle.rsi + state: splat0 + drawdepth: FloorObjects + color: "#FFFFFF80" + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + slipFixture: + shape: + !type:PhysShapeAabb + bounds: "-0.4,-0.4,0.4,0.4" + mask: + - ItemMask + layer: + - SlipLayer + hard: false + - type: IconSmooth + key: puddles + base: splat + mode: CardinalFlags + - type: SolutionContainerManager + solutions: + puddle: { maxVol: 1000 } + - type: Puddle + - type: Appearance + - type: EdgeSpreader + - type: StepTrigger + - type: NodeContainer + nodes: + puddle: + !type:SpreaderNode + nodeGroupID: Spreader + - type: Drink + isOpen: true + delay: 3 + transferAmount: 1 + solution: puddle + examinable: false + - type: ExaminableSolution + solution: puddle + - type: BadDrink diff --git a/Resources/Prototypes/NPCs/nutrition.yml b/Resources/Prototypes/NPCs/nutrition.yml index 9d55b7be21..05a2c6cf75 100644 --- a/Resources/Prototypes/NPCs/nutrition.yml +++ b/Resources/Prototypes/NPCs/nutrition.yml @@ -1,11 +1,16 @@ - type: htnCompound id: FoodCompound branches: - - tasks: - - id: PickFoodTargetPrimitive - - id: MoveToCombatTargetPrimitive - - id: EatPrimitive - - id: WaitIdleTimePrimitive + - tasks: + - id: PickFoodTargetPrimitive + - id: MoveToCombatTargetPrimitive + - id: EatPrimitive + - id: WaitIdleTimePrimitive + - tasks: + - id: PickDrinkTargetPrimitive + - id: MoveToCombatTargetPrimitive + - id: EatPrimitive + - id: WaitIdleTimePrimitive - type: htnPrimitive @@ -13,9 +18,14 @@ operator: !type:UtilityOperator proto: NearbyFood +- type: htnPrimitive + id: PickDrinkTargetPrimitive + operator: !type:UtilityOperator + proto: NearbyDrink + - type: htnPrimitive id: EatPrimitive preconditions: - - !type:KeyExistsPrecondition - key: CombatTarget + - !type:KeyExistsPrecondition + key: CombatTarget operator: !type:AltInteractOperator diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml index 7b804f6f37..f4cf83fa94 100644 --- a/Resources/Prototypes/NPCs/utility_queries.yml +++ b/Resources/Prototypes/NPCs/utility_queries.yml @@ -3,7 +3,7 @@ query: - !type:ComponentQuery components: - - type: Food + - type: Food considerations: - !type:TargetIsAliveCon curve: !type:InverseBoolCurve @@ -17,6 +17,25 @@ - !type:TargetAccessibleCon curve: !type:BoolCurve +- type: utilityQuery + id: NearbyDrink + query: + - !type:ComponentQuery + components: + - type: Drink + considerations: + - !type:TargetIsAliveCon + curve: !type:InverseBoolCurve + - !type:TargetDistanceCon + curve: !type:PresetCurve + preset: TargetDistance + - !type:DrinkValueCon + curve: !type:QuadraticCurve + slope: 1.0 + exponent: 0.4 + - !type:TargetAccessibleCon + curve: !type:BoolCurve + - type: utilityQuery id: NearbyMeleeTargets query: