Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert 'Revert 'Solution Entities'' (#23168)

Browse Source
This commit is contained in:
TemporalOroboros
2023-12-29 04:47:43 -08:00
committed by GitHub
parent 93e1af2f8d
commit d23c8d5c19
180 changed files with 3541 additions and 2956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs
View File

@@ -1,34 +1,34 @@
using System.Linq;
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Server.Weapons.Ranged.Components;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Weapons.Ranged.Events;
using System.Linq;
namespace Content.Server.Weapons.Ranged.Systems
{
public sealed class ChemicalAmmoSystem : EntitySystem
{
[Dependency] private readonly SolutionContainerSystem _solutionSystem = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
public override void Initialize()
{
SubscribeLocalEvent<ChemicalAmmoComponent, AmmoShotEvent>(OnFire);
}
private void OnFire(EntityUid uid, ChemicalAmmoComponent component, AmmoShotEvent args)
private void OnFire(Entity<ChemicalAmmoComponent> entity, ref AmmoShotEvent args)
{
if (!_solutionSystem.TryGetSolution(uid, component.SolutionName, out var ammoSolution))
if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var ammoSoln, out var ammoSolution))
return;
var projectiles = args.FiredProjectiles;
var projectileSolutionContainers = new List<(EntityUid, Solution)>();
var projectileSolutionContainers = new List<(EntityUid, Entity<SolutionComponent>)>();
foreach (var projectile in projectiles)
{
if (_solutionSystem
.TryGetSolution(projectile, component.SolutionName, out var projectileSolutionContainer))
if (_solutionContainerSystem
.TryGetSolution(projectile, entity.Comp.SolutionName, out var projectileSoln, out _))
{
projectileSolutionContainers.Add((uid, projectileSolutionContainer));
projectileSolutionContainers.Add((projectile, projectileSoln.Value));
}
}
@@ -37,13 +37,13 @@ namespace Content.Server.Weapons.Ranged.Systems
var solutionPerProjectile = ammoSolution.Volume * (1 / projectileSolutionContainers.Count);
foreach (var (projectileUid, projectileSolution) in projectileSolutionContainers)
foreach (var (_, projectileSolution) in projectileSolutionContainers)
{
var solutionToTransfer = _solutionSystem.SplitSolution(uid, ammoSolution, solutionPerProjectile);
_solutionSystem.TryAddSolution(projectileUid, projectileSolution, solutionToTransfer);
var solutionToTransfer = _solutionContainerSystem.SplitSolution(ammoSoln.Value, solutionPerProjectile);
_solutionContainerSystem.TryAddSolution(projectileSolution, solutionToTransfer);
}
_solutionSystem.RemoveAllSolution(uid, ammoSolution);
_solutionContainerSystem.RemoveAllSolution(ammoSoln.Value);
}
}
}

27
Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
@@ -18,29 +19,29 @@ public sealed partial class GunSystem
base.InitializeSolution();
SubscribeLocalEvent<SolutionAmmoProviderComponent, MapInitEvent>(OnSolutionMapInit);
SubscribeLocalEvent<SolutionAmmoProviderComponent, SolutionChangedEvent>(OnSolutionChanged);
SubscribeLocalEvent<SolutionAmmoProviderComponent, SolutionContainerChangedEvent>(OnSolutionChanged);
}
private void OnSolutionMapInit(EntityUid uid, SolutionAmmoProviderComponent component, MapInitEvent args)
private void OnSolutionMapInit(Entity<SolutionAmmoProviderComponent> entity, ref MapInitEvent args)
{
UpdateSolutionShots(uid, component);
UpdateSolutionShots(entity.Owner, entity.Comp);
}
private void OnSolutionChanged(EntityUid uid, SolutionAmmoProviderComponent component, SolutionChangedEvent args)
private void OnSolutionChanged(Entity<SolutionAmmoProviderComponent> entity, ref SolutionContainerChangedEvent args)
{
if (args.Solution.Name == component.SolutionId)
UpdateSolutionShots(uid, component, args.Solution);
if (args.Solution.Name == entity.Comp.SolutionId)
UpdateSolutionShots(entity.Owner, entity.Comp, args.Solution);
}
protected override void UpdateSolutionShots(EntityUid uid, SolutionAmmoProviderComponent component, Solution? solution = null)
{
var shots = 0;
var maxShots = 0;
if (solution == null && !_solutionContainer.TryGetSolution(uid, component.SolutionId, out solution))
if (solution == null && !_solutionContainer.TryGetSolution(uid, component.SolutionId, out _, out solution))
{
component.Shots = shots;
component.MaxShots = maxShots;
Dirty(component);
Dirty(uid, component);
return;
}
@@ -49,7 +50,7 @@ public sealed partial class GunSystem
component.Shots = shots;
component.MaxShots = maxShots;
Dirty(component);
Dirty(uid, component);
UpdateSolutionAppearance(uid, component);
}
@@ -58,10 +59,10 @@ public sealed partial class GunSystem
{
var (ent, shootable) = base.GetSolutionShot(uid, component, position);
if (!_solutionContainer.TryGetSolution(uid, component.SolutionId, out var solution))
if (!_solutionContainer.TryGetSolution(uid, component.SolutionId, out var solution, out _))
return (ent, shootable);
var newSolution = _solutionContainer.SplitSolution(uid, solution, component.FireCost);
var newSolution = _solutionContainer.SplitSolution(solution.Value, component.FireCost);
if (newSolution.Volume <= FixedPoint2.Zero)
return (ent, shootable);
@@ -73,9 +74,9 @@ public sealed partial class GunSystem
}
// Add the solution to the vapor and actually send the thing
if (_solutionContainer.TryGetSolution(ent, VaporComponent.SolutionName, out var vaporSolution))
if (_solutionContainer.TryGetSolution(ent, VaporComponent.SolutionName, out var vaporSolution, out _))
{
_solutionContainer.TryAddSolution(ent, vaporSolution, newSolution);
_solutionContainer.TryAddSolution(vaporSolution.Value, newSolution);
}
return (ent, shootable);
}