Merge pull request #116 from EverestAPI/remove-light-source-fix

Fix remove light source trigger

Author: 0x0ade

Ahorn/lang/en_gb.lang

@@ -45,9 +45,6 @@ placements.triggers.SpringCollab2020/SmoothCameraOffsetTrigger.tooltips.offsetYT
 placements.triggers.SpringCollab2020/SmoothCameraOffsetTrigger.tooltips.positionMode=The fade direction.
 placements.triggers.SpringCollab2020/SmoothCameraOffsetTrigger.tooltips.onlyOnce=If checked, the trigger will be disabled when the player first leaves it.
 
-# Remove Light Sources Trigger
-placements.triggers.SpringCollab2020/RemoveLightSourcesTrigger.tooltips.persistent=If checked, all light sources will stay disabled even after leaving the trigger.
-
 # Dash Spring
 placements.entities.SpringCollab2020/dashSpring.tooltips.playerCanUse=Determines whether the player is able to interact with the spring.
 

Ahorn/triggers/removeLightSourcesTrigger.jl

@@ -2,7 +2,7 @@
 
 using ..Ahorn, Maple
 
-@mapdef Trigger "SpringCollab2020/RemoveLightSourcesTrigger" RemoveLightSourcesTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight, persistent::Bool=true)
+@mapdef Trigger "SpringCollab2020/RemoveLightSourcesTrigger" RemoveLightSourcesTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight)
 
 const placements = Ahorn.PlacementDict(
     "Remove Light Sources (Spring Collab 2020)" => Ahorn.EntityPlacement(

Triggers/RemoveLightSourcesTrigger.cs

@@ -1,14 +1,13 @@
 using Celeste.Mod.Entities;
 using Monocle;
 using Microsoft.Xna.Framework;
-using System.Collections.Generic;
+using System.Reflection;
 
 namespace Celeste.Mod.SpringCollab2020.Triggers {
     [CustomEntity("SpringCollab2020/RemoveLightSourcesTrigger")]
     [Tracked]
     class RemoveLightSourcesTrigger : Trigger {
         public RemoveLightSourcesTrigger(EntityData data, Vector2 offset) : base(data, offset) {
-            Persistent = data.Bool("persistent", true);
             level = SceneAs<Level>();
         }
 
@@ -23,75 +22,43 @@ public static void Unload() {
         }
 
         private static void LevelLoadHandler(Level loadedLevel, Player.IntroTypes playerIntro, bool isFromLoader) {
-            if (loadedLevel.Session.GetFlag("lightsDisabled")) {
-                DisableAllLights(loadedLevel);
-                On.Celeste.Level.TransitionTo += TransitionLightSources;
-            }
+            if (loadedLevel.Session.GetFlag("lightsDisabled"))
+                DisableLightRender();
         }
 
         private static void OnExitHandler(Level exitLevel, LevelExit exit, LevelExit.Mode mode, Session session, HiresSnow snow) {
-            On.Celeste.Level.TransitionTo -= TransitionLightSources;
+            EnableLightRender();
         }
 
-        private static void TransitionLightSources(On.Celeste.Level.orig_TransitionTo orig, Level transitionLevel, LevelData next, Vector2 direction) {
-            lightSources = new List<Component>();
-            bloomSources = new List<Component>();
+        private static void BloomRendererHook(On.Celeste.BloomRenderer.orig_Apply orig, BloomRenderer self, VirtualRenderTarget target, Scene scene) { }
 
-            DisableAllLights(transitionLevel);
-            orig(transitionLevel, next, direction);
+        private static void LightHook(On.Celeste.VertexLight.orig_Update orig, VertexLight self) {
+            if (self.SceneAs<Level>().Session.GetFlag("lightsDisabled"))
+                self.Alpha = 0f;
+            orig(self);
         }
 
-        private static void DisableAllLights(Level disableLevel) {
-            EntityList entities = disableLevel.Entities;
-
-            foreach (Entity entity in entities) {
-                foreach (Component component in entity.Components.ToArray()) {
-                    if (component is VertexLight) {
-                        lightSources.Add(component);
-                        component.Visible = false;
-                    }
+        private static void EnableLightRender() {
+            On.Celeste.VertexLight.Update -= LightHook;
+            On.Celeste.BloomRenderer.Apply -= BloomRendererHook;
+        }
 
-                    if (component is BloomPoint) {
-                        bloomSources.Add(component);
-                        component.Visible = false;
-                    }
-                }
-            }
+        private static void DisableLightRender() {
+            On.Celeste.VertexLight.Update += LightHook;
+            On.Celeste.BloomRenderer.Apply += BloomRendererHook;
         }
 
         public override void OnEnter(Player player) {
             base.OnEnter(player);
 
             level = SceneAs<Level>();
 
-            if (Persistent && level.Session.GetFlag("lightsDisabled") == false)
-                On.Celeste.Level.TransitionTo += TransitionLightSources;
-
-            if (Persistent)
+            if (level.Session.GetFlag("lightsDisabled") == false) {
                 level.Session.SetFlag("lightsDisabled", true);
-
-            DisableAllLights(level);
-        }
-
-        public override void OnLeave(Player player) {
-            base.OnLeave(player);
-
-            if (Persistent || level.Session.GetFlag("lightsDisabled") == true)
-                return;
-
-            foreach (Component component in lightSources)
-                component.Visible = true;
-
-            foreach (Component component in bloomSources)
-                component.Visible = true;
+                DisableLightRender();
+            }
         }
 
-        private static List<Component> lightSources = new List<Component>();
-
-        private static List<Component> bloomSources = new List<Component>();
-
         private Level level;
-
-        private bool Persistent = true;
     }
 }