v1.9.4

MovementOvershootAssistant now supports Inverted Gravity and DreamTunnelDashState

Author: LozenChen

Source/Gameplay/MovementOvershootAssistant.cs

@@ -1,4 +1,5 @@
 using Celeste.Mod.TASHelper.Module.Menu;
+using Celeste.Mod.TASHelper.Utils;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Mono.Cecil.Cil;
@@ -23,6 +24,8 @@ internal static class MovementOvershootAssistant {
     // your no_obs_position is what your position will be after MoveH/V(Speed.X/Y * Engine.DeltaTime, onCollideH/V), AS IF onCollideH/V is null.
     // Movements after this are not considered (e.g. player collider, moving block pushing)
 
+    // it behaves similar to ActualCollideHitbox if there's only moving blocks pushing/carrying you, but a bit different if you collide into solids on your own
+
     [Initialize]
     private static void Initialize() {
         ILHookConfig config = default;
@@ -93,12 +96,12 @@ private static void GetNoObsPosition(Player player) {
         if (MOA_Renderer.Instance is not { } renderer) {
             return;
         }
-        IsDreamDash = player.StateMachine.State == 9 || player.StateMachine.State == 22;
+        IsDreamDash = player.StateMachine.State == 9 || player.StateMachine.State == 22 || player.StateMachine.state.IsDreamTunnelDashState();
         if (IsDreamDash) {
             renderer.Visible = false;
             return;
         }
-        NoObsPosition = NaiveMove(player.Position, player.movementCounter, player.Speed * Engine.DeltaTime);
+        NoObsPosition = NaiveMove(player.Position, player.movementCounter, player.Speed.GetGravityAffectedVector2() * Engine.DeltaTime);
         renderer.unselectableCollider = player.Collider.Clone();
         renderer.Position = NoObsPosition;
     }

Source/Module/WhatsNew.cs

@@ -58,6 +58,7 @@ public static void CreateUpdateLog() {
         AddLog("1.9.1", "Rename some internal class names to resolve some custom info issues.");
         AddLog("1.9.2", "Bugfix: Predictor doesn't work properly when encountering Strawberry Jam Wonky Cassette Blocks.");
         AddLog("1.9.3", "Bugfix: Predictor makes BGSwitch related tas desync.", "Feature: Predictor now supports most common commands. (\"Set\", \"Invoke\", \"Console\", \"Mouse\", \"Press\", \"Gun\", \"EvalLua\")");
+        AddLog("1.9.4", "MovementOvershootAssistant now supports Inverted Gravity and DreamTunnelDashState.");
         UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));
     }
 

Source/Utils/HookHelper.cs

@@ -131,6 +131,7 @@ private static void CreateOnHook() {
         private static void Unload() {
             On.Monocle.Scene.BeforeUpdate -= OnBeforeUpdate;
             On.Monocle.Scene.AfterUpdate -= OnAfterUpdate;
+            BeforeUpdate = AfterUpdate = null;
         }
 
         private static void OnBeforeUpdate(On.Monocle.Scene.orig_BeforeUpdate orig, Monocle.Scene self) {
@@ -172,6 +173,10 @@ internal static class _Level {
 
         [Initialize]
         private static void Initialize() {
+            LoadLevel = LoadLevel_Before = null;
+            LoadLevel_Parameter0 = LoadLevel_Before_Parameter0 = null;
+            LoadLevel_Parameter1 = LoadLevel_Before_Parameter1 = null;
+            LoadLevel_Parameter2 = LoadLevel_Before_Parameter2 = null;
             foreach (MethodInfo method in typeof(AttributeUtils).Assembly.GetTypesSafe().SelectMany(type => type
             .GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))) {
                 if (method.GetCustomAttribute<LoadLevelAttribute>() is not LoadLevelAttribute attr) {
@@ -282,6 +287,9 @@ internal static class _EntityList {
 
         [Initialize]
         private static void Initialize() {
+            DebugRender = null;
+            DebugRender_Parameter0 = null;
+            DebugRender_Parameter1 = null;
             foreach (MethodInfo method in typeof(AttributeUtils).Assembly.GetTypesSafe().SelectMany(type => type
             .GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)).Where(method => method.GetCustomAttribute<AddDebugRenderAttribute>() is { })) {
                 switch (method.GetParameters().Length) {

Source/Utils/ModImports.cs

@@ -0,0 +1,36 @@
+using Microsoft.Xna.Framework;
+using MonoMod.ModInterop;
+
+namespace Celeste.Mod.TASHelper.Utils;
+
+public static class ModImports {
+    public static bool IsPlayerInverted => GravityHelperImport.IsPlayerInverted?.Invoke() ?? false;
+
+    public static Vector2 GetGravityAffectedVector2(this Vector2 vec) {
+        if (IsPlayerInverted) {
+            return new Vector2(vec.X, -vec.Y);
+        }
+        return vec;
+    }
+
+    public static bool IsDreamTunnelDashState(this int state) => CommunalHelperDashStates.GetDreamTunnelDashState?.Invoke() == state;
+
+    [Initialize]
+    private static void Initialize() {
+        typeof(GravityHelperImport).ModInterop();
+        typeof(CommunalHelperDashStates).ModInterop();
+    }
+}
+
+
+[ModImportName("GravityHelper")]
+internal static class GravityHelperImport {
+    public static Func<bool> IsPlayerInverted;
+}
+
+[ModImportName("CommunalHelper.DashStates")]
+public static class CommunalHelperDashStates {
+    public static Func<int> GetDreamTunnelDashState;
+
+    public static Func<int> HasDreamTunnelDash;
+}

everest.yaml

@@ -1,5 +1,5 @@
 - Name: TASHelper
-  Version: 1.9.3
+  Version: 1.9.4
   DLL: bin/Release/net4.5.2/TASHelper.dll
   Dependencies:
     - Name: Everest