EVENT BASED WEIGHTLESSNESS (#37971)
* Init Commit * Typos * Commit 2 * Save Interaction Test Mob from failing * ssss * Confident I've gotten all the correct prototypes * Whoops forgot to edit those * aaaaa * Better solution * Test fail fixes * Yaml fix * THE FINAL TEST FIX * Final fix(?) * whoops * Added a WeightlessnessChangedEvent * Check out this diff * Wait I'm dumb * Final optimization and don't duplicate code * Death to IsWeightless * File scoped namespaces * REVIEW * Fix test fails * FIX TEST FAILS REAL * A * Commit of doom * borgar * We don't need to specify on map init apparently * Fuck it * LOAD BEARING COMMENT --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
5cd9ba6016
commit
9de76e70c7
@@ -164,12 +164,11 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
|
||||
if (args.Target is { } target && !xformQuery.TryGetComponent(target, out targetXform))
|
||||
return true;
|
||||
|
||||
TransformComponent? usedXform = null;
|
||||
if (args.Used is { } @using && !xformQuery.TryGetComponent(@using, out usedXform))
|
||||
if (args.Used is { } @using && !xformQuery.HasComp(@using))
|
||||
return true;
|
||||
|
||||
// TODO: Re-use existing xform query for these calculations.
|
||||
if (args.BreakOnMove && !(!args.BreakOnWeightlessMove && _gravity.IsWeightless(args.User, xform: userXform)))
|
||||
if (args.BreakOnMove && !(!args.BreakOnWeightlessMove && _gravity.IsWeightless(args.User)))
|
||||
{
|
||||
// Whether the user has moved too much from their original position.
|
||||
if (!_transform.InRange(userXform.Coordinates, doAfter.UserPosition, args.MovementThreshold))
|
||||
|
||||
Reference in New Issue
Block a user