Merge pull request #183 from EverestAPI/integrate_map_specific_code_mods

Integrate map specific code mods

Author: maddie480

Ahorn/triggers/swapDashTrigger.jl

@@ -0,0 +1,14 @@
+module SpringCollab2020SwapDashTrigger
+
+using ..Ahorn, Maple
+
+@mapdef Trigger "SpringCollab2020/SwapDashTrigger" SwapDashTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight)
+
+const placements = Ahorn.PlacementDict(
+    "Swap Dash (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        SwapDashTrigger,
+        "rectangle"
+    )
+)
+
+end

SpringCollab2020Module.cs

@@ -1,71 +1,83 @@
 using Celeste.Mod.SpringCollab2020.Effects;
-using Celeste.Mod.SpringCollab2020.Entities;
-using Celeste.Mod.SpringCollab2020.Triggers;
+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();
-            ColorGradeFadeTrigger.Load();
-            Everest.Events.Level.OnLoadBackdrop += onLoadBackdrop;
-        }
-
-        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;
+        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;
+                if (attrs["multiply"] != null) {
+                    scale *= float.Parse(attrs["multiply"].Value);
+                }
+                if (attrs["divide"] != null) {
+                    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();
+            Everest.Events.Level.OnLoadBackdrop -= onLoadBackdrop;
         }
 
         private Backdrop onLoadBackdrop(MapData map, BinaryPacker.Element child, BinaryPacker.Element above) {
@@ -79,6 +91,6 @@ public override void PrepareMapDataProcessors(MapDataFixup context) {
             base.PrepareMapDataProcessors(context);
 
             context.Add<SpringCollab2020MapDataProcessor>();
-        }
-    }
+        }
+    }
 }

Triggers/SwapDashTrigger.cs

@@ -0,0 +1,29 @@
+using Celeste.Mod.Entities;
+using Microsoft.Xna.Framework;
+
+namespace Celeste.Mod.SpringCollab2020.Triggers {
+    [CustomEntity("SpringCollab2020/SwapDashTrigger")]
+    class SwapDashTrigger : Trigger {
+        private float enterX;
+
+        public SwapDashTrigger(EntityData data, Vector2 offset)
+            : base(data, offset) {
+        }
+
+        public override void OnEnter(Player player) {
+            enterX = player.X;
+        }
+
+        public override void OnLeave(Player player) {
+            Session session = SceneAs<Level>().Session;
+            if (player.MaxDashes == 1 && (!(enterX + 16f >= player.X) || !(enterX - 16f <= player.X))) {
+                session.Inventory.Dashes = 2;
+            } else if (player.MaxDashes == 2 && (!(enterX + 16f >= player.X) || !(enterX - 16f <= player.X))) {
+                session.Inventory.Dashes = 1;
+                if (player.Dashes == 2) {
+                    player.Dashes = 1;
+                }
+            }
+        }
+    }
+}