Merge branch 'master' into integrate_map_specific_code_mods

Author: maddie480

Ahorn/effects/heatWaveNoColorGrade.jl

@@ -0,0 +1,13 @@
+module SpringCollab2020HeatWaveNoColorGrade
+
+using ..Ahorn, Maple
+
+@mapdef Effect "SpringCollab2020/HeatWaveNoColorGrade" HeatWaveNoColorGrade(only::String="*", exclude::String="")
+
+placements = HeatWaveNoColorGrade
+
+function Ahorn.canFgBg(effect::HeatWaveNoColorGrade)
+    return true, true
+end
+
+end

Effects/HeatWaveNoColorGrade.cs

@@ -0,0 +1,46 @@
+using Monocle;
+using MonoMod.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Celeste.Mod.SpringCollab2020.Effects {
+    /// <summary>
+    /// A heatwave effect that does not affect the colorgrade when it is hidden.
+    /// </summary>
+    class HeatWaveNoColorGrade : HeatWave {
+        private DynData<HeatWave> self = new DynData<HeatWave>();
+
+        public HeatWaveNoColorGrade() : base() {
+            self = new DynData<HeatWave>(this);
+        }
+
+        public override void Update(Scene scene) {
+            Level level = scene as Level;
+            bool show = (IsVisible(level) && level.CoreMode != Session.CoreModes.None);
+
+            if (!show) {
+                // if not fading out, the heatwave is invisible, so don't even bother updating it.
+                if (self.Get<float>("fade") > 0) {
+                    // be sure to lock color grading to prevent it from becoming "none".
+                    DynData<Level> levelData = new DynData<Level>(level);
+
+                    float colorGradeEase = levelData.Get<float>("colorGradeEase");
+                    float colorGradeEaseSpeed = levelData.Get<float>("colorGradeEaseSpeed");
+                    string colorGrade = level.Session.ColorGrade;
+
+                    base.Update(scene);
+
+                    levelData["colorGradeEase"] = colorGradeEase;
+                    levelData["colorGradeEaseSpeed"] = colorGradeEaseSpeed;
+                    level.Session.ColorGrade = colorGrade;
+                }
+            } else {
+                // heat wave is visible: update as usual.
+                base.Update(scene);
+            }
+        }
+    }
+}

SpringCollab2020Module.cs

@@ -1,40 +1,42 @@
-using Celeste.Mod.SpringCollab2020.Entities;
-using Celeste.Mod.SpringCollab2020.Triggers;
+using Celeste.Mod.SpringCollab2020.Effects;
+using Celeste.Mod.SpringCollab2020.Entities;
+using Celeste.Mod.SpringCollab2020.Triggers;
 using Microsoft.Xna.Framework;
 using System;
 
-namespace Celeste.Mod.SpringCollab2020 {
-    public class SpringCollab2020Module : EverestModule {
-
+namespace Celeste.Mod.SpringCollab2020 {
+    public class SpringCollab2020Module : EverestModule {
+
         public static SpringCollab2020Module Instance;
 
         public override Type SessionType => typeof(SpringCollab2020Session);
         public SpringCollab2020Session Session => (SpringCollab2020Session) _Session;
 
-        public SpringCollab2020Module() {
-            Instance = this;
-        }
-
-        public override void Load() {
-            NoRefillField.Load();
-            FloatierSpaceBlock.Load();
-            MoveBlockBarrier.Load();
-            MoveBlockBarrierRenderer.Load();
-            RemoveLightSourcesTrigger.Load();
-            SafeRespawnCrumble.Load();
-            UpsideDownJumpThru.Load();
-            BubbleReturnBerry.Load();
-            SidewaysJumpThru.Load();
-            CrystalBombDetonatorRenderer.Load();
-            FlagTouchSwitch.Load();
-            DisableIcePhysicsTrigger.Load();
-            MultiRoomStrawberrySeed.Load();
-            MadelineSilhouetteTrigger.Load();
-            BlockJellySpawnTrigger.Load();
-            StrawberryIgnoringLighting.Load();
-            SeekerCustomColors.Load();
-            CameraCatchupSpeedTrigger.Load();
+        public SpringCollab2020Module() {
+            Instance = this;
+        }
+
+        public override void Load() {
+            NoRefillField.Load();
+            FloatierSpaceBlock.Load();
+            MoveBlockBarrier.Load();
+            MoveBlockBarrierRenderer.Load();
+            RemoveLightSourcesTrigger.Load();
+            SafeRespawnCrumble.Load();
+            UpsideDownJumpThru.Load();
+            BubbleReturnBerry.Load();
+            SidewaysJumpThru.Load();
+            CrystalBombDetonatorRenderer.Load();
+            FlagTouchSwitch.Load();
+            DisableIcePhysicsTrigger.Load();
+            MultiRoomStrawberrySeed.Load();
+            MadelineSilhouetteTrigger.Load();
+            BlockJellySpawnTrigger.Load();
+            StrawberryIgnoringLighting.Load();
+            SeekerCustomColors.Load();
+            CameraCatchupSpeedTrigger.Load();
             ColorGradeFadeTrigger.Load();
+            Everest.Events.Level.OnLoadBackdrop += onLoadBackdrop;
 
             DecalRegistry.AddPropertyHandler("scale", (decal, attrs) => {
                 Vector2 scale = decal.Scale;
@@ -45,42 +47,50 @@ public override void Load() {
                     scale /= float.Parse(attrs["divide"].Value);
                 }
                 decal.Scale = scale;
-            });
-        }
-
-        public override void LoadContent(bool firstLoad) {
-            base.LoadContent(firstLoad);
-            GlassBerry.LoadContent();
-            StrawberryIgnoringLighting.LoadContent();
-        }
-
-        public override void Unload() {
-            NoRefillField.Unload();
-            FloatierSpaceBlock.Unload();
-            MoveBlockBarrier.Unload();
-            MoveBlockBarrierRenderer.Unload();
-            RemoveLightSourcesTrigger.Unload();
-            SafeRespawnCrumble.Unload();
-            GlassBerry.Unload();
-            UpsideDownJumpThru.Unload();
-            BubbleReturnBerry.Unload();
-            SidewaysJumpThru.Unload();
-            CrystalBombDetonatorRenderer.Unload();
-            FlagTouchSwitch.Unload();
-            DisableIcePhysicsTrigger.Unload();
-            MultiRoomStrawberrySeed.Unload();
-            MadelineSilhouetteTrigger.Unload();
-            BlockJellySpawnTrigger.Unload();
-            StrawberryIgnoringLighting.Unload();
-            SeekerCustomColors.Unload();
-            CameraCatchupSpeedTrigger.Unload();
-            ColorGradeFadeTrigger.Unload();
-        }
-
+            });
+        }
+
+        public override void LoadContent(bool firstLoad) {
+            base.LoadContent(firstLoad);
+            GlassBerry.LoadContent();
+            StrawberryIgnoringLighting.LoadContent();
+        }
+
+        public override void Unload() {
+            NoRefillField.Unload();
+            FloatierSpaceBlock.Unload();
+            MoveBlockBarrier.Unload();
+            MoveBlockBarrierRenderer.Unload();
+            RemoveLightSourcesTrigger.Unload();
+            SafeRespawnCrumble.Unload();
+            GlassBerry.Unload();
+            UpsideDownJumpThru.Unload();
+            BubbleReturnBerry.Unload();
+            SidewaysJumpThru.Unload();
+            CrystalBombDetonatorRenderer.Unload();
+            FlagTouchSwitch.Unload();
+            DisableIcePhysicsTrigger.Unload();
+            MultiRoomStrawberrySeed.Unload();
+            MadelineSilhouetteTrigger.Unload();
+            BlockJellySpawnTrigger.Unload();
+            StrawberryIgnoringLighting.Unload();
+            SeekerCustomColors.Unload();
+            CameraCatchupSpeedTrigger.Unload();
+            ColorGradeFadeTrigger.Unload();
+            Everest.Events.Level.OnLoadBackdrop -= onLoadBackdrop;
+        }
+
+        private Backdrop onLoadBackdrop(MapData map, BinaryPacker.Element child, BinaryPacker.Element above) {
+            if (child.Name.Equals("SpringCollab2020/HeatWaveNoColorGrade", StringComparison.OrdinalIgnoreCase)) {
+                return new HeatWaveNoColorGrade();
+            }
+            return null;
+        }
+
         public override void PrepareMapDataProcessors(MapDataFixup context) {
             base.PrepareMapDataProcessors(context);
 
             context.Add<SpringCollab2020MapDataProcessor>();
-        }
-    }
+        }
+    }
 }