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

Solution Entities (#21916)

Browse Source 
* 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>
This commit is contained in:
TemporalOroboros
2023-12-28 17:58:14 -08:00
committed by GitHub
parent a4d36d408d
commit d75e743dd7
180 changed files with 3540 additions and 2956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Content.Server/Tools/ToolSystem.Welder.cs
View File

@@ -1,4 +1,3 @@
using System.Linq;
using Content.Server.Chemistry.Components;
using Content.Server.IgnitionSource;
using Content.Server.Tools.Components;
@@ -12,6 +11,7 @@ using Content.Shared.Item;
using Content.Shared.Item.ItemToggle;
using Content.Shared.Tools.Components;
using Robust.Shared.GameStates;
using System.Linq;
namespace Content.Server.Tools
{
@@ -38,66 +38,67 @@ namespace Content.Server.Tools
public (FixedPoint2 fuel, FixedPoint2 capacity) GetWelderFuelAndCapacity(EntityUid uid, WelderComponent? welder = null, SolutionContainerManagerComponent? solutionContainer = null)
{
if (!Resolve(uid, ref welder, ref solutionContainer)
|| !_solutionContainer.TryGetSolution(uid, welder.FuelSolution, out var fuelSolution, solutionContainer))
|| !_solutionContainer.ResolveSolution((uid, solutionContainer), welder.FuelSolutionName, ref welder.FuelSolution, out var fuelSolution))
return (FixedPoint2.Zero, FixedPoint2.Zero);
return (_solutionContainer.GetTotalPrototypeQuantity(uid, welder.FuelReagent), fuelSolution.MaxVolume);
return (fuelSolution.GetTotalPrototypeQuantity(welder.FuelReagent), fuelSolution.MaxVolume);
}
public void TryTurnOn(EntityUid uid, WelderComponent welder, ref ItemToggleActivateAttemptEvent args)
public void TryTurnOn(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
{
if (!_solutionContainer.TryGetSolution(uid, welder.FuelSolution, out var solution) ||
!TryComp<TransformComponent>(uid, out var transform))
if (!_solutionContainer.ResolveSolution(entity.Owner, entity.Comp.FuelSolutionName, ref entity.Comp.FuelSolution, out var solution) ||
!TryComp<TransformComponent>(entity, out var transform))
{
args.Cancelled = true;
return;
}
var fuel = solution.GetTotalPrototypeQuantity(welder.FuelReagent);
var fuel = solution.GetTotalPrototypeQuantity(entity.Comp.FuelReagent);
// Not enough fuel to lit welder.
if (fuel == FixedPoint2.Zero || fuel < welder.FuelLitCost)
if (fuel == FixedPoint2.Zero || fuel < entity.Comp.FuelLitCost)
{
if (args.User != null)
{
_popup.PopupEntity(Loc.GetString("welder-component-no-fuel-message"), uid, (EntityUid) args.User);
_popup.PopupEntity(Loc.GetString("welder-component-no-fuel-message"), entity, (EntityUid) args.User);
}
args.Cancelled = true;
return;
}
solution.RemoveReagent(welder.FuelReagent, welder.FuelLitCost);
_solutionContainer.RemoveReagent(entity.Comp.FuelSolution.Value, entity.Comp.FuelReagent, entity.Comp.FuelLitCost);
// Logging
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(uid):welder} on");
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} on");
_ignitionSource.SetIgnited(uid);
_ignitionSource.SetIgnited(entity.Owner);
if (transform.GridUid is { } gridUid)
{
var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
_atmosphereSystem.HotspotExpose(gridUid, position, 700, 50, uid, true);
var position = _transformSystem.GetGridOrMapTilePosition(entity.Owner, transform);
_atmosphereSystem.HotspotExpose(gridUid, position, 700, 50, entity.Owner, true);
}
Dirty(uid, welder);
Dirty(entity);
_activeWelders.Add(uid);
_activeWelders.Add(entity);
}
public void TurnOff(EntityUid uid, WelderComponent welder, ref ItemToggleDeactivateAttemptEvent args)
public void TurnOff(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
{
// Logging
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(uid):welder} off");
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} off");
_ignitionSource.SetIgnited(uid, false);
_ignitionSource.SetIgnited(entity.Owner, false);
Dirty(uid, welder);
Dirty(entity);
_activeWelders.Remove(uid);
_activeWelders.Remove(entity);
}
private void OnWelderExamine(EntityUid uid, WelderComponent welder, ExaminedEvent args)
private void OnWelderExamine(Entity<WelderComponent> entity, ref ExaminedEvent args)
{
if (_itemToggle.IsActivated(uid))
if (_itemToggle.IsActivated(entity.Owner))
{
args.PushMarkup(Loc.GetString("welder-component-on-examine-welder-lit-message"));
}
@@ -108,7 +109,7 @@ namespace Content.Server.Tools
if (args.IsInDetailsRange)
{
var (fuel, capacity) = GetWelderFuelAndCapacity(uid, welder);
var (fuel, capacity) = GetWelderFuelAndCapacity(entity.Owner, entity.Comp);
args.PushMarkup(Loc.GetString("welder-component-on-examine-detailed-message",
("colorName", fuel < capacity / FixedPoint2.New(4f) ? "darkorange" : "orange"),
@@ -118,7 +119,7 @@ namespace Content.Server.Tools
}
}
private void OnWelderAfterInteract(EntityUid uid, WelderComponent welder, AfterInteractEvent args)
private void OnWelderAfterInteract(Entity<WelderComponent> entity, ref AfterInteractEvent args)
{
if (args.Handled)
return;
@@ -128,49 +129,49 @@ namespace Content.Server.Tools
if (TryComp(target, out ReagentTankComponent? tank)
&& tank.TankType == ReagentTankType.Fuel
&& _solutionContainer.TryGetDrainableSolution(target, out var targetSolution)
&& _solutionContainer.TryGetSolution(uid, welder.FuelSolution, out var welderSolution))
&& _solutionContainer.TryGetDrainableSolution(target, out var targetSoln, out var targetSolution)
&& _solutionContainer.ResolveSolution(entity.Owner, entity.Comp.FuelSolutionName, ref entity.Comp.FuelSolution, out var welderSolution))
{
var trans = FixedPoint2.Min(welderSolution.AvailableVolume, targetSolution.Volume);
if (trans > 0)
{
var drained = _solutionContainer.Drain(target, targetSolution, trans);
_solutionContainer.TryAddSolution(uid, welderSolution, drained);
_audio.PlayPvs(welder.WelderRefill, uid);
_popup.PopupEntity(Loc.GetString("welder-component-after-interact-refueled-message"), uid, args.User);
var drained = _solutionContainer.Drain(target, targetSoln.Value, trans);
_solutionContainer.TryAddSolution(entity.Comp.FuelSolution.Value, drained);
_audio.PlayPvs(entity.Comp.WelderRefill, entity);
_popup.PopupEntity(Loc.GetString("welder-component-after-interact-refueled-message"), entity, args.User);
}
else if (welderSolution.AvailableVolume <= 0)
{
_popup.PopupEntity(Loc.GetString("welder-component-already-full"), uid, args.User);
_popup.PopupEntity(Loc.GetString("welder-component-already-full"), entity, args.User);
}
else
{
_popup.PopupEntity(Loc.GetString("welder-component-no-fuel-in-tank", ("owner", args.Target)), uid, args.User);
_popup.PopupEntity(Loc.GetString("welder-component-no-fuel-in-tank", ("owner", args.Target)), entity, args.User);
}
}
args.Handled = true;
}
private void OnWelderToolUseAttempt(EntityUid uid, WelderComponent welder, DoAfterAttemptEvent<ToolDoAfterEvent> args)
private void OnWelderToolUseAttempt(Entity<WelderComponent> entity, ref DoAfterAttemptEvent<ToolDoAfterEvent> args)
{
var user = args.DoAfter.Args.User;
if (!_itemToggle.IsActivated(uid))
if (!_itemToggle.IsActivated(entity.Owner))
{
_popup.PopupEntity(Loc.GetString("welder-component-welder-not-lit-message"), uid, user);
_popup.PopupEntity(Loc.GetString("welder-component-welder-not-lit-message"), entity, user);
args.Cancel();
}
}
private void OnWelderShutdown(EntityUid uid, WelderComponent welder, ComponentShutdown args)
private void OnWelderShutdown(Entity<WelderComponent> entity, ref ComponentShutdown args)
{
_activeWelders.Remove(uid);
_activeWelders.Remove(entity);
}
private void OnWelderGetState(EntityUid uid, WelderComponent welder, ref ComponentGetState args)
private void OnWelderGetState(Entity<WelderComponent> entity, ref ComponentGetState args)
{
var (fuel, capacity) = GetWelderFuelAndCapacity(uid, welder);
var (fuel, capacity) = GetWelderFuelAndCapacity(entity.Owner, entity.Comp);
args.State = new WelderComponentState(capacity.Float(), fuel.Float());
}
@@ -188,10 +189,10 @@ namespace Content.Server.Tools
|| !TryComp(tool, out SolutionContainerManagerComponent? solutionContainer))
continue;
if (!_solutionContainer.TryGetSolution(tool, welder.FuelSolution, out var solution, solutionContainer))
if (!_solutionContainer.ResolveSolution((tool, solutionContainer), welder.FuelSolutionName, ref welder.FuelSolution, out var solution))
continue;
solution.RemoveReagent(welder.FuelReagent, welder.FuelConsumption * _welderTimer);
_solutionContainer.RemoveReagent(welder.FuelSolution.Value, welder.FuelReagent, welder.FuelConsumption * _welderTimer);
if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
{