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

Fix jetpack warnings (#18227)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-23 16:00:59 +10:00
committed by GitHub
parent c8ef41e732
commit 1de396d566
6 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Client/Movement/Systems/JetpackSystem.cs
View File

@@ -14,7 +14,7 @@ public sealed class JetpackSystem : SharedJetpackSystem
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ClothingSystem _clothing = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
public override void Initialize()
{
@@ -22,7 +22,7 @@ public sealed class JetpackSystem : SharedJetpackSystem
SubscribeLocalEvent<JetpackComponent, AppearanceChangeEvent>(OnJetpackAppearance);
}
protected override bool CanEnable(JetpackComponent component)
protected override bool CanEnable(EntityUid uid, JetpackComponent component)
{
// No predicted atmos so you'd have to do a lot of funny to get this working.
return false;
@@ -30,7 +30,7 @@ public sealed class JetpackSystem : SharedJetpackSystem
private void OnJetpackAppearance(EntityUid uid, JetpackComponent component, ref AppearanceChangeEvent args)
{
_appearance.TryGetData<bool>(uid, JetpackVisuals.Enabled, out var enabled, args.Component);
Appearance.TryGetData<bool>(uid, JetpackVisuals.Enabled, out var enabled, args.Component);
var state = "icon" + (enabled ? "-on" : "");
args.Sprite?.LayerSetState(0, state);
@@ -43,16 +43,21 @@ public sealed class JetpackSystem : SharedJetpackSystem
{
base.Update(frameTime);
if (!_timing.IsFirstTimePredicted) return;
if (!_timing.IsFirstTimePredicted)
return;
foreach (var comp in EntityQuery<ActiveJetpackComponent>())
// TODO: Please don't copy-paste this I beg
// make a generic particle emitter system / actual particles instead.
var query = EntityQueryEnumerator<ActiveJetpackComponent>();
while (query.MoveNext(out var uid, out var comp))
{
if (_timing.CurTime < comp.TargetTime)
continue;
comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
CreateParticles(comp.Owner);
CreateParticles(uid);
}
}
@@ -62,7 +67,9 @@ public sealed class JetpackSystem : SharedJetpackSystem
if (Container.TryGetContainingContainer(uid, out var container) &&
TryComp<PhysicsComponent>(container.Owner, out var body) &&
body.LinearVelocity.LengthSquared() < 1f)
{
return;
}
var uidXform = Transform(uid);
var coordinates = uidXform.Coordinates;
@@ -70,19 +77,17 @@ public sealed class JetpackSystem : SharedJetpackSystem
if (_mapManager.TryGetGrid(gridUid, out var grid))
{
coordinates = new EntityCoordinates(grid.Owner, grid.WorldToLocal(coordinates.ToMapPos(EntityManager)));
coordinates = new EntityCoordinates(gridUid.Value, grid.WorldToLocal(coordinates.ToMapPos(EntityManager, _transform)));
}
else if (uidXform.MapUid != null)
{
coordinates = new EntityCoordinates(uidXform.MapUid.Value, uidXform.WorldPosition);
coordinates = new EntityCoordinates(uidXform.MapUid.Value, _transform.GetWorldPosition(uidXform));
}
else
{
return;
}
var ent = Spawn("JetpackEffect", coordinates);
var xform = Transform(ent);
xform.Coordinates = coordinates;
Spawn("JetpackEffect", coordinates);
}
}