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

Fix remote solution injection (#23429)

Browse Source 
Checks if its own fixture is hard so the fly-by fixture can't also proc it.
This commit is contained in:
metalgearsloth
2024-01-03 18:57:36 +11:00
committed by GitHub
parent bc304a3127
commit 9f47079d02
2 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
View File

@@ -1,29 +1,27 @@
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.Inventory; using Content.Shared.Inventory;
namespace Content.Server.Chemistry.Components namespace Content.Server.Chemistry.Components;
/// <summary>
/// On colliding with an entity that has a bloodstream will dump its solution onto them.
/// </summary>
[RegisterComponent]
public sealed partial class SolutionInjectOnCollideComponent : Component
{ {
[ViewVariables(VVAccess.ReadWrite)]
[DataField("transferAmount")]
public FixedPoint2 TransferAmount = FixedPoint2.New(1);
[ViewVariables(VVAccess.ReadWrite)]
public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
[DataField("transferEfficiency")]
private float _transferEfficiency = 1f;
/// <summary> /// <summary>
/// On colliding with an entity that has a bloodstream will dump its solution onto them. /// If anything covers any of these slots then the injection fails.
/// </summary> /// </summary>
[RegisterComponent] [DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
internal sealed partial class SolutionInjectOnCollideComponent : Component public SlotFlags BlockSlots = SlotFlags.MASK;
{
[ViewVariables(VVAccess.ReadWrite)]
[DataField("transferAmount")]
public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1);
[ViewVariables(VVAccess.ReadWrite)]
public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
[DataField("transferEfficiency")]
private float _transferEfficiency = 1f;
/// <summary>
/// If anything covers any of these slots then the injection fails.
/// </summary>
[DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
public SlotFlags BlockSlots = SlotFlags.MASK;
}
} }

65
Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
View File

@@ -6,48 +6,47 @@ using Content.Shared.Inventory;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Physics.Events; using Robust.Shared.Physics.Events;
namespace Content.Server.Chemistry.EntitySystems namespace Content.Server.Chemistry.EntitySystems;
public sealed class SolutionInjectOnCollideSystem : EntitySystem
{ {
[UsedImplicitly] [Dependency] private readonly SolutionContainerSystem _solutionContainersSystem = default!;
internal sealed class SolutionInjectOnCollideSystem : EntitySystem [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
public override void Initialize()
{ {
[Dependency] private readonly SolutionContainerSystem _solutionContainersSystem = default!; base.Initialize();
[Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; SubscribeLocalEvent<SolutionInjectOnCollideComponent, StartCollideEvent>(HandleInjection);
[Dependency] private readonly InventorySystem _inventorySystem = default!; }
public override void Initialize() private void HandleInjection(Entity<SolutionInjectOnCollideComponent> ent, ref StartCollideEvent args)
{
var component = ent.Comp;
var target = args.OtherEntity;
if (!args.OtherBody.Hard ||
!args.OurBody.Hard ||
!EntityManager.TryGetComponent<BloodstreamComponent>(target, out var bloodstream) ||
!_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
{ {
base.Initialize(); return;
SubscribeLocalEvent<SolutionInjectOnCollideComponent, StartCollideEvent>(HandleInjection);
} }
private void HandleInjection(Entity<SolutionInjectOnCollideComponent> ent, ref StartCollideEvent args) if (component.BlockSlots != 0x0)
{ {
var component = ent.Comp; var containerEnumerator = _inventorySystem.GetSlotEnumerator(target, component.BlockSlots);
var target = args.OtherEntity;
if (!args.OtherBody.Hard || // TODO add a helper method for this?
!EntityManager.TryGetComponent<BloodstreamComponent>(target, out var bloodstream) || if (containerEnumerator.MoveNext(out _))
!_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
{
return; return;
}
if (component.BlockSlots != 0x0)
{
var containerEnumerator = _inventorySystem.GetSlotEnumerator(target, component.BlockSlots);
// TODO add a helper method for this?
if (containerEnumerator.MoveNext(out _))
return;
}
var solRemoved = _solutionContainersSystem.SplitSolution(solution.Value, component.TransferAmount);
var solRemovedVol = solRemoved.Volume;
var solToInject = solRemoved.SplitSolution(solRemovedVol * component.TransferEfficiency);
_bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);
} }
var solRemoved = _solutionContainersSystem.SplitSolution(solution.Value, component.TransferAmount);
var solRemovedVol = solRemoved.Volume;
var solToInject = solRemoved.SplitSolution(solRemovedVol * component.TransferEfficiency);
_bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);
} }
} }