Skip to content

Move hooks on UpdateSprite to orig_UpdateSprite on Everest 1432+ #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0x0ade merged 1 commit into from
Mar 6, 2020
Merged

Move hooks on UpdateSprite to orig_UpdateSprite on Everest 1432+ #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Entities/SidewaysJumpThru.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ namespace Celeste.Mod.SpringCollab2020.Entities {
[Tracked]
class SidewaysJumpThru : Entity {

private static ILHook hookOnUpdateSprite;

private static FieldInfo actorMovementCounter = typeof(Actor).GetField("movementCounter", BindingFlags.Instance | BindingFlags.NonPublic);

public static void Load() {
string updateSpriteMethodToPatch = Everest.Loader.DependencyLoaded(new EverestModuleMetadata { Name = "Everest", Version = new Version(1, 1432) }) ?
"orig_UpdateSprite" : "UpdateSprite";

// implement the basic collision between actors/platforms and sideways jumpthrus.
using (new DetourContext { Before = { "*" } }) { // these don't always call the orig methods, better apply them first.
On.Celeste.Actor.MoveHExact += onActorMoveHExact;
Expand All @@ -31,10 +36,12 @@ public static void Load() {
IL.Celeste.Player.ClimbBegin += modCollideChecks; // if not applied, the player will clip through jumpthrus if trying to climb on them
IL.Celeste.Player.ClimbUpdate += modCollideChecks; // when climbing, jumpthrus are handled like walls
IL.Celeste.Player.SlipCheck += modCollideChecks; // make climbing on jumpthrus not slippery
IL.Celeste.Player.UpdateSprite += modCollideChecks; // have the push animation when Madeline runs against a jumpthru for example
IL.Celeste.Player.NormalUpdate += modCollideChecks; // get the wall slide effect
IL.Celeste.Player.OnCollideH += modCollideChecks; // handle dashes against jumpthrus properly, without "shifting" down

// have the push animation when Madeline runs against a jumpthru for example
hookOnUpdateSprite = new ILHook(typeof(Player).GetMethod(updateSpriteMethodToPatch, BindingFlags.NonPublic | BindingFlags.Instance), modCollideChecks);

// one extra hook that kills the player momentum when hitting a jumpthru so that they don't get "stuck" on them.
On.Celeste.Player.NormalUpdate += onPlayerNormalUpdate;
}
Expand All @@ -50,9 +57,9 @@ public static void Unload() {
IL.Celeste.Player.ClimbBegin -= modCollideChecks;
IL.Celeste.Player.ClimbUpdate -= modCollideChecks;
IL.Celeste.Player.SlipCheck -= modCollideChecks;
IL.Celeste.Player.UpdateSprite -= modCollideChecks;
IL.Celeste.Player.NormalUpdate -= modCollideChecks;
IL.Celeste.Player.OnCollideH -= modCollideChecks;
hookOnUpdateSprite?.Dispose();

On.Celeste.Player.NormalUpdate -= onPlayerNormalUpdate;
}
Expand Down