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
@@ -195,8 +195,7 @@ public abstract partial class SharedMoverController : VirtualController
|
||||
}
|
||||
|
||||
// If the body is in air but isn't weightless then it can't move
|
||||
// TODO: MAKE ISWEIGHTLESS EVENT BASED
|
||||
var weightless = _gravity.IsWeightless(uid, physicsComponent, xform);
|
||||
var weightless = _gravity.IsWeightless(uid);
|
||||
var inAirHelpless = false;
|
||||
|
||||
if (physicsComponent.BodyStatus != BodyStatus.OnGround && !CanMoveInAirQuery.HasComponent(uid))
|
||||
@@ -624,8 +623,7 @@ public abstract partial class SharedMoverController : VirtualController
|
||||
if (!TryComp<PhysicsComponent>(ent, out var physicsComponent) || !XformQuery.TryComp(ent, out var xform))
|
||||
return;
|
||||
|
||||
// TODO: Make IsWeightless event based!!!
|
||||
if (physicsComponent.BodyStatus != BodyStatus.OnGround || _gravity.IsWeightless(ent, physicsComponent, xform))
|
||||
if (physicsComponent.BodyStatus != BodyStatus.OnGround || _gravity.IsWeightless(ent.Owner))
|
||||
args.Modifier *= ent.Comp.BaseWeightlessFriction;
|
||||
else
|
||||
args.Modifier *= ent.Comp.BaseFriction;
|
||||
|
||||
Reference in New Issue
Block a user