mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-18 14:07:53 +03:00
## Mirror of PR #26292: [Code cleanup: Purge calls to obsolete EntityCoordinates methods](https://github.com/space-wizards/space-station-14/pull/26292) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `f4cb02fb0ca385c858569c07c51afb0d24ade949` PR opened by <img src="https://avatars.githubusercontent.com/u/85356?v=4" width="16"/><a href="https://github.com/Tayrtahn"> Tayrtahn</a> at 2024-03-20 16:04:43 UTC --- PR changed 34 files with 70 additions and 56 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Cleaned up some outdated code. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Clean code is happy code. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > Updated all calls to obsolete EntityCoordinates methods (ToMap, ToMapPos, FromMap, ToVector2i, InRange) to non-obsolete ones (by passing in SharedTransformSystem as an arg). > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > Code > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > </details> --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
145 lines
5.7 KiB
C#
145 lines
5.7 KiB
C#
using Content.Server.Chemistry.Components;
|
|
using Content.Server.Chemistry.Containers.EntitySystems;
|
|
using Content.Shared.Chemistry;
|
|
using Content.Shared.Chemistry.Components;
|
|
using Content.Shared.Chemistry.Components.SolutionManager;
|
|
using Content.Shared.Chemistry.Reagent;
|
|
using Content.Shared.FixedPoint;
|
|
using Content.Shared.Physics;
|
|
using Content.Shared.Throwing;
|
|
using JetBrains.Annotations;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Map.Components;
|
|
using Robust.Shared.Physics.Components;
|
|
using Robust.Shared.Physics.Events;
|
|
using Robust.Shared.Physics.Systems;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Spawners;
|
|
using System.Numerics;
|
|
|
|
namespace Content.Server.Chemistry.EntitySystems
|
|
{
|
|
[UsedImplicitly]
|
|
internal sealed class VaporSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IPrototypeManager _protoManager = default!;
|
|
[Dependency] private readonly SharedMapSystem _map = default!;
|
|
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
|
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
|
|
[Dependency] private readonly ThrowingSystem _throwing = default!;
|
|
[Dependency] private readonly ReactiveSystem _reactive = default!;
|
|
|
|
private const float ReactTime = 0.125f;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<VaporComponent, StartCollideEvent>(HandleCollide);
|
|
}
|
|
|
|
private void HandleCollide(Entity<VaporComponent> entity, ref StartCollideEvent args)
|
|
{
|
|
if (!EntityManager.TryGetComponent(entity.Owner, out SolutionContainerManagerComponent? contents)) return;
|
|
|
|
foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((entity.Owner, contents)))
|
|
{
|
|
var solution = soln.Comp.Solution;
|
|
_reactive.DoEntityReaction(args.OtherEntity, solution, ReactionMethod.Touch);
|
|
}
|
|
|
|
// Check for collision with a impassable object (e.g. wall) and stop
|
|
if ((args.OtherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && args.OtherFixture.Hard)
|
|
{
|
|
EntityManager.QueueDeleteEntity(entity);
|
|
}
|
|
}
|
|
|
|
public void Start(Entity<VaporComponent> vapor, TransformComponent vaporXform, Vector2 dir, float speed, MapCoordinates target, float aliveTime, EntityUid? user = null)
|
|
{
|
|
vapor.Comp.Active = true;
|
|
var despawn = EnsureComp<TimedDespawnComponent>(vapor);
|
|
despawn.Lifetime = aliveTime;
|
|
|
|
// Set Move
|
|
if (EntityManager.TryGetComponent(vapor, out PhysicsComponent? physics))
|
|
{
|
|
_physics.SetLinearDamping(vapor, physics, 0f);
|
|
_physics.SetAngularDamping(vapor, physics, 0f);
|
|
|
|
_throwing.TryThrow(vapor, dir, speed, user: user);
|
|
|
|
var distance = (target.Position - vaporXform.WorldPosition).Length();
|
|
var time = (distance / physics.LinearVelocity.Length());
|
|
despawn.Lifetime = MathF.Min(aliveTime, time);
|
|
}
|
|
}
|
|
|
|
internal bool TryAddSolution(Entity<VaporComponent> vapor, Solution solution)
|
|
{
|
|
if (solution.Volume == 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (!_solutionContainerSystem.TryGetSolution(vapor.Owner, VaporComponent.SolutionName, out var vaporSolution))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return _solutionContainerSystem.TryAddSolution(vaporSolution.Value, solution);
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
var query = EntityQueryEnumerator<VaporComponent, SolutionContainerManagerComponent, TransformComponent>();
|
|
while (query.MoveNext(out var uid, out var vaporComp, out var container, out var xform))
|
|
{
|
|
foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((uid, container)))
|
|
{
|
|
Update(frameTime, (uid, vaporComp), soln, xform);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void Update(float frameTime, Entity<VaporComponent> ent, Entity<SolutionComponent> soln, TransformComponent xform)
|
|
{
|
|
var (entity, vapor) = ent;
|
|
if (!vapor.Active)
|
|
return;
|
|
|
|
vapor.ReactTimer += frameTime;
|
|
|
|
var contents = soln.Comp.Solution;
|
|
if (vapor.ReactTimer >= ReactTime && TryComp(xform.GridUid, out MapGridComponent? gridComp))
|
|
{
|
|
vapor.ReactTimer = 0;
|
|
|
|
var tile = _map.GetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates);
|
|
foreach (var reagentQuantity in contents.Contents.ToArray())
|
|
{
|
|
if (reagentQuantity.Quantity == FixedPoint2.Zero) continue;
|
|
var reagent = _protoManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
|
|
|
|
var reaction =
|
|
reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f);
|
|
|
|
if (reaction > reagentQuantity.Quantity)
|
|
{
|
|
Log.Error($"Tried to tile react more than we have for reagent {reagentQuantity}. Found {reaction} and we only have {reagentQuantity.Quantity}");
|
|
reaction = reagentQuantity.Quantity;
|
|
}
|
|
|
|
_solutionContainerSystem.RemoveReagent(soln, reagentQuantity.Reagent, reaction);
|
|
}
|
|
}
|
|
|
|
if (contents.Volume == 0)
|
|
{
|
|
// Delete this
|
|
EntityManager.QueueDeleteEntity(entity);
|
|
}
|
|
}
|
|
}
|
|
}
|