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

Solution refactor (#4407)

Browse Source 
* Rename SolutionContainerCaps -> Capability

* Move IExamine event to Chemistry System.

* ECS the ISolutionChange into SolutionChangeEvent

* Unify SolutionContainer into a single shared component

* Replace ISolutionInteraction with SolutionContainerComponent

* Move all methods from SolutionContainer to ChemistrySystem

* Refactor EntitySystem calls to Dependencies

* Refactor SolutionContainer to SolutionManager

* Fix yamls

* Fix test fails

* Fix post merge issues

* Fix various issues with SolutionManager

* More fixes

* Fix more components

* Fix events not being directed

* Fixes for Hypospray

* Separate removal and iteration on Metabolism

* Fix creampie problems

* Address some of sloth's issues

* Refactors for Systems

* Refactored solution location

* Fix tests

* Address more sloth issues

* Fix dependency

* Fix merge conflicts

* Add xmldocs for Capabilities components

* Remove HasSolution/TryGetDefaultSolution and Add/Remove Drainable/Refillable

* Replace Grindable/Juiceable with Extractable

* Refactor field names

* Fix Drainable

* Fix some issues with spillable and injector

* Fix issues with Grinder

* Fix Beaker having duplicate solutions

* Fix foaming

* Address some MGS issues

* Fix Uid issues

* Fix errors in solution Tranfer

* Fixed some extra values constant values

* Cola is drinkable now
This commit is contained in:
Ygg01
2021-09-06 15:49:44 +02:00
committed by GitHub
parent b8911d58ac
commit c209e3f29b
166 changed files with 4268 additions and 3278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Content.Server/Fluids/Components/SpillableComponent.cs
View File

@@ -1,9 +1,8 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Chemistry.Solution.Components;
using Content.Shared.DragDrop;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Notification.Managers;
using Content.Shared.Verbs;
using Robust.Shared.GameObjects;
@@ -15,6 +14,7 @@ namespace Content.Server.Fluids.Components
public class SpillableComponent : Component, IDropped
{
public override string Name => "Spillable";
public const string SolutionName = "puddle";
/// <summary>
/// Transfers solution from the held container to the floor.
@@ -25,8 +25,8 @@ namespace Content.Server.Fluids.Components
protected override void GetData(IEntity user, SpillableComponent component, VerbData data)
{
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user) ||
!component.Owner.TryGetComponent(out ISolutionInteractionsComponent? solutionComponent) ||
!solutionComponent.CanDrain)
!EntitySystem.Get<SolutionContainerSystem>()
.TryGetDrainableSolution(component.Owner.Uid, out var solutionComponent))
{
data.Visibility = VerbVisibility.Invisible;
return;
@@ -40,30 +40,40 @@ namespace Content.Server.Fluids.Components
protected override void Activate(IEntity user, SpillableComponent component)
{
if (component.Owner.TryGetComponent<ISolutionInteractionsComponent>(out var solutionComponent))
var solutionsSys = EntitySystem.Get<SolutionContainerSystem>();
if (component.Owner.HasComponent<SolutionContainerManagerComponent>())
{
if (!solutionComponent.CanDrain)
if (solutionsSys.TryGetDrainableSolution(component.Owner.Uid, out var solutionComponent))
{
if (solutionComponent.DrainAvailable <= 0)
{
user.PopupMessage(user,
Loc.GetString("spill-target-verb-activate-is-empty-message", ("owner", component.Owner)));
}
// Need this as when we split the component's owner may be deleted
EntitySystem.Get<SolutionContainerSystem>()
.Drain(component.Owner.Uid, solutionComponent, solutionComponent.DrainAvailable)
.SpillAt(component.Owner.Transform.Coordinates, "PuddleSmear");
}
else
{
user.PopupMessage(user,
Loc.GetString("spill-target-verb-activate-cannot-drain-message",("owner", component.Owner)));
Loc.GetString("spill-target-verb-activate-cannot-drain-message",
("owner", component.Owner)));
}
if (solutionComponent.DrainAvailable <= 0)
{
user.PopupMessage(user, Loc.GetString("spill-target-verb-activate-is-empty-message",("owner", component.Owner)));
}
// Need this as when we split the component's owner may be deleted
solutionComponent.Drain(solutionComponent.DrainAvailable).SpillAt(component.Owner.Transform.Coordinates, "PuddleSmear");
}
}
}
void IDropped.Dropped(DroppedEventArgs eventArgs)
{
if (!eventArgs.Intentional && Owner.TryGetComponent(out ISolutionInteractionsComponent? solutionComponent))
if (!eventArgs.Intentional
&& EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner, SolutionName, out var solutionComponent))
{
solutionComponent.Drain(solutionComponent.DrainAvailable).SpillAt(Owner.Transform.Coordinates, "PuddleSmear");
EntitySystem.Get<SolutionContainerSystem>()
.Drain(Owner.Uid, solutionComponent, solutionComponent.DrainAvailable)
.SpillAt(Owner.Transform.Coordinates, "PuddleSmear");
}
}
}