Merge branch 'master' into grouped_trigger_spikes

maddie480 · maddie480 · commit ada657bedeab · 2020-02-09T14:18:03.000+01:00
diff --git a/Ahorn/entities/instantFallingBlock.jl b/Ahorn/entities/instantFallingBlock.jl
@@ -0,0 +1,28 @@
+module SpringCollab2020InstantFallingBlock
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/InstantFallingBlock" InstantFallingBlock(x::Integer, y::Integer, width::Integer=Maple.defaultBlockWidth, height::Integer=Maple.defaultBlockHeight,
+    tiletype::String="3", climbFall::Bool=true, behind::Bool=false)
+
+const placements = Ahorn.PlacementDict(
+    "Instant Falling Block (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        InstantFallingBlock,
+        "rectangle",
+        Dict{String, Any}(),
+        Ahorn.tileEntityFinalizer
+    ),
+)
+
+Ahorn.editingOptions(entity::InstantFallingBlock) = Dict{String, Any}(
+    "tiletype" => Ahorn.tiletypeEditingOptions()
+)
+
+Ahorn.minimumSize(entity::InstantFallingBlock) = 8, 8
+Ahorn.resizable(entity::InstantFallingBlock) = true, true
+
+Ahorn.selection(entity::InstantFallingBlock) = Ahorn.getEntityRectangle(entity)
+
+Ahorn.renderAbs(ctx::Ahorn.Cairo.CairoContext, entity::InstantFallingBlock, room::Maple.Room) = Ahorn.drawTileEntity(ctx, room, entity)
+
+end
diff --git a/Ahorn/lang/en_gb.lang b/Ahorn/lang/en_gb.lang
@@ -91,6 +91,11 @@ placements.entities.SpringCollab2020/FlagSwitchGate.tooltips.activeColor=The gat
 placements.entities.SpringCollab2020/FlagSwitchGate.tooltips.finishColor=The gate icon colour when the group is complete.
 placements.entities.SpringCollab2020/FlagSwitchGate.tooltips.sprite=The texture for the gate block.
 
+# Instant Falling Block
+placements.entities.SpringCollab2020/InstantFallingBlock.tooltips.climbFall=After a delay, the block will physically fall down until it comes into contact with another block.
+placements.entities.SpringCollab2020/InstantFallingBlock.tooltips.tiletype=Changes the visual appearance of the falling block.
+placements.entities.SpringCollab2020/InstantFallingBlock.tooltips.behind=Whether the block should visually be further behind in the scene or not.
+
 # Grouped Trigger Spikes
 placements.entities.SpringCollab2020/GroupedTriggerSpikesUp.tooltips.type=Changes the visual appearance of the spikes.
 placements.entities.SpringCollab2020/GroupedTriggerSpikesDown.tooltips.type=Changes the visual appearance of the spikes.
diff --git a/Entities/CaveWall.cs b/Entities/CaveWall.cs
@@ -163,16 +163,32 @@ private void OnTransitionOut(float percent) {
         }
 
         private void OnTransitionInBegin() {
-            Level level = SceneAs<Level>();
-            if (level.PreviousBounds.HasValue && Collide.CheckRect(this, level.PreviousBounds.Value)) {
-                transitionFade = true;
-                tiles.Alpha = 0f;
-            } else {
-                transitionFade = false;
+            Level level = SceneAs<Level>();
+            if (MasterOfGroup) {
+                Player player = null;
+                foreach (CaveWall entity in Group) {
+                    if (level.PreviousBounds.HasValue && Collide.CheckRect(entity, level.PreviousBounds.Value)) {
+                        entity.transitionFade = true;
+                        entity.tiles.Alpha = 0f;
+                    } else {
+                        entity.transitionFade = false;
+                    }
+                    player = entity.CollideFirst<Player>();
+                    if (player != null) {
+                        break;
+                    }
+                }
+
+                if (player != null) {
+                    foreach (CaveWall entity in Group) {
+                        entity.transitionFade = false;
+                        entity.tiles.Alpha = 0f;
+                    }
+                }
             }
         }
 
-        private void OnTransitionIn(float percent) {
+        private void OnTransitionIn(float percent) {
             if (transitionFade) {
                 tiles.Alpha = percent;
             }
diff --git a/Entities/FlagTouchSwitch.cs b/Entities/FlagTouchSwitch.cs
@@ -2,8 +2,10 @@
 using Microsoft.Xna.Framework;
 using Monocle;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -20,6 +22,32 @@ namespace Celeste.Mod.SpringCollab2020.Entities {
     [CustomEntity("SpringCollab2020/FlagTouchSwitch")]
     [Tracked]
     class FlagTouchSwitch : Entity {
+        private static FieldInfo seekerPushRadius = typeof(Seeker).GetField("pushRadius", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static FieldInfo seekerPhysicsHitbox = typeof(Seeker).GetField("physicsHitbox", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        public static void Load() {
+            On.Celeste.Seeker.RegenerateCoroutine += onSeekerRegenerateCoroutine;
+        }
+
+        public static void Unload() {
+            On.Celeste.Seeker.RegenerateCoroutine -= onSeekerRegenerateCoroutine;
+        }
+
+        private static IEnumerator onSeekerRegenerateCoroutine(On.Celeste.Seeker.orig_RegenerateCoroutine orig, Seeker self) {
+            IEnumerator origEnum = orig(self);
+            while (origEnum.MoveNext()) {
+                yield return origEnum.Current;
+            }
+
+            // make the seeker check for flag touch switches as well.
+            self.Collider = (Collider) seekerPushRadius.GetValue(self);
+            foreach (FlagTouchSwitch touchSwitch in self.Scene.Tracker.GetEntities<FlagTouchSwitch>()) {
+                if (self.CollideCheck(touchSwitch)) {
+                    touchSwitch.turnOn();
+                }
+            }
+            self.Collider = (Collider) seekerPhysicsHitbox.GetValue(self);
+        }
 
         private ParticleType P_RecoloredFire;
 
diff --git a/Entities/InstantFallingBlock.cs b/Entities/InstantFallingBlock.cs
@@ -0,0 +1,12 @@
+﻿using Celeste.Mod.Entities;
+using Microsoft.Xna.Framework;
+
+namespace Celeste.Mod.SpringCollab2020.Entities {
+    [CustomEntity("SpringCollab2020/InstantFallingBlock")]
+    class InstantFallingBlock : FallingBlock {
+        public InstantFallingBlock(EntityData data, Vector2 offset) : base(data, offset) {
+            // this block starts triggered right away. that's about it.
+            Triggered = true;
+        }
+    }
+}
diff --git a/Entities/UpsideDownJumpThru.cs b/Entities/UpsideDownJumpThru.cs
@@ -17,6 +17,7 @@ class UpsideDownJumpThru : JumpThru {
 
         private static FieldInfo actorMovementCounter = typeof(Actor).GetField("movementCounter", BindingFlags.Instance | BindingFlags.NonPublic);
         private static FieldInfo playerVarJumpTimer = typeof(Player).GetField("varJumpTimer", BindingFlags.Instance | BindingFlags.NonPublic);
+        private static FieldInfo playerOnCollideV = typeof(Player).GetField("onCollideV", BindingFlags.Instance | BindingFlags.NonPublic);
 
         private static ILHook playerOrigUpdateHook;
 
@@ -28,7 +29,7 @@ public static void Load() {
             }
 
             // fix player specific behavior allowing them to go through upside-down jumpthrus.
-            On.Celeste.Player.OnCollideV += onPlayerOnCollideV;
+            On.Celeste.Player.ctor += onPlayerConstructor;
 
             // block player if they try to climb past an upside-down jumpthru.
             IL.Celeste.Player.ClimbUpdate += patchPlayerClimbUpdate;
@@ -43,7 +44,7 @@ public static void Unload() {
             On.Celeste.Actor.MoveVExact -= onActorMoveVExact;
             On.Celeste.Platform.MoveVExactCollideSolids -= onPlatformMoveVExactCollideSolids;
 
-            On.Celeste.Player.OnCollideV -= onPlayerOnCollideV;
+            On.Celeste.Player.ctor -= onPlayerConstructor;
             IL.Celeste.Player.ClimbUpdate -= patchPlayerClimbUpdate;
 
             playerOrigUpdateHook?.Dispose();
@@ -164,19 +165,27 @@ private static bool onPlatformMoveVExactCollideSolids(On.Celeste.Platform.orig_M
             return platform != null;
         }
 
-        private static void onPlayerOnCollideV(On.Celeste.Player.orig_OnCollideV orig, Player self, CollisionData data) {
-            // we just want to kill a piece of code that executes in these conditions (supposed to push the player left or right when hitting a wall angle).
-            if (self.StateMachine.State != 19 && self.StateMachine.State != 3 && self.StateMachine.State != 9 && self.Speed.Y < 0
-                && self.CollideCheckOutside<UpsideDownJumpThru>(self.Position - Vector2.UnitY)) {
+        private static void onPlayerConstructor(On.Celeste.Player.orig_ctor orig, Player self, Vector2 position, PlayerSpriteMode spriteMode) {
+            orig(self, position, spriteMode);
 
-                // kill the player's vertical speed.
-                self.Speed.Y = 0;
+            Collision originalOnCollideV = (Collision) playerOnCollideV.GetValue(self);
 
-                // reset varJumpTimer to prevent a weird "stuck on ceiling" effect.
-                playerVarJumpTimer.SetValue(self, 0);
-            }
+            Collision patchedOnCollideV = collisionData => {
+                // we just want to kill a piece of code that executes in these conditions (supposed to push the player left or right when hitting a wall angle).
+                if (self.StateMachine.State != 19 && self.StateMachine.State != 3 && self.StateMachine.State != 9 && self.Speed.Y < 0
+                    && self.CollideCheckOutside<UpsideDownJumpThru>(self.Position - Vector2.UnitY)) {
+
+                    // kill the player's vertical speed.
+                    self.Speed.Y = 0;
+
+                    // reset varJumpTimer to prevent a weird "stuck on ceiling" effect.
+                    playerVarJumpTimer.SetValue(self, 0);
+                }
+
+                originalOnCollideV(collisionData);
+            };
 
-            orig(self, data);
+            playerOnCollideV.SetValue(self, patchedOnCollideV);
         }
 
         private static void filterOutJumpThrusFromCollideChecks(ILContext il) {
diff --git a/SpringCollab2020Module.cs b/SpringCollab2020Module.cs
@@ -21,6 +21,7 @@ public override void Load() {
             BubbleReturnBerry.Load();
             SidewaysJumpThru.Load();
             CrystalBombDetonatorRenderer.Load();
+            FlagTouchSwitch.Load();
         }
 
         public override void LoadContent(bool firstLoad) {
@@ -40,6 +41,7 @@ public override void Unload() {
             BubbleReturnBerry.Unload();
             SidewaysJumpThru.Unload();
             CrystalBombDetonatorRenderer.Unload();
+            FlagTouchSwitch.Unload();
         }
 
         public override void PrepareMapDataProcessors(MapDataFixup context) {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public override void Load() {`
`21`	`21`	`BubbleReturnBerry.Load();`
`22`	`22`	`SidewaysJumpThru.Load();`
`23`	`23`	`CrystalBombDetonatorRenderer.Load();`
	`24`	`+ FlagTouchSwitch.Load();`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public override void LoadContent(bool firstLoad) {`
`@@ -40,6 +41,7 @@ public override void Unload() {`
`40`	`41`	`BubbleReturnBerry.Unload();`
`41`	`42`	`SidewaysJumpThru.Unload();`
`42`	`43`	`CrystalBombDetonatorRenderer.Unload();`
	`44`	`+ FlagTouchSwitch.Unload();`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`public override void PrepareMapDataProcessors(MapDataFixup context) {`