Cutscene improvements

Author: randomsalience

ProdigalArchipelago/ItemPatcher.cs

@@ -580,7 +580,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
 [HarmonyPatch(nameof(SpecialInteract.InteractWith))]
 class SpecialInteract_InteractWith_Patch
 {
-    static bool Prefix(SpecialInteract __instance, List<GameMaster.Speech> ___Chatter)
+    static bool Prefix(SpecialInteract __instance, List<GameMaster.Speech> ___Chatter, Animator ___ANIM)
     {
         if (Archipelago.Enabled && __instance.INTERACTABLE == SpecialInteract.INT.SKIP_BOOK)
         {
@@ -647,6 +647,28 @@ static bool Prefix(SpecialInteract __instance, List<GameMaster.Speech> ___Chatte
                 return false;
         }
 
+        if (Archipelago.Enabled && __instance.INTERACTABLE == SpecialInteract.INT.WATERPILLARDG)
+        {
+            if (!GameMaster.GM.Save.Data.Chests.Contains(230))
+            {
+                ___ANIM.SetBool("ACTIVE", false);
+                Archipelago.AP.CollectItem(230);
+                __instance.StartCoroutine(AcquTime());
+                return false;
+            }
+        }
+
+        if (Archipelago.Enabled && __instance.INTERACTABLE == SpecialInteract.INT.EARTHPILLARDG)
+        {
+            if (!GameMaster.GM.Save.Data.Chests.Contains(235))
+            {
+                ___ANIM.SetBool("ACTIVE", false);
+                Archipelago.AP.CollectItem(235);
+                __instance.StartCoroutine(AcquTime());
+                return false;
+            }
+        }
+
         return true;
     }
 
@@ -747,33 +769,15 @@ static bool KnuckleCheck()
         }
         return GameMaster.GM.Save.Data.BSlot == PlayerCharacter.Item.RustKnuckle2;
     }
-}
-
-[HarmonyPatch(typeof(SpecialInteract))]
-[HarmonyPatch("AcquTime")]
-class SpecialInteract_AcquTime_Patch
-{
-    static bool Prefix(List<GameMaster.Speech> ___Chatter, ref IEnumerator __result)
-    {
-        if (Archipelago.Enabled)
-        {
-            ___Chatter.Clear();
-            __result = AcquTime();
-            return false;
-        }
-        return true;
-    }
 
     static IEnumerator AcquTime()
     {
-        GameMaster.GM.CUTSCENE(true);
         yield return new WaitForSeconds(0.25f);
         while (GameMaster.GM.UI.SPEAKING())
         {
             yield return null;
         }
         GameMaster.GM.PC.Anim.SetBool("ITEM", false);
-        GameMaster.GM.CUTSCENE(false);
     }
 }
 

ProdigalArchipelago/WorldPatcher.cs

@@ -366,25 +366,6 @@ static IEnumerator CastleEntry()
         MotherBrain.MB.DespawnAllNPCS();
         GameMaster.GM.CUTSCENE(true);
         yield return new WaitForSeconds(2);
-        GameMaster.GM.PC.AnimDirection(MotherBrain.Direction.Left);
-        GameMaster.GM.PC.WalkTo(new Vector3(520, -352, 0), 1, 1);
-        while (!GameMaster.GM.PC.MovementDone)
-        {
-            yield return null;
-        }
-        GameMaster.GM.PC.AnimDirection(MotherBrain.Direction.Up);
-        GameMaster.GM.PC.WalkTo(new Vector3(520, -248, 0), 1, 1);
-        while (!GameMaster.GM.PC.MovementDone)
-        {
-            yield return null;
-        }
-        GameMaster.GM.CutsceneZoneLoad(10, new Vector2(472, -1048));
-        yield return new WaitForSeconds(2);
-        GameMaster.GM.PC.WalkTo(new Vector3(472, -904, 0), 1, 1);
-        while (!GameMaster.GM.PC.MovementDone)
-        {
-            yield return null;
-        }
         GameMaster.GM.CUTSCENE(false);
     }
 }