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

Revert "Solution Entities" (#23160)

Browse Source 
Revert "Solution Entities (#21916)"

This reverts commit d75e743dd7.
This commit is contained in:
Emisse
2023-12-28 20:45:42 -07:00
committed by GitHub
parent c2c76c2035
commit 938d6d9945
180 changed files with 2959 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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