Add silver berry collect trigger

Author: maddie480

Ahorn/triggers/silverBerryCollectTrigger.jl

@@ -0,0 +1,14 @@
+module CollabUtils2SilverBerryCollectTrigger
+
+using ..Ahorn, Maple
+
+@mapdef Trigger "CollabUtils2/SilverBerryCollectTrigger" SilverBerryCollectTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight)
+
+const placements = Ahorn.PlacementDict(
+    "Silver Berry Collect (Collab Utils 2 / READ DOCS)" => Ahorn.EntityPlacement(
+        SilverBerryCollectTrigger,
+        "rectangle",
+    ),
+)
+
+end

CollabModule.cs

@@ -46,6 +46,7 @@ public override void Load() {
             SilverBlock.Load();
             MiniHeartDoorUnlockCutsceneTrigger.Load();
             LazyLoadingHandler.Load();
+            SilverBerryCollectTrigger.Load();
 
             Everest.Content.OnUpdate += onModAssetUpdate;
 
@@ -68,6 +69,7 @@ public override void Unload() {
             SilverBlock.Unload();
             MiniHeartDoorUnlockCutsceneTrigger.Unload();
             LazyLoadingHandler.Unload();
+            SilverBerryCollectTrigger.Unload();
 
             Everest.Content.OnUpdate -= onModAssetUpdate;
 

Loenn/lang/en_gb.lang

@@ -62,5 +62,8 @@ triggers.CollabUtils2/MiniHeartDoorUnlockCutsceneTrigger.attributes.description.
 # Rainbow Berry Unlock Cutscene Trigger
 triggers.CollabUtils2/RainbowBerryUnlockCutsceneTrigger.placements.name.default=Rainbow Berry Unlock Cutscene
 
+# Silver Berry Collect Trigger
+triggers.CollabUtils2/SilverBerryCollectTrigger.placements.name.default=Silver Berry Collect
+
 # Speed Berry Collect Trigger
 triggers.CollabUtils2/SpeedBerryCollectTrigger.placements.name.default=Speed Berry Collect

Loenn/triggers/silverBerryCollect.lua

@@ -0,0 +1,9 @@
+local trigger = {}
+trigger.name = "CollabUtils2/SilverBerryCollectTrigger"
+trigger.placements = {
+    {
+        name = "default"
+    }
+}
+
+return trigger

Triggers/SilverBerryCollectTrigger.cs

@@ -0,0 +1,52 @@
+using Celeste.Mod.CollabUtils2.Entities;
+using Celeste.Mod.Entities;
+using Microsoft.Xna.Framework;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Monocle;
+using MonoMod.Cil;
+using MonoMod.RuntimeDetour;
+using System;
+
+namespace Celeste.Mod.CollabUtils2.Triggers {
+    [CustomEntity("CollabUtils2/SilverBerryCollectTrigger")]
+    [Tracked]
+    class SilverBerryCollectTrigger : Trigger {
+        private static ILHook strawberryUpdateHook = null;
+
+        public static void Load() {
+            strawberryUpdateHook = new ILHook(typeof(Strawberry).GetMethod("orig_Update"), hookStrawberryUpdate);
+        }
+
+        public static void Unload() {
+            strawberryUpdateHook?.Dispose();
+            strawberryUpdateHook = null;
+        }
+
+        public SilverBerryCollectTrigger(EntityData data, Vector2 offset) : base(data, offset) { }
+
+        private static void hookStrawberryUpdate(ILContext il) {
+            ILCursor cursor = new ILCursor(il);
+
+            while (cursor.TryGotoNext(
+                instr => instr.OpCode == OpCodes.Callvirt && (instr.Operand as MethodReference)?.FullName == "System.Boolean Monocle.Entity::CollideCheck<Celeste.GoldBerryCollectTrigger>()")) {
+
+                Logger.Log("CollabUtils2/SilverBerryCollectTrigger", $"Modding gold berry collect at {cursor.Index} in IL for Strawberry.orig_Update");
+
+                // argument 1 (player) is the same player that is used for the vanilla call, so clone it
+                cursor.Emit(OpCodes.Dup);
+
+                // argument 2 (orig) will be the result of the vanilla call to CollideCheck<GoldBerryCollectTrigger>()
+                cursor.Index++;
+
+                // argument 3 (self) is the strawberry that is being checked: the method we are hooking is part of it
+                cursor.Emit(OpCodes.Ldarg_0);
+
+                cursor.EmitDelegate<Func<Player, bool, Strawberry, bool>>((player, orig, self) => {
+                    // collect golden berry and derivatives if the player is in a golden berry trigger, OR if it is a silver berry and the player is in a silver berry collect trigger.
+                    return orig || ((self is SilverBerry) && player.CollideCheck<SilverBerryCollectTrigger>());
+                });
+            }
+        }
+    }
+}

everest.yaml

@@ -1,5 +1,5 @@
 - Name: CollabUtils2
-  Version: 1.6.6
+  Version: 1.6.7
   DLL: bin/Debug/net452/CollabUtils2.dll
   Dependencies:
     - Name: Everest