Have the lava check for lava blocker triggers itself

Author: maddie480

Entities/SidewaysLava.cs

@@ -1,9 +1,9 @@
 using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
 using Monocle;
-using MonoMod.Utils;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
     /// <summary>
@@ -16,41 +16,17 @@ namespace Celeste.Mod.SpringCollab2020.Entities {
     /// </summary>
     [CustomEntity("SpringCollab2020/SidewaysLava")]
     class SidewaysLava : Entity {
-
-        private static List<DynData<SidewaysLava>> sidewaysLavas = new List<DynData<SidewaysLava>>();
-
-        public static void Load() {
-            On.Celeste.Mod.Entities.LavaBlockerTrigger.Awake += onLavaBlockerTriggerAwake;
-            On.Celeste.Mod.Entities.LavaBlockerTrigger.OnStay += onLavaBlockerTriggerStay;
-        }
-
-        public static void Unload() {
-            On.Celeste.Mod.Entities.LavaBlockerTrigger.Awake -= onLavaBlockerTriggerAwake;
-            On.Celeste.Mod.Entities.LavaBlockerTrigger.OnStay -= onLavaBlockerTriggerStay;
-        }
-
-        private static void onLavaBlockerTriggerAwake(On.Celeste.Mod.Entities.LavaBlockerTrigger.orig_Awake orig, LavaBlockerTrigger self, Scene scene) {
-            orig(self, scene);
-
-            // look up for sideways lavas as well.
-            sidewaysLavas = scene.Entities.FindAll<SidewaysLava>().Select(lava => new DynData<SidewaysLava>(lava as SidewaysLava)).ToList();
-        }
-
-        private static void onLavaBlockerTriggerStay(On.Celeste.Mod.Entities.LavaBlockerTrigger.orig_OnStay orig, LavaBlockerTrigger self, Player player) {
-            orig(self, player);
-
-            // block sideways lava as well.
-            foreach (DynData<SidewaysLava> data in sidewaysLavas)
-                if (data.IsAlive)
-                    data.Set("waiting", true);
-        }
+        private static FieldInfo lavaBlockerTriggerEnabled = typeof(LavaBlockerTrigger).GetField("enabled", BindingFlags.NonPublic | BindingFlags.Instance);
 
         private enum LavaMode {
             LeftToRight, RightToLeft, Sandwich
         }
 
         private const float Speed = 30f;
 
+        // if the player collides with one of those, lava should be forced into waiting.
+        private List<LavaBlockerTrigger> lavaBlockerTriggers;
+
         // atrributes
         private bool intro;
         private LavaMode lavaMode;
@@ -132,8 +108,12 @@ public SidewaysLava(EntityData data, Vector2 offset) {
                             sandwichLeaving = true;
                             Collidable = false;
                             Alarm.Set(this, 2f, () => RemoveSelf());
+                        } else {
+                            sandwichTransferred = false;
+
+                            // look up for all lava blocker triggers in the next room.
+                            lavaBlockerTriggers = Scene.Entities.OfType<LavaBlockerTrigger>().ToList();
                         }
-                        sandwichTransferred = false;
                     },
                     OnOut = progress => {
                         if (Scene != null) {
@@ -228,6 +208,9 @@ public override void Awake(Scene scene) {
             if (intro) {
                 Visible = true;
             }
+
+            // look up for all lava blocker triggers in the room.
+            lavaBlockerTriggers = scene.Entities.OfType<LavaBlockerTrigger>().ToList();
         }
 
         private void OnChangeMode(Session.CoreModes mode) {
@@ -278,9 +261,18 @@ public override void Update() {
             base.Update();
             Visible = true;
 
+            Player player = Scene.Tracker.GetEntity<Player>();
+            if (player != null) {
+                LavaBlockerTrigger collidedTrigger = lavaBlockerTriggers.Find(trigger => player.CollideCheck(trigger));
+
+                if (collidedTrigger != null && (bool) lavaBlockerTriggerEnabled.GetValue(collidedTrigger)) {
+                    // player is in a lava blocker trigger and it is enabled; block the lava.
+                    waiting = true;
+                }
+            }
+
             if (waiting) {
                 loopSfx.Param("rising", 0f);
-                Player player = Scene.Tracker.GetEntity<Player>();
 
                 // the sandwich lava fade in animation is not handled here.
                 if (lavaMode != LavaMode.Sandwich) {

Entities/SidewaysLavaRect.cs

@@ -278,8 +278,8 @@ public override void Render() {
                     else
                         x = 1f - Wave(bubbleOffset, Height);
 
-                    surfaceBubbleTexture.DrawJustified(rectPosition + 
-                        new Vector2(x,  OnlyMode == OnlyModes.OnlyRight ? Height - bubbleOffset * SurfaceStep : bubbleOffset * SurfaceStep),
+                    surfaceBubbleTexture.DrawJustified(rectPosition +
+                        new Vector2(x, OnlyMode == OnlyModes.OnlyRight ? Height - bubbleOffset * SurfaceStep : bubbleOffset * SurfaceStep),
                         new Vector2(1f, 0.5f), SurfaceColor);
                 }
             }

SpringCollab2020Module.cs

@@ -20,7 +20,6 @@ public override void Load() {
             UpsideDownJumpThru.Load();
             BubbleReturnBerry.Load();
             SidewaysJumpThru.Load();
-            SidewaysLava.Load();
         }
 
         public override void LoadContent(bool firstLoad) {
@@ -39,7 +38,6 @@ public override void Unload() {
             UpsideDownJumpThru.Unload();
             BubbleReturnBerry.Unload();
             SidewaysJumpThru.Unload();
-            SidewaysLava.Unload();
         }
     }
 }