Basic functionality of Move Block Barriers

Author: Brokemia

Ahorn/entities/moveBlockBarrier.jl

@@ -0,0 +1,34 @@
+module SpringCollab2020MoveBlockBarrier
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/moveBlockBarrier" MoveBlockBarrier(x::Integer, y::Integer, width::Integer=Maple.defaultBlockWidth, height::Integer=Maple.defaultBlockHeight)
+
+const placements = Ahorn.PlacementDict(
+    "Move Block Barrier (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        MoveBlockBarrier,
+        "rectangle"
+    ),
+)
+
+Ahorn.minimumSize(entity::MoveBlockBarrier) = 8, 8
+Ahorn.resizable(entity::MoveBlockBarrier) = true, true
+
+function Ahorn.selection(entity::MoveBlockBarrier)
+    x, y = Ahorn.position(entity)
+
+    width = Int(get(entity.data, "width", 8))
+    height = Int(get(entity.data, "height", 8))
+
+    return Ahorn.Rectangle(x, y, width, height)
+end
+
+function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::MoveBlockBarrier, room::Maple.Room)
+    width = Int(get(entity.data, "width", 32))
+    height = Int(get(entity.data, "height", 32))
+    
+    # Slightly darker than seeker barriers, design unfinalized
+    Ahorn.drawRectangle(ctx, 0, 0, width, height, (0.45, 0.45, 0.45, 0.8), (0.0, 0.0, 0.0, 0.0))
+end
+
+end

Entities/MoveBlockBarrier.cs

@@ -0,0 +1,112 @@
+using System;
+using Celeste.Mod.Entities;
+using Microsoft.Xna.Framework;
+using Monocle;
+
+namespace Celeste.Mod.SpringCollab2020.Entities {
+    [CustomEntity("SpringCollab2020/moveBlockBarrier")]
+    [Tracked(false)]
+    public class MoveBlockBarrier : SeekerBarrier {
+        public MoveBlockBarrier(EntityData data, Vector2 offset) : base(data, offset) {
+        }
+
+        public static void Load() {
+            On.Celeste.MoveBlock.MoveCheck += MoveBlock_MoveCheck;
+            On.Celeste.Platform.MoveHCollideSolids += Platform_MoveHCollideSolids;
+            On.Celeste.Platform.MoveVCollideSolids += Platform_MoveVCollideSolids;
+            On.Celeste.Actor.MoveHExact += Actor_MoveHExact;
+            On.Celeste.Actor.MoveVExact += Actor_MoveVExact;
+        }
+
+        public static void Unload() {
+            On.Celeste.MoveBlock.MoveCheck -= MoveBlock_MoveCheck;
+            On.Celeste.Platform.MoveHCollideSolids -= Platform_MoveHCollideSolids;
+            On.Celeste.Platform.MoveVCollideSolids -= Platform_MoveVCollideSolids;
+            On.Celeste.Actor.MoveHExact -= Actor_MoveHExact;
+            On.Celeste.Actor.MoveVExact -= Actor_MoveVExact;
+        }
+
+        static bool Platform_MoveHCollideSolids(On.Celeste.Platform.orig_MoveHCollideSolids orig, Platform self, float moveH, bool thruDashBlocks, Action<Vector2, Vector2, Platform> onCollide) {
+            bool barrierWasCollidable = self.Scene.Tracker.GetEntity<MoveBlockBarrier>()?.Collidable ?? false;
+            if (self is MoveBlock) {
+                foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                    barrier.Collidable = true;
+                }
+
+                bool result = orig(self, moveH, thruDashBlocks, onCollide);
+
+                foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                    barrier.Collidable = barrierWasCollidable;
+                }
+
+                return result;
+            }
+            return orig(self, moveH, thruDashBlocks, onCollide);
+        }
+
+        static bool Platform_MoveVCollideSolids(On.Celeste.Platform.orig_MoveVCollideSolids orig, Platform self, float moveV, bool thruDashBlocks, Action<Vector2, Vector2, Platform> onCollide) {
+            bool barrierWasCollidable = self.Scene.Tracker.GetEntity<MoveBlockBarrier>()?.Collidable ?? false;
+            if (self is MoveBlock) {
+                foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                    barrier.Collidable = true;
+                }
+
+                bool result = orig(self, moveV, thruDashBlocks, onCollide);
+
+                foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                    barrier.Collidable = barrierWasCollidable;
+                }
+
+                return result;
+            }
+            return orig(self, moveV, thruDashBlocks, onCollide);
+        }
+
+
+        static bool Actor_MoveHExact(On.Celeste.Actor.orig_MoveHExact orig, Actor self, int moveH, Collision onCollide, Solid pusher) {
+            bool barrierWasCollidable = self.Scene.Tracker.GetEntity<MoveBlockBarrier>()?.Collidable ?? false;
+            foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                barrier.Collidable = false;
+            }
+
+            bool result = orig(self, moveH, onCollide, pusher);
+
+            foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                barrier.Collidable = barrierWasCollidable;
+            }
+
+            return result;
+        }
+
+        static bool Actor_MoveVExact(On.Celeste.Actor.orig_MoveVExact orig, Actor self, int moveV, Collision onCollide, Solid pusher) {
+            bool barrierWasCollidable = self.Scene.Tracker.GetEntity<MoveBlockBarrier>()?.Collidable ?? false;
+            foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                barrier.Collidable = false;
+            }
+
+            bool result = orig(self, moveV, onCollide, pusher);
+
+            foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                barrier.Collidable = barrierWasCollidable;
+            }
+
+            return result;
+        }
+
+        // Make the barrier temporarily collidable while checking MoveBlock collisions
+        static bool MoveBlock_MoveCheck(On.Celeste.MoveBlock.orig_MoveCheck orig, MoveBlock self, Vector2 speed) {
+            foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                barrier.Collidable = true;
+            }
+
+            bool result = orig(self, speed);
+
+            foreach (Entity barrier in self.Scene.Tracker.GetEntities<MoveBlockBarrier>()) {
+                barrier.Collidable = false;
+            }
+
+            return result;
+        }
+
+    }
+}

SpringCollab2020Module.cs

@@ -13,11 +13,13 @@ public SpringCollab2020Module() {
         public override void Load() {
             NoRefillField.Load();
             FloatierSpaceBlock.Load();
+            MoveBlockBarrier.Load();
         }
 
         public override void Unload() {
             NoRefillField.Unload();
             FloatierSpaceBlock.Unload();
+            MoveBlockBarrier.Unload();
         }
     }
 }