Merge branch 'dev' into interact-trigger-support

Author: SilverDorian46

.github/tas-check/2-2-install-inner.sh

@@ -27,7 +27,7 @@ rm -v t.zip
 
 # install CelesteTAS
 cd celeste/Mods
-curl --fail -Lo CelesteTAS.zip "https://github.com/EverestAPI/CelesteTAS-EverestInterop/releases/download/v3.46.2/CelesteTAS.zip"
+curl --fail -Lo CelesteTAS.zip "https://github.com/EverestAPI/CelesteTAS-EverestInterop/releases/download/v3.47.0/CelesteTAS.zip"
 
 # install the mod that is going to be TASed, downloaded as a bundle zip containing the mod zip
 # and all of its dependencies (https://maddie480.ovh/celeste/bundle-download?id=${TAS_TO_RUN})

.github/tas-check/run-locally.sh

@@ -11,14 +11,14 @@ set -xeo pipefail
 
 case "$1" in
     "Celeste")
-        TAS_URL="https://github.com/VampireFlower/CelesteTAS/archive/fbfbd6c3026e6fb946f85eb98498e4e632ee399b.zip"
-        TAS_PATH="CelesteTAS-fbfbd6c3026e6fb946f85eb98498e4e632ee399b/0 - 100%.tas"
+        TAS_URL="https://github.com/VampireFlower/CelesteTAS/archive/e6dfa34b8782c3dc88118d1fc14d29ceb73d036d.zip"
+        TAS_PATH="CelesteTAS-e6dfa34b8782c3dc88118d1fc14d29ceb73d036d/0 - 100%.tas"
         ;;
 
     "StrawberryJam2021")
-        TAS_URL="https://github.com/VampireFlower/StrawberryJamTAS/archive/d7775dc7f38c4fb06eb63700ec5aec6dfee86031.zip"
-        TAS_PATH="StrawberryJamTAS-d7775dc7f38c4fb06eb63700ec5aec6dfee86031/0-SJ All Levels.tas"
-        BUNDLE_DOWNLOAD="https://celestemodupdater.0x0a.de/pinned-mods/StrawberryJam2021-Bundle-582b1269.zip"
+        TAS_URL="https://github.com/VampireFlower/StrawberryJamTAS/archive/495dd485b4e94f4d23d4fb5aa1350f24ff066d29.zip"
+        TAS_PATH="StrawberryJamTAS-495dd485b4e94f4d23d4fb5aa1350f24ff066d29/0-SJ All Levels.tas"
+        BUNDLE_DOWNLOAD="https://celestemodupdater.0x0a.de/pinned-mods/StrawberryJam2021-Bundle-46cc7e85.zip"
         ;;
 
     *)

.github/workflows/tas-sync-check.yml

@@ -10,13 +10,13 @@ jobs:
       matrix:
         tas:
           - name: Celeste 100%
-            url: "https://github.com/VampireFlower/CelesteTAS/archive/fbfbd6c3026e6fb946f85eb98498e4e632ee399b.zip"
-            path: "CelesteTAS-fbfbd6c3026e6fb946f85eb98498e4e632ee399b/0 - 100%.tas"
+            url: "https://github.com/VampireFlower/CelesteTAS/archive/e6dfa34b8782c3dc88118d1fc14d29ceb73d036d.zip"
+            path: "CelesteTAS-e6dfa34b8782c3dc88118d1fc14d29ceb73d036d/0 - 100%.tas"
 
           - name: Strawberry Jam All Levels
-            url: "https://github.com/VampireFlower/StrawberryJamTAS/archive/d7775dc7f38c4fb06eb63700ec5aec6dfee86031.zip"
-            path: "StrawberryJamTAS-d7775dc7f38c4fb06eb63700ec5aec6dfee86031/0-SJ All Levels.tas"
-            bundle: "https://celestemodupdater.0x0a.de/pinned-mods/StrawberryJam2021-Bundle-582b1269.zip"
+            url: "https://github.com/VampireFlower/StrawberryJamTAS/archive/495dd485b4e94f4d23d4fb5aa1350f24ff066d29.zip"
+            path: "StrawberryJamTAS-495dd485b4e94f4d23d4fb5aa1350f24ff066d29/0-SJ All Levels.tas"
+            bundle: "https://celestemodupdater.0x0a.de/pinned-mods/StrawberryJam2021-Bundle-46cc7e85.zip"
 
     runs-on: ubuntu-latest
     timeout-minutes: 60

Celeste.Mod.mm/Mod/Entities/ICameraTargetTrigger.cs

@@ -0,0 +1,14 @@
+namespace Celeste.Mod.Entities;
+
+/// <summary>
+/// To be implemented on custom triggers that affect the camera target, but doesn't extend any of the vanilla / Everest triggers.<br/>
+/// This enables <see cref="Level.GetFullCameraTargetAt"/>, which is called on respawn and room transition,<br/>
+/// to check for whether the player would collide with this trigger at the given position, thus updating the camera's position properly.
+/// </summary>
+public interface ICameraTargetTrigger {
+    /// <summary>
+    /// Called every frame the player remains in the trigger.<br/>
+    /// Also called by <see cref="Level.GetFullCameraTargetAt"/> if the player would collide with this trigger at the given position.
+    /// </summary>
+    void OnStay(Player player);
+}

Celeste.Mod.mm/Mod/Entities/SmoothCameraOffsetTrigger.cs

@@ -11,7 +11,7 @@ namespace Celeste.Mod.Entities {
     /// - `onlyOnce`: enable to have the trigger remove itself when the player leaves it.
     /// </summary>
     [CustomEntity("everest/smoothCameraOffsetTrigger", "SpringCollab2020/SmoothCameraOffsetTrigger")]
-    public class SmoothCameraOffsetTrigger : Trigger {
+    public class SmoothCameraOffsetTrigger : Trigger, ICameraTargetTrigger {
 
         private Vector2 offsetFrom;
         private Vector2 offsetTo;

Celeste.Mod.mm/Mod/Registry/DecalRegistryHandlers/SolidDecalRegistryHandler.cs

@@ -3,7 +3,7 @@
 namespace Celeste.Mod.Registry.DecalRegistryHandlers; 
 
 internal sealed class SolidDecalRegistryHandler : DecalRegistryHandler {
-    private int _x, _y, _width, _height, _index;
+    private int _x, _y, _width, _height, _index, _priority;
     private bool _blockWaterfalls, _safe;
 
     public override string Name => "solid";
@@ -15,6 +15,8 @@ public override void Parse(XmlAttributeCollection xml) {
         _height = Get(xml, "height", 16);
 
         _index = Get(xml, "index", SurfaceIndex.ResortRoof);
+        _priority = Get(xml, "priority", 0);
+
         _blockWaterfalls = GetBool(xml, "blockWaterfalls", true);
         _safe = GetBool(xml, "safe", true);
     }
@@ -24,6 +26,6 @@ public override void ApplyTo(Decal decal) {
 
         decal.ScaleRectangle(ref x, ref y, ref width, ref height);
 
-        ((patch_Decal)decal).MakeSolid(x, y, width, height, _index, _blockWaterfalls, _safe);
+        ((patch_Decal)decal).MakeSolid(x, y, width, height, _index, _priority, _blockWaterfalls, _safe);
     }
 }

Celeste.Mod.mm/Patches/CameraAdvanceTargetTrigger.cs

@@ -0,0 +1,29 @@
+using Microsoft.Xna.Framework;
+using Mono.Cecil;
+using MonoMod;
+using MonoMod.InlineRT;
+using System;
+
+namespace Celeste {
+    [PatchCameraTargetTriggerInterface]
+    class patch_CameraAdvanceTargetTrigger : CameraAdvanceTargetTrigger {
+        public patch_CameraAdvanceTargetTrigger(EntityData data, Vector2 offset) : base(data, offset) { }
+    }
+}
+
+namespace MonoMod {
+    /// <summary>
+    /// Patch the Camera Target Trigger to implement <see cref="Celeste.Mod.Entities.ICameraTargetTrigger"/>.
+    /// </summary>
+    [MonoModCustomAttribute(nameof(MonoModRules.PatchCameraTargetTriggerInterface))]
+    class PatchCameraTargetTriggerInterfaceAttribute : Attribute { }
+
+    static partial class MonoModRules {
+
+        public static void PatchCameraTargetTriggerInterface(ICustomAttributeProvider provider, CustomAttribute attrib) {
+            InterfaceImplementation i_cameraTargetTrigger = new(MonoModRule.Modder.FindType("Celeste.Mod.Entities.ICameraTargetTrigger"));
+
+            ((TypeDefinition) provider).Interfaces.Add(i_cameraTargetTrigger);
+        }
+    }
+}

Celeste.Mod.mm/Patches/Decal.cs

@@ -206,6 +206,16 @@ public void MakeSolid(float x, float y, float w, float h, int surfaceSoundIndex,
             Scene.Add(solid);
         }
 
+        public void MakeSolid(float x, float y, float w, float h, int surfaceSoundIndex, int surfaceSoundPriority, bool blockWaterfalls = true, bool safe = true) {
+            Solid solid = new Solid(Position + new Vector2(x, y), w, h, safe) {
+                BlockWaterfalls = blockWaterfalls,
+                SurfaceSoundIndex = surfaceSoundIndex,
+                SurfaceSoundPriority = surfaceSoundPriority,
+            };
+            solids.Add(solid);
+            Scene.Add(solid);
+        }
+
         [Obsolete("Use MakeFlagSwap with the cold flag instead.")]
         public void MakeCoreSwap(string coldPath, string hotPath) {
             Add(image = new patch_CoreSwapImage(GFX.Game[coldPath], GFX.Game[hotPath]));

Celeste.Mod.mm/Patches/Level.cs

@@ -577,8 +577,8 @@ private static void _GCCollect() {
             Vector2 originalPosition = player.Position;
             player.Position = at;
             foreach (Entity trigger in Tracker.GetEntities<Trigger>()) {
-                if (trigger is SmoothCameraOffsetTrigger smoothCameraOffset && player.CollideCheck(trigger)) {
-                    smoothCameraOffset.OnStay(player);
+                if (trigger is ICameraTargetTrigger iCameraTarget && player.CollideCheck(trigger)) {
+                    iCameraTarget.OnStay(player);
                 }
             }
             player.Position = originalPosition;