Mob Movement Major Refactor (#36847)
* Conveyor optimisations - Optimise movement for moving stuff. Better flags + less resolves + slapped parallelrobustjob on it. - Sleeping for entities getting conveyed into walls. * Blocker version * Finish * Final * Fix conveyor power mispredict * Bagel save * Revert "Bagel save" This reverts commit 1b93fda81fb852d89b89b0beae0b80f8a61165f2. * Conveyor resave * Init Commit * windows yelling at me to update commit * working commit, need prediciton and more dehardcoding * Project 0 warnings * Working Commit (Near Final) * ryder got confused commit * I love Merge Conflicts :) * Working commit, no prediction * Forgot the yaml changes * Comments and typos * Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default * Fixed an incorrect divisor * bit of cleanup * Prediciton fixed, and puddles now affect all entities * FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS * Really big I forgor moment * Even bigger I forgor moment * four more merge conflicts to fix four more oopsies * fixed actual divide by zero moment and also im very dumb * Even bigger I forgor moment * four more merge conflicts to fix four more oopsies * fixed actual divide by zero moment and also im very dumb * Fix all test fails * code cleanup * Webedit whitespace * Code cleaup * whitespace webedit * whitespace webedit * whitespace webedit * whitespace removal * Comments and cleanup * Re-Added 20 warnings as per Ork's request * Cleanups * Spacing fix * bugfixes and cleanup * Small bugfix * Fix prediction * Mob movement rewrite * Bandaid * Working version * Tentatively working * Friction to fix cornering * More fixes * Refactor mob movement Trying to cleanup relay ordering / tryupdaterelative being cooked, purge ToParent, and fix all the eye rotation shenanigans. * Building * Re-implement jetpacks * Reorganise weightless movement * More work * Fix camera * reh * Revert bagel * Revert this * Revert held move buttons * Puddles work but are unpredicted and unoptimized * Fixes * Puddle code... * Actually dirty the slipComp for real * Sliding component done plus an extra suggestion from ArtisticRoomba * Atomized Commit * Added Friction field to Reagent Prototype per design discussion * Cleaned up Working Commit * a * Delete stinkers * Fix this code smell * Reviewed * Funky re-save * Our conveyance * Better conveyor sleeping * Remove this * Revert "Better conveyor sleeping" This reverts commit f5281f64bbae95b7b9feb56295c5cf931f9fb2e1. * Revert that Way too janky * Also this * a * Working Commit - Still a lot to do * Acceleration refactor * Minor jetpack cleanup * frictionnomovement no longer nullable * Shared Mover Feels 99% done * OffGrid/Weightless/Throwing Friction saved * Fix merge conflicts * Fix a debug assert * Final Commit for today * Some fixes * Actually use those CCVars Properly * Need to fix throwing * Second to last Commit for real * Jetpack bug fixed * Jetpack bug fixed * Test fail patch * Small patch * Skates Component cleanup + Bring Accel back to 5 (oops) * Fix test fail oops * yaml cleanup make dragons not fat --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
committed by
GitHub
GitHub
parent
1fbc845126
commit
36030ef154
@@ -16,7 +16,6 @@ public abstract class SharedJetpackSystem : EntitySystem
|
||||
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
|
||||
[Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
|
||||
[Dependency] protected readonly SharedContainerSystem Container = default!;
|
||||
[Dependency] private readonly SharedMoverController _mover = default!;
|
||||
[Dependency] private readonly SharedPopupSystem _popup = default!;
|
||||
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
||||
[Dependency] private readonly ActionContainerSystem _actionContainer = default!;
|
||||
@@ -27,26 +26,31 @@ public abstract class SharedJetpackSystem : EntitySystem
|
||||
SubscribeLocalEvent<JetpackComponent, GetItemActionsEvent>(OnJetpackGetAction);
|
||||
SubscribeLocalEvent<JetpackComponent, DroppedEvent>(OnJetpackDropped);
|
||||
SubscribeLocalEvent<JetpackComponent, ToggleJetpackEvent>(OnJetpackToggle);
|
||||
SubscribeLocalEvent<JetpackComponent, CanWeightlessMoveEvent>(OnJetpackCanWeightlessMove);
|
||||
|
||||
SubscribeLocalEvent<JetpackUserComponent, RefreshWeightlessModifiersEvent>(OnJetpackUserWeightlessMovement);
|
||||
SubscribeLocalEvent<JetpackUserComponent, CanWeightlessMoveEvent>(OnJetpackUserCanWeightless);
|
||||
SubscribeLocalEvent<JetpackUserComponent, EntParentChangedMessage>(OnJetpackUserEntParentChanged);
|
||||
SubscribeLocalEvent<JetpackComponent, EntGotInsertedIntoContainerMessage>(OnJetpackMoved);
|
||||
|
||||
SubscribeLocalEvent<GravityChangedEvent>(OnJetpackUserGravityChanged);
|
||||
SubscribeLocalEvent<JetpackComponent, MapInitEvent>(OnMapInit);
|
||||
}
|
||||
|
||||
private void OnJetpackUserWeightlessMovement(Entity<JetpackUserComponent> ent, ref RefreshWeightlessModifiersEvent args)
|
||||
{
|
||||
// Yes this bulldozes the values but primarily for backwards compat atm.
|
||||
args.WeightlessAcceleration = ent.Comp.WeightlessAcceleration;
|
||||
args.WeightlessModifier = ent.Comp.WeightlessModifier;
|
||||
args.WeightlessFriction = ent.Comp.WeightlessFriction;
|
||||
args.WeightlessFrictionNoInput = ent.Comp.WeightlessFrictionNoInput;
|
||||
}
|
||||
|
||||
private void OnMapInit(EntityUid uid, JetpackComponent component, MapInitEvent args)
|
||||
{
|
||||
_actionContainer.EnsureAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
|
||||
Dirty(uid, component);
|
||||
}
|
||||
|
||||
private void OnJetpackCanWeightlessMove(EntityUid uid, JetpackComponent component, ref CanWeightlessMoveEvent args)
|
||||
{
|
||||
args.CanMove = true;
|
||||
}
|
||||
|
||||
private void OnJetpackUserGravityChanged(ref GravityChangedEvent ev)
|
||||
{
|
||||
var gridUid = ev.ChangedGridIndex;
|
||||
@@ -70,6 +74,12 @@ public abstract class SharedJetpackSystem : EntitySystem
|
||||
SetEnabled(uid, component, false, args.User);
|
||||
}
|
||||
|
||||
private void OnJetpackMoved(Entity<JetpackComponent> ent, ref EntGotInsertedIntoContainerMessage args)
|
||||
{
|
||||
if (args.Container.Owner != ent.Comp.JetpackUser)
|
||||
SetEnabled(ent, ent.Comp, false, ent.Comp.JetpackUser);
|
||||
}
|
||||
|
||||
private void OnJetpackUserCanWeightless(EntityUid uid, JetpackUserComponent component, ref CanWeightlessMoveEvent args)
|
||||
{
|
||||
args.CanMove = true;
|
||||
@@ -86,26 +96,33 @@ public abstract class SharedJetpackSystem : EntitySystem
|
||||
}
|
||||
}
|
||||
|
||||
private void SetupUser(EntityUid user, EntityUid jetpackUid)
|
||||
private void SetupUser(EntityUid user, EntityUid jetpackUid, JetpackComponent component)
|
||||
{
|
||||
var userComp = EnsureComp<JetpackUserComponent>(user);
|
||||
_mover.SetRelay(user, jetpackUid);
|
||||
EnsureComp<JetpackUserComponent>(user, out var userComp);
|
||||
component.JetpackUser = user;
|
||||
|
||||
if (TryComp<PhysicsComponent>(user, out var physics))
|
||||
_physics.SetBodyStatus(user, physics, BodyStatus.InAir);
|
||||
|
||||
userComp.Jetpack = jetpackUid;
|
||||
userComp.WeightlessAcceleration = component.Acceleration;
|
||||
userComp.WeightlessModifier = component.WeightlessModifier;
|
||||
userComp.WeightlessFriction = component.Friction;
|
||||
userComp.WeightlessFrictionNoInput = component.Friction;
|
||||
_movementSpeedModifier.RefreshWeightlessModifiers(user);
|
||||
}
|
||||
|
||||
private void RemoveUser(EntityUid uid)
|
||||
private void RemoveUser(EntityUid uid, JetpackComponent component)
|
||||
{
|
||||
if (!RemComp<JetpackUserComponent>(uid))
|
||||
return;
|
||||
|
||||
component.JetpackUser = null;
|
||||
|
||||
if (TryComp<PhysicsComponent>(uid, out var physics))
|
||||
_physics.SetBodyStatus(uid, physics, BodyStatus.OnGround);
|
||||
|
||||
RemComp<RelayInputMoverComponent>(uid);
|
||||
_movementSpeedModifier.RefreshWeightlessModifiers(uid);
|
||||
}
|
||||
|
||||
private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJetpackEvent args)
|
||||
@@ -145,42 +162,26 @@ public abstract class SharedJetpackSystem : EntitySystem
|
||||
{
|
||||
if (IsEnabled(uid) == enabled ||
|
||||
enabled && !CanEnable(uid, component))
|
||||
{
|
||||
return;
|
||||
|
||||
if (user == null)
|
||||
{
|
||||
if (!Container.TryGetContainingContainer((uid, null, null), out var container))
|
||||
return;
|
||||
user = container.Owner;
|
||||
}
|
||||
|
||||
if (enabled)
|
||||
{
|
||||
SetupUser(user.Value, uid, component);
|
||||
EnsureComp<ActiveJetpackComponent>(uid);
|
||||
}
|
||||
else
|
||||
{
|
||||
RemoveUser(user.Value, component);
|
||||
RemComp<ActiveJetpackComponent>(uid);
|
||||
}
|
||||
|
||||
if (user == null)
|
||||
{
|
||||
Container.TryGetContainingContainer((uid, null, null), out var container);
|
||||
user = container?.Owner;
|
||||
}
|
||||
|
||||
// Can't activate if no one's using.
|
||||
if (user == null && enabled)
|
||||
return;
|
||||
|
||||
if (user != null)
|
||||
{
|
||||
if (enabled)
|
||||
{
|
||||
SetupUser(user.Value, uid);
|
||||
}
|
||||
else
|
||||
{
|
||||
RemoveUser(user.Value);
|
||||
}
|
||||
|
||||
_movementSpeedModifier.RefreshMovementSpeedModifiers(user.Value);
|
||||
}
|
||||
|
||||
Appearance.SetData(uid, JetpackVisuals.Enabled, enabled);
|
||||
Dirty(uid, component);
|
||||
|
||||
Reference in New Issue
Block a user