juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix magboots not needing a grid to work (#29034)

Browse Source 
* Fix magboots not needing a grid to work

* ok fix it for realsies
This commit is contained in:
Nemanja
2024-06-15 23:38:17 -04:00
committed by GitHub
parent a341c3a1e9
commit 3644602fb8
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Shared/Gravity/SharedGravitySystem.cs
View File

@@ -17,6 +17,8 @@ namespace Content.Shared.Gravity
[ValidatePrototypeId<AlertPrototype>]
public const string WeightlessAlert = "Weightless";
private EntityQuery<GravityComponent> _gravityQuery;
public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, TransformComponent? xform = null)
{
Resolve(uid, ref body, false);
@@ -36,15 +38,35 @@ namespace Content.Shared.Gravity
return true;
// If grid / map has gravity
if (TryComp<GravityComponent>(xform.GridUid, out var gravity) && gravity.Enabled ||
TryComp<GravityComponent>(xform.MapUid, out var mapGravity) && mapGravity.Enabled)
{
if (EntityGridOrMapHaveGravity((uid, xform)))
return false;
}
return true;
}
/// <summary>
/// Checks if a given entity is currently standing on a grid or map that supports having gravity at all.
/// </summary>
public bool EntityOnGravitySupportingGridOrMap(Entity<TransformComponent?> entity)
{
entity.Comp ??= Transform(entity);
return _gravityQuery.HasComp(entity.Comp.GridUid) ||
_gravityQuery.HasComp(entity.Comp.MapUid);
}
/// <summary>
/// Checks if a given entity is currently standing on a grid or map that has gravity of some kind.
/// </summary>
public bool EntityGridOrMapHaveGravity(Entity<TransformComponent?> entity)
{
entity.Comp ??= Transform(entity);
return _gravityQuery.TryComp(entity.Comp.GridUid, out var gravity) && gravity.Enabled ||
_gravityQuery.TryComp(entity.Comp.MapUid, out var mapGravity) && mapGravity.Enabled;
}
public override void Initialize()
{
base.Initialize();
@@ -54,6 +76,8 @@ namespace Content.Shared.Gravity
SubscribeLocalEvent<GravityChangedEvent>(OnGravityChange);
SubscribeLocalEvent<GravityComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<GravityComponent, ComponentHandleState>(OnHandleState);
_gravityQuery = GetEntityQuery<GravityComponent>();
}
public override void Update(float frameTime)