Allow configuring dream tunnel and seeker dash to not activate when using a green booster

Author: aonkeeper4

Loenn/lang/en_gb.lang

@@ -1098,6 +1098,16 @@ triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.a
 triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.redirectConsumesNormalDash=Whether dream tunnel dash redirects should consume the player's normal dashes instead of their dream tunnel dashes.
 triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.allowTransitions=Whether to allow screen transitions while dream tunnel dashing.
 triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.bounceOnCollision=Whether the player should bounce on collision with a dream block while dream tunnel dashing.
+triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.respectBoosters=If enabled, dashing via a green booster will not trigger a dream tunnel dash.
+triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.revertOnLeave=Whether to revert this trigger's effects when the player leaves it.
+triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.revertOnDeath=Whether to revert this trigger's effects when the player dies.
+triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.onlyOnce=Whether this trigger should only activate once per room load.
+triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.flag=The flag this trigger should react to. Leave empty for this trigger to not be affected by flags.
+triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.flagInverted=If checked, the trigger will be disabled when the flag is active.\nIf unchecked, the trigger will be enabled when the flag is active.
+
+# Configure Seeker Dash Trigger
+triggers.CommunalHelper/ConfigureSeekerDashTrigger.placements.name.trigger=Configure Seeker Dash
+triggers.CommunalHelper/ConfigureSeekerDashTrigger.attributes.description.respectBoosters=If enabled, dashing via a green booster will not trigger a seeker dash.
 triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.revertOnLeave=Whether to revert this trigger's effects when the player leaves it.
 triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.revertOnDeath=Whether to revert this trigger's effects when the player dies.
 triggers.CommunalHelper/ConfigureDreamTunnelDashTrigger.attributes.description.onlyOnce=Whether this trigger should only activate once per room load.

Loenn/triggers/configure_dream_tunnel_dash.lua

@@ -14,6 +14,7 @@ return {
                 redirectConsumesNormalDash = false,
                 allowTransitions = false,
                 bounceOnCollision = false,
+                respectBoosters = false,
                 revertOnLeave = false,
                 revertOnDeath = false,
                 onlyOnce = false,
@@ -36,7 +37,8 @@ return {
         "x", "y", "width", "height",
         "allowRedirect", "allowSameDirectionRedirect", "sameDirectionSpeedMultiplier", "redirectConsumesNormalDash",
         "useEntryDirection", "speedConfiguration", "customSpeed",
-        "allowDashCancels", "allowTransitions", "bounceOnCollision",
+        "allowDashCancels", "allowTransitions",
+        "bounceOnCollision", "respectBoosters",
         "revertOnLeave", "revertOnDeath", "onlyOnce",
         "flag", "flagInverted",
     },

Loenn/triggers/configure_seeker_dash.lua

@@ -0,0 +1,22 @@
+return {
+    name = "CommunalHelper/ConfigureSeekerDashTrigger",
+    placements = {
+        {
+            name = "trigger",
+            data = {
+                respectBoosters = false,
+                revertOnLeave = false,
+                revertOnDeath = false,
+                onlyOnce = false,
+                flag = "",
+                flagInverted = false,
+            }
+        }
+    },
+    fieldOrder = {
+        "x", "y", "width", "height",
+        "respectBoosters",
+        "revertOnLeave", "revertOnDeath", "onlyOnce",
+        "flag", "flagInverted",
+    },
+}

src/CommunalHelperSession.cs

@@ -28,6 +28,8 @@ public class CommunalHelperSession : EverestModuleSession
 
     public DashStates.DreamTunnelDash.DreamTunnelDashConfiguration CurrentDreamTunnelDashConfiguration { get; set; } = DashStates.DreamTunnelDash.DefaultDreamTunnelDashConfiguration;
 
+    public DashStates.SeekerDash.SeekerDashConfiguration CurrentSeekerDashConfiguration { get; set; } = DashStates.SeekerDash.DefaultSeekerDashConfiguration;
+    
     internal float PrevGasTimer { get; set; }
     public float GasTimer { get; set; }
 

src/DashStates/DreamTunnelDash/DreamTunnelDash.cs

@@ -79,6 +79,7 @@ public struct DreamTunnelDashConfiguration
         public bool RedirectConsumesNormalDash;
         public bool AllowTransitions;
         public bool BounceOnCollision;
+        public bool RespectBoosters;
     }
 
     public static readonly DreamTunnelDashConfiguration DefaultDreamTunnelDashConfiguration = new()
@@ -92,7 +93,8 @@ public struct DreamTunnelDashConfiguration
         AllowDashCancels = false,
         RedirectConsumesNormalDash = false,
         AllowTransitions = false,
-        BounceOnCollision = false
+        BounceOnCollision = false,
+        RespectBoosters = false
     };
 
 
@@ -234,6 +236,9 @@ private static void UseDreamTunnelDash()
     private static void Player_DashBegin(On.Celeste.Player.orig_DashBegin orig, Player self)
     {
         orig(self);
+        
+        if (CommunalHelperModule.Session.CurrentDreamTunnelDashConfiguration.RespectBoosters && self.CurrentBooster is not null)
+            return;
 
         UseDreamTunnelDash();
         if (!CommunalHelperModule.Session.CurrentDreamTunnelDashConfiguration.AllowDashCancels)
@@ -263,13 +268,16 @@ private static void Player_DashCoroutine(ILContext il)
          * inserts a call to StartDreamTunnelDashAttacking (without overriding Speed and DashDir) after the call to CallDashEvents if the current dream dash config allows dash cancels
          * is this the best place to put this logic?
          */
-        ILLabel afterStartDashAttack = cursor.DefineLabel();
         cursor.GotoNext(MoveType.After, instr => instr.MatchCallvirt<Player>("CallDashEvents"));
-        cursor.EmitDelegate(() => CommunalHelperModule.Session.CurrentDreamTunnelDashConfiguration.AllowDashCancels);
-        cursor.Emit(OpCodes.Brfalse, afterStartDashAttack);
         cursor.Emit(OpCodes.Ldloc_1);
-        cursor.EmitDelegate<Action<Player>>(player => StartDreamTunnelDashAttacking(player, player.DashDir));
-        cursor.MarkLabel(afterStartDashAttack);
+        cursor.EmitDelegate<Action<Player>>(player =>
+        {
+            if (CommunalHelperModule.Session.CurrentDreamTunnelDashConfiguration.RespectBoosters && player.CurrentBooster is not null)
+                return;
+            
+            if (CommunalHelperModule.Session.CurrentDreamTunnelDashConfiguration.AllowDashCancels)
+                StartDreamTunnelDashAttacking(player, player.DashDir);
+        });
 
         /*
          * adds a check for !dreamTunnelDashAttacking to

src/DashStates/SeekerDash/SeekerDash.cs

@@ -35,6 +35,16 @@ public static bool HasSeekerDash
     private static readonly FieldInfo f_Seeker_dead = typeof(Seeker).GetField("dead", BindingFlags.NonPublic | BindingFlags.Instance);
 
     private static IDetour hook_Player_get_CanDash;
+    
+    public struct SeekerDashConfiguration
+    {
+        public bool RespectBoosters;
+    }
+
+    public static readonly SeekerDashConfiguration DefaultSeekerDashConfiguration = new()
+    {
+        RespectBoosters = false
+    };
 
     internal static void Load()
     {
@@ -167,6 +177,10 @@ private static bool Player_get_CanDash(Func<Player, bool> orig, Player self)
     private static void Player_DashBegin(On.Celeste.Player.orig_DashBegin orig, Player self)
     {
         orig(self);
+
+        if (CommunalHelperModule.Session.CurrentSeekerDashConfiguration.RespectBoosters && self.CurrentBooster is not null)
+            return;
+        
         if (HasSeekerDash)
         {
             seekerDashAttacking = true;

src/Triggers/ConfigureDreamTunnelDashTrigger.cs

@@ -22,7 +22,8 @@ protected override DreamTunnelDashConfiguration GetConfiguredOptions(EntityData
             AllowDashCancels = data.Bool("allowDashCancels", false),
             RedirectConsumesNormalDash = data.Bool("redirectConsumesNormalDash", false),
             AllowTransitions = data.Bool("allowTransitions", false),
-            BounceOnCollision = data.Bool("bounceOnCollision", false)
+            BounceOnCollision = data.Bool("bounceOnCollision", false),
+            RespectBoosters = data.Bool("respectBoosters", false)
         };
     protected override DreamTunnelDashConfiguration GetCurrentOptions(Player player)
         => CommunalHelperModule.Session.CurrentDreamTunnelDashConfiguration;
@@ -41,7 +42,8 @@ protected override DreamTunnelDashConfigurationChanges CalculateChangesNeededToR
             NewAllowDashCancels = to.AllowDashCancels == from.AllowDashCancels ? null : from.AllowDashCancels,
             NewRedirectConsumesNormalDash = to.RedirectConsumesNormalDash == from.RedirectConsumesNormalDash ? null : from.RedirectConsumesNormalDash,
             NewAllowTransitions = to.AllowTransitions == from.AllowTransitions ? null : from.AllowTransitions,
-            NewBounceOnCollision = to.BounceOnCollision == from.BounceOnCollision ? null : from.BounceOnCollision
+            NewBounceOnCollision = to.BounceOnCollision == from.BounceOnCollision ? null : from.BounceOnCollision,
+            NewRespectBoosters = to.RespectBoosters == from.RespectBoosters ? null : from.RespectBoosters
         };
     protected override DreamTunnelDashConfiguration RevertChanges(DreamTunnelDashConfiguration current, DreamTunnelDashConfigurationChanges? changesNeededToRevert)
         => new()
@@ -55,7 +57,8 @@ protected override DreamTunnelDashConfiguration RevertChanges(DreamTunnelDashCon
             AllowDashCancels = changesNeededToRevert?.NewAllowDashCancels ?? current.AllowDashCancels,
             RedirectConsumesNormalDash = changesNeededToRevert?.NewRedirectConsumesNormalDash ?? current.RedirectConsumesNormalDash,
             AllowTransitions = changesNeededToRevert?.NewAllowTransitions ?? current.AllowTransitions,
-            BounceOnCollision = changesNeededToRevert?.NewBounceOnCollision ?? current.BounceOnCollision
+            BounceOnCollision = changesNeededToRevert?.NewBounceOnCollision ?? current.BounceOnCollision,
+            RespectBoosters = changesNeededToRevert?.NewRespectBoosters ?? current.RespectBoosters
         };
 }
 
@@ -71,4 +74,5 @@ public struct DreamTunnelDashConfigurationChanges
     public bool? NewRedirectConsumesNormalDash;
     public bool? NewAllowTransitions;
     public bool? NewBounceOnCollision;
+    public bool? NewRespectBoosters;
 }

src/Triggers/ConfigureSeekerDashTrigger.cs

@@ -0,0 +1,38 @@
+using static Celeste.Mod.CommunalHelper.DashStates.SeekerDash;
+
+namespace Celeste.Mod.CommunalHelper.Triggers;
+
+[CustomEntity("CommunalHelper/ConfigureSeekerDashTrigger")]
+[TrackedAs(typeof(AbstractConfigureStateTrigger<SeekerDashConfiguration, SeekerDashConfigurationChanges>))]
+public class ConfigureSeekerDashTrigger : AbstractConfigureStateTrigger<SeekerDashConfiguration, SeekerDashConfigurationChanges>
+{
+    public ConfigureSeekerDashTrigger(EntityData data, Vector2 offset)
+        : base(data, offset)
+    { }
+
+    protected override SeekerDashConfiguration GetConfiguredOptions(EntityData data)
+        => new()
+        {
+            RespectBoosters = data.Bool("respectBoosters", false)
+        };
+    protected override SeekerDashConfiguration GetCurrentOptions(Player player)
+        => CommunalHelperModule.Session.CurrentSeekerDashConfiguration;
+    protected override void SaveOptions(Player player, SeekerDashConfiguration options)
+        => CommunalHelperModule.Session.CurrentSeekerDashConfiguration = options;
+
+    protected override SeekerDashConfigurationChanges CalculateChangesNeededToRevert(SeekerDashConfiguration from, SeekerDashConfiguration to)
+        => new()
+        {
+            NewRespectBoosters = to.RespectBoosters == from.RespectBoosters ? null : from.RespectBoosters
+        };
+    protected override SeekerDashConfiguration RevertChanges(SeekerDashConfiguration current, SeekerDashConfigurationChanges? changesNeededToRevert)
+        => new()
+        {
+            RespectBoosters = changesNeededToRevert?.NewRespectBoosters ?? current.RespectBoosters
+        };
+}
+
+public struct SeekerDashConfigurationChanges
+{
+    public bool? NewRespectBoosters;
+}