Add Spiked Jump Through Controller

Author: tesselslate

Ahorn/entities/spikeJumpThruController.jl

@@ -0,0 +1,26 @@
+module SpringCollab2020SpikeJumpThroughController
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/SpikeJumpThroughController" SpikeJumpThroughController(x::Integer, y::Integer, persistent::Bool=false)
+
+const placements = Ahorn.PlacementDict(
+    "Spiked Jump Through Controller (SpringCollab2020)" => Ahorn.EntityPlacement(
+        SpikeJumpThroughController,
+        "point"
+    )
+)
+
+sprite = "ahorn/SpringCollab2020/spikeJumpThroughController"
+
+function Ahorn.selection(entity::SpikeJumpThroughController)
+    x, y = Ahorn.position(entity)
+
+    return Ahorn.getSpriteRectangle(sprite, x, y)
+end
+
+function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::SpikeJumpThroughController, room::Maple.Room)
+	Ahorn.drawSprite(ctx, sprite, 0, -0)
+end
+
+end

Ahorn/lang/en_gb.lang

@@ -13,6 +13,9 @@ placements.entities.SpringCollab2020/returnBerry.tooltips.SpringCollab2020_ignor
 placements.entities.SpringCollab2020/glassBerry.tooltips.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default = -1)
 placements.entities.SpringCollab2020/glassBerry.tooltips.order=Manually determine what order strawberries are visually placed in on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default = -1)
 
+# Spike Jump Through Controller
+placements.entities.SpringCollab2020/SpikeJumpThroughController.tooltips.persistent=Whether or not the controller should stay active across rooms. If set to true, the controller's effects will stay active until the player leaves a room with a non-persistent controller.
+
 # Lightning Dash Switch
 placements.entities.SpringCollab2020/LightningDashSwitch.tooltips.side=Which direction the switch is facing.
 placements.entities.SpringCollab2020/LightningDashSwitch.tooltips.sprite=Changes the visual appearance of the switch.

Entities/SpikeJumpThroughController.cs

@@ -0,0 +1,102 @@
+using Microsoft.Xna.Framework;
+using Monocle;
+using Celeste.Mod.SpringCollab2020;
+using Celeste.Mod.Entities;
+using System.Linq;
+
+// Based on RainbowSpinnerColorController
+// from SpringCollab2020 / MaxHelpingHand
+
+namespace Celeste.Mod.SpringCollab2020.Entities {
+    [CustomEntity("SpringCollab2020/SpikeJumpThroughController")]
+    class SpikeJumpThroughController : Entity {
+        private static bool SpikeHooked;
+        private static SpikeJumpThroughController CurrentController;
+        private static SpikeJumpThroughController NextController;
+        private static float TransitionProgress = -1f;
+
+        public SpikeJumpThroughController(EntityData data, Vector2 offset) : this(data.Bool("persistent", false), offset) { }
+
+        public SpikeJumpThroughController(bool persistent, Vector2 offset) : base(offset) {
+            SpringCollab2020Module.Instance.Session.SpikeJumpThroughHooked = persistent;
+
+            Add(new TransitionListener {
+                OnIn = progress => TransitionProgress = progress,
+                OnOut = progress => TransitionProgress = progress,
+                OnInBegin = () => TransitionProgress = 0f,
+                OnInEnd = () => TransitionProgress = -1f
+            });
+
+            Logger.Log("s", SpringCollab2020Module.Instance.Session.SpikeJumpThroughHooked.ToString());
+
+        }
+
+        public static void Load() {
+            On.Celeste.Level.LoadLevel += OnLoadLevelHook;
+        }
+
+        public static void Unload() {
+            On.Celeste.Level.LoadLevel -= OnLoadLevelHook;
+        }
+
+        public override void Update() {
+            base.Update();
+            if (TransitionProgress == -1f && CurrentController == null) {
+                CurrentController = this;
+                NextController = null;
+            }
+        }
+
+        public override void Awake(Scene scene) {
+            base.Awake(scene);
+
+            NextController = this;
+            if (!SpikeHooked) {
+                On.Celeste.Spikes.OnCollide += OnCollideHook;
+                SpikeHooked = true;
+            }
+        }
+
+        public override void Removed(Scene scene) {
+            base.Removed(scene);
+
+            CurrentController = NextController;
+            NextController = null;
+
+            TransitionProgress = -1f;
+
+            if (SpikeHooked && CurrentController == null) {
+                On.Celeste.Spikes.OnCollide -= OnCollideHook;
+                SpikeHooked = false;
+            }
+        }
+
+        public override void SceneEnd(Scene scene) {
+            base.SceneEnd(scene);
+
+            CurrentController = NextController = null;
+            if (SpikeHooked) {
+                On.Celeste.Spikes.OnCollide -= OnCollideHook;
+                SpikeHooked = false;
+            }
+        }
+
+        private static void OnLoadLevelHook(On.Celeste.Level.orig_LoadLevel orig, Level level, Player.IntroTypes introType, bool isFromLoader) {
+            orig(level, introType, isFromLoader);
+
+            if (SpringCollab2020Module.Instance.Session.SpikeJumpThroughHooked && !level.Session.LevelData.Entities.Any(entity => entity.Name == "SpringCollab2020/SpikeJumpThroughController")) {
+                level.Add(new SpikeJumpThroughController(SpringCollab2020Module.Instance.Session.SpikeJumpThroughHooked, Vector2.Zero));
+                level.Entities.UpdateLists();
+            }
+        }
+
+        private static void OnCollideHook(On.Celeste.Spikes.orig_OnCollide orig, Spikes spikes, Player player) {
+            // If the player is picking up a holdable, don't kill them.
+            if (player.StateMachine.State == 8) {
+                return;
+            }
+
+            orig(spikes, player);
+        }
+    }
+}

Graphics/Atlases/Gameplay/ahorn/SpringCollab2020/spikeJumpThroughController.png

@@ -49,6 +49,7 @@ public override void Load() {
             LeaveTheoBehindTrigger.Load();
             BadelineBounceDirectionTrigger.Load();
             WaterRocketLaunchingComponent.Load();
+            SpikeJumpThroughController.Load();
             Everest.Events.Level.OnLoadBackdrop += onLoadBackdrop;
 
             IL.Celeste.Level.Reload += resetFlagsOnTimerResets;
@@ -98,6 +99,7 @@ public override void Unload() {
             LeaveTheoBehindTrigger.Unload();
             BadelineBounceDirectionTrigger.Unload();
             WaterRocketLaunchingComponent.Unload();
+            SpikeJumpThroughController.Unload();
             Everest.Events.Level.OnLoadBackdrop -= onLoadBackdrop;
 
             IL.Celeste.Level.Reload -= resetFlagsOnTimerResets;

SpringCollab2020Module.cs

@@ -18,6 +18,8 @@ public class MultiRoomStrawberrySeedInfo {
 
         public bool LightSourcesDisabled { get; set; } = false;
 
+        public bool SpikeJumpThroughHooked { get; set; } = false;
+
         public class SpeedBasedMusicParamInfo {
             public float MinimumSpeed { get; set; }
             public float MaximumSpeed { get; set; }