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

Better jetpack emitter (#36093)

Browse Source 
* Better jetpack emitter

Still need particles this just tilts me whenever I see it.

* Update Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
metalgearsloth
2025-03-30 15:06:01 +11:00
committed by GitHub
parent d9b8c0a28f
commit ef11f96344
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,13 +49,17 @@ public sealed class JetpackSystem : SharedJetpackSystem
// TODO: Please don't copy-paste this I beg // TODO: Please don't copy-paste this I beg
// make a generic particle emitter system / actual particles instead. // make a generic particle emitter system / actual particles instead.
var query = EntityQueryEnumerator<ActiveJetpackComponent>(); var query = EntityQueryEnumerator<ActiveJetpackComponent, TransformComponent>();
while (query.MoveNext(out var uid, out var comp)) while (query.MoveNext(out var uid, out var comp, out var xform))
{ {
if (_timing.CurTime < comp.TargetTime) if (_transform.InRange(xform.Coordinates, comp.LastCoordinates, comp.MaxDistance))
continue; {
if (_timing.CurTime < comp.TargetTime)
continue;
}
comp.LastCoordinates = _transform.GetMoverCoordinates(xform.Coordinates);
comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown); comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
CreateParticles(uid); CreateParticles(uid);

6
Content.Shared/Movement/Components/ActiveJetpackComponent.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Map;
namespace Content.Shared.Movement.Components; namespace Content.Shared.Movement.Components;
@@ -9,5 +10,10 @@ namespace Content.Shared.Movement.Components;
public sealed partial class ActiveJetpackComponent : Component public sealed partial class ActiveJetpackComponent : Component
{ {
public float EffectCooldown = 0.3f; public float EffectCooldown = 0.3f;
public float MaxDistance = 0.7f;
public EntityCoordinates LastCoordinates;
public TimeSpan TargetTime = TimeSpan.Zero; public TimeSpan TargetTime = TimeSpan.Zero;
} }