d75e743dd7
* Creates Content.Shared.Chemistry.Solutions Copies Solution class to new namespace Obsoletes old Solution class * Switches over to the Solutions.Solution Solution * Creates Content.Shared.Chemistry.Containers Copies relevant components/systems to the new namespace Obsoletes old versions * Switches over to the Containers.XYZ namespace * Creates SolutionSystem and obsoletes old SolutionContainerSystem methods * Start using SolutionSystem for Solution manipulation * EnumerateSolutions * Move TryGetMixableSolution * Move EnsureSolution to Server * Create Solution Entities * Stop using obsolete solution system methods * Fix prototype component tests * Add using ..Audio.Systems; back * Wrap solution container slots in ContainerSlots * Actually add the slot to the solution container map * Dirty SolutionContainerComponent when ensuring solutions * Revert namespace changes * Remerge SolutionSystem and SolutionContainerSystem * SolutionContainerManagerComponent refactor * Avoid wrapping necessary code in DebugTools.Assert as it is removed when compiling for release * Readd examine reagent sorting * Fix errors * Poke tests * Fix solution names not being applied * Fix WoolyComponent including statement * Fix merge skew * Fix compile errors * Make reactions use solntities * Reindent solution class namespace * Field attribute changes * AutoGenerateComponentState for SolutionContainerComponent * SolutionContainerComponent -> ContainedSolutionComponent * ref ReactionAttemptEvent * Denetwork preinit solutions * Misc 1 * Nullable TryGetSolution out vars * Cache associated solutions * Fix merge skew * Use explicit regions in SharedSolutionContainerSystem.Capabilities * Add debug assert * Use explicit regions in SharedSolutionContainerSystem.Relay + ref SolutionContainerChangedEvent * ContainedSolutionComponent.Name -> ContainedSolutionComponent.ContainerName * SolutionComponent doc comments * Implicit DataField names and property purge * ReagentEffect DataField names * Local variables for readability * Sort using statements + Entity<T> event handlers * Fix compile erros * Fix compile errors --------- Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
83 lines
2.7 KiB
C#
83 lines
2.7 KiB
C#
using Content.Server.Chemistry.Containers.EntitySystems;
|
|
using Content.Shared.Administration;
|
|
using Content.Shared.Chemistry.Components;
|
|
using Content.Shared.Chemistry.Reagent;
|
|
using Content.Shared.FixedPoint;
|
|
using Robust.Shared.Toolshed;
|
|
using Robust.Shared.Toolshed.Syntax;
|
|
using Robust.Shared.Toolshed.TypeParsers;
|
|
using System.Linq;
|
|
|
|
namespace Content.Server.Administration.Toolshed;
|
|
|
|
[ToolshedCommand, AdminCommand(AdminFlags.Debug)]
|
|
public sealed class SolutionCommand : ToolshedCommand
|
|
{
|
|
private SolutionContainerSystem? _solutionContainer;
|
|
|
|
[CommandImplementation("get")]
|
|
public SolutionRef? Get(
|
|
[CommandInvocationContext] IInvocationContext ctx,
|
|
[PipedArgument] EntityUid input,
|
|
[CommandArgument] ValueRef<string> name
|
|
)
|
|
{
|
|
_solutionContainer ??= GetSys<SolutionContainerSystem>();
|
|
|
|
if (_solutionContainer.TryGetSolution(input, name.Evaluate(ctx)!, out var solution))
|
|
return new SolutionRef(solution.Value);
|
|
|
|
return null;
|
|
}
|
|
|
|
[CommandImplementation("get")]
|
|
public IEnumerable<SolutionRef> Get(
|
|
[CommandInvocationContext] IInvocationContext ctx,
|
|
[PipedArgument] IEnumerable<EntityUid> input,
|
|
[CommandArgument] ValueRef<string> name
|
|
)
|
|
{
|
|
return input.Select(x => Get(ctx, x, name)).Where(x => x is not null).Cast<SolutionRef>();
|
|
}
|
|
|
|
[CommandImplementation("adjreagent")]
|
|
public SolutionRef AdjReagent(
|
|
[CommandInvocationContext] IInvocationContext ctx,
|
|
[PipedArgument] SolutionRef input,
|
|
[CommandArgument] Prototype<ReagentPrototype> name,
|
|
[CommandArgument] ValueRef<FixedPoint2> amountRef
|
|
)
|
|
{
|
|
_solutionContainer ??= GetSys<SolutionContainerSystem>();
|
|
|
|
var amount = amountRef.Evaluate(ctx);
|
|
if (amount > 0)
|
|
{
|
|
_solutionContainer.TryAddReagent(input.Solution, name.Value.ID, amount, out _);
|
|
}
|
|
else if (amount < 0)
|
|
{
|
|
_solutionContainer.RemoveReagent(input.Solution, name.Value.ID, -amount);
|
|
}
|
|
|
|
return input;
|
|
}
|
|
|
|
[CommandImplementation("adjreagent")]
|
|
public IEnumerable<SolutionRef> AdjReagent(
|
|
[CommandInvocationContext] IInvocationContext ctx,
|
|
[PipedArgument] IEnumerable<SolutionRef> input,
|
|
[CommandArgument] Prototype<ReagentPrototype> name,
|
|
[CommandArgument] ValueRef<FixedPoint2> amountRef
|
|
)
|
|
=> input.Select(x => AdjReagent(ctx, x, name, amountRef));
|
|
}
|
|
|
|
public readonly record struct SolutionRef(Entity<SolutionComponent> Solution)
|
|
{
|
|
public override string ToString()
|
|
{
|
|
return $"{Solution.Owner} {Solution.Comp.Solution}";
|
|
}
|
|
}
|