Skip to content

Commit

Permalink
Bump everest.yaml version
Browse files Browse the repository at this point in the history
  • Loading branch information
maddie480 committed Mar 22, 2024
1 parent 31bfd43 commit e86b787
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
20 changes: 0 additions & 20 deletions Entities/SidewaysJumpThru.cs
Original file line number Diff line number Diff line change
Expand Up @@ -159,31 +159,11 @@ private static void addSidewaysJumpthrusInHorizontalMoveMethods(ILContext il) {
}
}

private static bool checkCollisionWithSidewaysJumpthruWhileMoving(Entity self, int moveDirection, bool movingLeftToRight) {
// check if colliding with a sideways jumpthru
SidewaysJumpThru jumpThru = self.CollideFirstOutside<SidewaysJumpThru>(self.Position + Vector2.UnitX * moveDirection);
if (jumpThru != null && jumpThru.AllowLeftToRight != movingLeftToRight && (!(self is Seeker) || !jumpThru.letSeekersThrough)) {
// there is a sideways jump-thru and we are moving in the opposite direction => collision
if (self is Player player && player.DashAttacking && jumpThru is AttachedSidewaysJumpThru attachedSidewaysJumpThru) {
// attached sideways jumpthrus potentially have a callback to call when the player is dashing into them.
attachedSidewaysJumpThru.OnDashCollide?.Invoke(player, Vector2.UnitX * moveDirection);
}
return true;
}

return false;
}

private static SidewaysJumpThru getCollisionWithSidewaysJumpthruWhileMoving(Entity self, int moveDirection, bool movingLeftToRight) {
// check if colliding with a sideways jumpthru
SidewaysJumpThru jumpThru = self.CollideFirstOutside<SidewaysJumpThru>(self.Position + Vector2.UnitX * moveDirection);
if (jumpThru != null && jumpThru.AllowLeftToRight != movingLeftToRight && (!(self is Seeker) || !jumpThru.letSeekersThrough)) {
// there is a sideways jump-thru and we are moving in the opposite direction => collision
//if (self is Player player && player.DashAttacking && jumpThru is AttachedSidewaysJumpThru attachedSidewaysJumpThru) {
// attached sideways jumpthrus potentially have a callback to call when the player is dashing into them.
// but return value is discarded.
// attachedSidewaysJumpThru.OnDashCollide?.Invoke(player, Vector2.UnitX * moveDirection);
//}
return jumpThru;
}

Expand Down
2 changes: 1 addition & 1 deletion everest.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The mod used to be known as "max480's Helping Hand", and wasn't renamed for compatibility reasons
- Name: MaxHelpingHand
Version: 1.29.4
Version: 1.29.5
DLL: bin/Release/net452/MaxHelpingHand.dll
Dependencies:
- Name: Everest
Expand Down

0 comments on commit e86b787

Please sign in to comment.