Organized patches

3 files changed, 268 insertions, 257 deletions

@@ -0,0 +1,228 @@
+using AnodyneSharp.Entities.Events;
+using AnodyneSharp.Entities.Gadget.Treasures;
+using AnodyneSharp.Entities.Gadget;
+using AnodyneSharp.Entities.Interactive;
+using AnodyneSharp.Entities;
+using AnodyneSharp.Registry;
+using AnodyneSharp.Utilities;
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.Xna.Framework;
+
+namespace AnodyneArchipelago.Patches
+{
+    [HarmonyPatch(typeof(TreasureChest), nameof(TreasureChest.PlayerInteraction))]
+    class ChestInteractPatch
+    {
+        static void Prefix(TreasureChest __instance)
+        {
+            string entityId = PatchHelper.GetEntityPreset(typeof(TreasureChest), __instance).EntityID.ToString();
+            Plugin.Instance.Log.LogInfo($"Touched chest: {entityId}");
+        }
+    }
+
+    [HarmonyPatch(typeof(TreasureChest), "SetTreasure")]
+    class ChestSetTreasurePatch
+    {
+        static bool Prefix(TreasureChest __instance)
+        {
+            Guid entityId = PatchHelper.GetEntityPreset(typeof(TreasureChest), __instance).EntityID;
+            if (Locations.LocationsByGuid.ContainsKey(entityId))
+            {
+                BaseTreasure treasure = new ArchipelagoTreasure(Locations.LocationsByGuid[entityId], __instance.Position);
+
+                FieldInfo treasureField = typeof(TreasureChest).GetField("_treasure", BindingFlags.NonPublic | BindingFlags.Instance);
+                treasureField.SetValue(__instance, treasure);
+
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    [HarmonyPatch(typeof(Big_Key), nameof(Big_Key.PlayerInteraction))]
+    class BigKeyTouchPatch
+    {
+        // We basically just rewrite this method, because we need to get rid of the part that adds the key to the inventory.
+        static bool Prefix(Big_Key __instance, ref bool __result)
+        {
+            MethodInfo statesMethod = typeof(Big_Key).GetMethod("States", BindingFlags.NonPublic | BindingFlags.Instance);
+
+            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(Big_Key), __instance);
+            preset.Alive = false;
+            __instance.Solid = false;
+            GlobalState.StartCutscene = (IEnumerator<AnodyneSharp.States.CutsceneState.CutsceneEvent>)statesMethod.Invoke(__instance, new object[] { });
+            __result = true;
+            return false;
+        }
+    }
+
+    [HarmonyPatch(typeof(Big_Key), "States")]
+    class BigKeyStatesPatch
+    {
+        static void Postfix(Big_Key __instance)
+        {
+            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(Big_Key), __instance);
+
+            if (preset.Frame == 0)
+            {
+                ArchipelagoManager.SendLocation("Temple of the Seeing One - Green Key");
+            }
+            else if (preset.Frame == 1)
+            {
+                ArchipelagoManager.SendLocation("Red Grotto - Red Key");
+            }
+            else if (preset.Frame == 2)
+            {
+                ArchipelagoManager.SendLocation("Mountain Cavern - Blue Key");
+            }
+        }
+    }
+
+    [HarmonyPatch(typeof(HealthCicadaSentinel), nameof(HealthCicadaSentinel.Collided))]
+    class HealthCicadaInteractPatch
+    {
+        static void Prefix(TreasureChest __instance)
+        {
+            Type hcsType = typeof(HealthCicadaSentinel);
+            FieldInfo childField = hcsType.GetField("_child", BindingFlags.NonPublic | BindingFlags.Instance);
+            HealthCicada healthCicada = (HealthCicada)childField.GetValue(__instance);
+
+            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(HealthCicada), healthCicada);
+            Plugin.Instance.Log.LogInfo($"Touched cicada: {preset.EntityID.ToString()}");
+        }
+    }
+
+    [HarmonyPatch(typeof(HealthCicada), nameof(HealthCicada.Update))]
+    class HealthCicadaUpdatePatch
+    {
+        static void Postfix(HealthCicada __instance)
+        {
+            Type cicadaType = typeof(HealthCicada);
+            FieldInfo chirpField = cicadaType.GetField("_chirp", BindingFlags.NonPublic | BindingFlags.Instance);
+            FieldInfo sentinelField = cicadaType.GetField("_sentinel", BindingFlags.NonPublic | BindingFlags.Instance);
+
+            HealthCicadaSentinel sentinel = (HealthCicadaSentinel)sentinelField.GetValue(__instance);
+            Type hcsType = typeof(HealthCicadaSentinel);
+            FieldInfo flyDistanceField = hcsType.GetField("_flyDistance", BindingFlags.NonPublic | BindingFlags.Instance);
+            float flyDistance = (float)flyDistanceField.GetValue(sentinel);
+
+            if (__instance.visible && !(bool)chirpField.GetValue(__instance) && flyDistance > 0)
+            {
+                flyDistanceField.SetValue(sentinel, 0f);
+
+                FieldInfo stateField = cicadaType.GetField("_state", BindingFlags.NonPublic | BindingFlags.Instance);
+                stateField.SetValue(__instance, StateLogic(__instance));
+            }
+        }
+
+        static IEnumerator<string> StateLogic(HealthCicada healthCicada)
+        {
+            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(HealthCicada), healthCicada);
+
+            while (!MathUtilities.MoveTo(ref healthCicada.opacity, 0.0f, 0.6f))
+                yield return "FadingOut";
+            preset.Alive = false;
+
+            FieldInfo sentinelField = typeof(HealthCicada).GetField("_sentinel", BindingFlags.NonPublic | BindingFlags.Instance);
+            HealthCicadaSentinel sentinel = (HealthCicadaSentinel)sentinelField.GetValue(healthCicada);
+
+            sentinel.exists = false;
+
+            if (Locations.LocationsByGuid.ContainsKey(preset.EntityID))
+            {
+                ArchipelagoManager.SendLocation(Locations.LocationsByGuid[preset.EntityID]);
+            }
+        }
+    }
+
+    [HarmonyPatch(typeof(EntityPreset), nameof(EntityPreset.Create))]
+    class EntityPresetCreatePatch
+    {
+        static void Postfix(EntityPreset __instance, Entity __result)
+        {
+            if (__instance.Type.FullName == "AnodyneSharp.Entities.Interactive.DungeonStatue")
+            {
+                __result.Position = __instance.Position + new Vector2(1f, 32f);
+
+                string eventName = "StatueMoved_";
+                Facing moveDir = Facing.RIGHT;
+                if (__instance.Frame == 0)
+                {
+                    eventName += "Temple";
+                    moveDir = Facing.UP;
+                }
+                else if (__instance.Frame == 1)
+                {
+                    eventName += "Grotto";
+                }
+                else if (__instance.Frame == 2)
+                {
+                    eventName += "Mountain";
+                }
+
+                if (GlobalState.events.GetEvent(eventName) > 0)
+                {
+                    __result.Position += Entity.FacingDirection(moveDir) * 32f;
+                }
+            }
+            else if (__instance.Type.FullName.StartsWith("AnodyneSharp.Entities.Decorations.RedCave"))
+            {
+                string side = __instance.Type.FullName.Substring(41);
+                int requiredGrottos = 0;
+                if (side == "Left")
+                {
+                    requiredGrottos = 1;
+                }
+                else if (side == "Right")
+                {
+                    requiredGrottos = 2;
+                }
+                else if (side == "North")
+                {
+                    requiredGrottos = 3;
+                }
+
+                if (GlobalState.events.GetEvent("ProgressiveRedGrotto") < requiredGrottos)
+                {
+                    __result.exists = false;
+                    GlobalState.SpawnEntity((Entity)new DoorToggle(__result.Position, __result.width, __result.height));
+                }
+            }
+            else if (__instance.Type.FullName == "AnodyneSharp.Entities.Interactive.Npc.MitraCliff")
+            {
+                // We want to get rid of this scene entirely.
+                __instance.Alive = false;
+                __result.exists = false;
+            }
+        }
+    }
+
+    [HarmonyPatch]
+    class BreakChainPatch
+    {
+        static MethodInfo TargetMethod()
+        {
+            return typeof(Red_Pillar).GetNestedType("Chain", BindingFlags.NonPublic).GetMethod("Collided");
+        }
+
+        static void Postfix(object __instance)
+        {
+            Type chainType = typeof(Red_Pillar).GetNestedType("Chain", BindingFlags.NonPublic);
+            FieldInfo parentField = chainType.GetField("_parent", BindingFlags.NonPublic | BindingFlags.Instance);
+
+            Red_Pillar redPillar = (Red_Pillar)parentField.GetValue(__instance);
+            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(Red_Pillar), redPillar);
+
+            Plugin.Instance.Log.LogInfo($"Broke red chain: {preset.EntityID.ToString()}");
+
+            if (Locations.LocationsByGuid.ContainsKey(preset.EntityID))
+            {
+                ArchipelagoManager.SendLocation(Locations.LocationsByGuid[preset.EntityID]);
+            }
+        }
+    }
+}
@@ -0,0 +1,39 @@
+using AnodyneSharp.Entities;
+using AnodyneSharp.Registry;
+using AnodyneSharp.States;
+using AnodyneSharp;
+using HarmonyLib;
+using System.Reflection;
+
+namespace AnodyneArchipelago.Patches
+{
+    [HarmonyPatch(typeof(AnodyneGame), "Update")]
+    class GameUpdatePatch
+    {
+        static void Postfix()
+        {
+            ArchipelagoManager.Update();
+        }
+    }
+
+    [HarmonyPatch(typeof(PlayState), nameof(PlayState.Create))]
+    class PlayStateCreatePatch
+    {
+        static void Prefix(PlayState __instance)
+        {
+            // Get player for later access.
+            FieldInfo playerField = typeof(PlayState).GetField("_player", BindingFlags.NonPublic | BindingFlags.Instance);
+            Plugin.Player = (Player)playerField.GetValue(__instance);
+
+            // Handle Red Grotto stuff.
+            GlobalState.events.SetEvent("red_cave_l_ss", 999);
+            GlobalState.events.SetEvent("red_cave_n_ss", 999);
+            GlobalState.events.SetEvent("red_cave_r_ss", 999);
+
+            // Connect to archipelago.
+            Plugin.Instance.Log.LogInfo("Connecting to Archipelago!");
+
+            ArchipelagoManager.Connect("localhost:38281", "Anodyne", "");
+        }
+    }
+}
@@ -1,21 +1,8 @@
-using AnodyneArchipelago.Patches;
-using AnodyneSharp;
-using AnodyneSharp.Entities;
-using AnodyneSharp.Entities.Events;
-using AnodyneSharp.Entities.Gadget;
-using AnodyneSharp.Entities.Gadget.Treasures;
-using AnodyneSharp.Entities.Interactive;
-using AnodyneSharp.Registry;
-using AnodyneSharp.States;
-using AnodyneSharp.Utilities;
+using AnodyneSharp.Entities;
 using BepInEx;
 using BepInEx.NET.Common;
 using HarmonyLib;
 using HarmonyLib.Tools;
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace AnodyneArchipelago
@@ -40,247 +27,4 @@ namespace AnodyneArchipelago
             Harmony.CreateAndPatchAll(Assembly.GetExecutingAssembly());
         }
     }
-
-    [HarmonyPatch(typeof(AnodyneGame), "Update")]
-    class GameUpdatePatch
-    {
-        static void Postfix()
-        {
-            ArchipelagoManager.Update();
-        }
-    }
-
-    [HarmonyPatch(typeof(PlayState), nameof(PlayState.Create))]
-    class PlayStateCreatePatch
-    {
-        static void Prefix(PlayState __instance)
-        {
-            // Get player for later access.
-            FieldInfo playerField = typeof(PlayState).GetField("_player", BindingFlags.NonPublic | BindingFlags.Instance);
-            Plugin.Player = (Player)playerField.GetValue(__instance);
-
-            // Handle Red Grotto stuff.
-            GlobalState.events.SetEvent("red_cave_l_ss", 999);
-            GlobalState.events.SetEvent("red_cave_n_ss", 999);
-            GlobalState.events.SetEvent("red_cave_r_ss", 999);
-
-            // Connect to archipelago.
-            Plugin.Instance.Log.LogInfo("Connecting to Archipelago!");
-
-            ArchipelagoManager.Connect("localhost:38281", "Anodyne", "");
-        }
-    }
-
-    [HarmonyPatch(typeof(TreasureChest), nameof(TreasureChest.PlayerInteraction))]
-    class ChestInteractPatch
-    {
-        static void Prefix(TreasureChest __instance)
-        {
-            string entityId = PatchHelper.GetEntityPreset(typeof(TreasureChest), __instance).EntityID.ToString();
-            Plugin.Instance.Log.LogInfo($"Touched chest: {entityId}");
-        }
-    }
-
-    [HarmonyPatch(typeof(TreasureChest), "SetTreasure")]
-    class ChestSetTreasurePatch
-    {
-        static bool Prefix(TreasureChest __instance)
-        {
-            Guid entityId = PatchHelper.GetEntityPreset(typeof(TreasureChest), __instance).EntityID;
-            if (Locations.LocationsByGuid.ContainsKey(entityId))
-            {
-                BaseTreasure treasure = new ArchipelagoTreasure(Locations.LocationsByGuid[entityId], __instance.Position);
-
-                FieldInfo treasureField = typeof(TreasureChest).GetField("_treasure", BindingFlags.NonPublic | BindingFlags.Instance);
-                treasureField.SetValue(__instance, treasure);
-
-                return false;
-            }
-
-            return true;
-        }
-    }
-
-    [HarmonyPatch(typeof(Big_Key), nameof(Big_Key.PlayerInteraction))]
-    class BigKeyTouchPatch
-    {
-        // We basically just rewrite this method, because we need to get rid of the part that adds the key to the inventory.
-        static bool Prefix(Big_Key __instance, ref bool __result)
-        {
-            MethodInfo statesMethod = typeof(Big_Key).GetMethod("States", BindingFlags.NonPublic | BindingFlags.Instance);
-
-            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(Big_Key), __instance);
-            preset.Alive = false;
-            __instance.Solid = false;
-            GlobalState.StartCutscene = (IEnumerator<AnodyneSharp.States.CutsceneState.CutsceneEvent>)statesMethod.Invoke(__instance, new object[] { });
-            __result = true;
-            return false;
-        }
-    }
-
-    [HarmonyPatch(typeof(Big_Key), "States")]
-    class BigKeyStatesPatch
-    {
-        static void Postfix(Big_Key __instance)
-        {
-            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(Big_Key), __instance);
-
-            if (preset.Frame == 0)
-            {
-                ArchipelagoManager.SendLocation("Temple of the Seeing One - Green Key");
-            }
-            else if (preset.Frame == 1)
-            {
-                ArchipelagoManager.SendLocation("Red Grotto - Red Key");
-            }
-            else if (preset.Frame == 2)
-            {
-                ArchipelagoManager.SendLocation("Mountain Cavern - Blue Key");
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(HealthCicadaSentinel), nameof(HealthCicadaSentinel.Collided))]
-    class HealthCicadaInteractPatch
-    {
-        static void Prefix(TreasureChest __instance)
-        {
-            Type hcsType = typeof(HealthCicadaSentinel);
-            FieldInfo childField = hcsType.GetField("_child", BindingFlags.NonPublic | BindingFlags.Instance);
-            HealthCicada healthCicada = (HealthCicada)childField.GetValue(__instance);
-
-            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(HealthCicada), healthCicada);
-            Plugin.Instance.Log.LogInfo($"Touched cicada: {preset.EntityID.ToString()}");
-        }
-    }
-
-    [HarmonyPatch(typeof(HealthCicada), nameof(HealthCicada.Update))]
-    class HealthCicadaUpdatePatch
-    {
-        static void Postfix(HealthCicada __instance)
-        {
-            Type cicadaType = typeof(HealthCicada);
-            FieldInfo chirpField = cicadaType.GetField("_chirp", BindingFlags.NonPublic | BindingFlags.Instance);
-            FieldInfo sentinelField = cicadaType.GetField("_sentinel", BindingFlags.NonPublic | BindingFlags.Instance);
-
-            HealthCicadaSentinel sentinel = (HealthCicadaSentinel)sentinelField.GetValue(__instance);
-            Type hcsType = typeof(HealthCicadaSentinel);
-            FieldInfo flyDistanceField = hcsType.GetField("_flyDistance", BindingFlags.NonPublic | BindingFlags.Instance);
-            float flyDistance = (float)flyDistanceField.GetValue(sentinel);
-
-            if (__instance.visible && !(bool)chirpField.GetValue(__instance) && flyDistance > 0)
-            {
-                flyDistanceField.SetValue(sentinel, 0f);
-
-                FieldInfo stateField = cicadaType.GetField("_state", BindingFlags.NonPublic | BindingFlags.Instance);
-                stateField.SetValue(__instance, StateLogic(__instance));
-            }
-        }
-
-        static IEnumerator<string> StateLogic(HealthCicada healthCicada)
-        {
-            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(HealthCicada), healthCicada);
-
-            while (!MathUtilities.MoveTo(ref healthCicada.opacity, 0.0f, 0.6f))
-                yield return "FadingOut";
-            preset.Alive = false;
-
-            FieldInfo sentinelField = typeof(HealthCicada).GetField("_sentinel", BindingFlags.NonPublic | BindingFlags.Instance);
-            HealthCicadaSentinel sentinel = (HealthCicadaSentinel)sentinelField.GetValue(healthCicada);
-
-            sentinel.exists = false;
-
-            if (Locations.LocationsByGuid.ContainsKey(preset.EntityID))
-            {
-                ArchipelagoManager.SendLocation(Locations.LocationsByGuid[preset.EntityID]);
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(EntityPreset), nameof(EntityPreset.Create))]
-    class EntityPresetCreatePatch
-    {
-        static void Postfix(EntityPreset __instance, Entity __result)
-        {
-            if (__instance.Type.FullName == "AnodyneSharp.Entities.Interactive.DungeonStatue")
-            {
-                __result.Position = __instance.Position + new Vector2(1f, 32f);
-
-                string eventName = "StatueMoved_";
-                Facing moveDir = Facing.RIGHT;
-                if (__instance.Frame == 0)
-                {
-                    eventName += "Temple";
-                    moveDir = Facing.UP;
-                }
-                else if (__instance.Frame == 1)
-                {
-                    eventName += "Grotto";
-                }
-                else if (__instance.Frame == 2)
-                {
-                    eventName += "Mountain";
-                }
-
-                if (GlobalState.events.GetEvent(eventName) > 0)
-                {
-                    __result.Position += Entity.FacingDirection(moveDir) * 32f;
-                }
-            }
-            else if (__instance.Type.FullName.StartsWith("AnodyneSharp.Entities.Decorations.RedCave"))
-            {
-                string side = __instance.Type.FullName.Substring(41);
-                int requiredGrottos = 0;
-                if (side == "Left")
-                {
-                    requiredGrottos = 1;
-                }
-                else if (side == "Right")
-                {
-                    requiredGrottos = 2;
-                }
-                else if (side == "North")
-                {
-                    requiredGrottos = 3;
-                }
-
-                if (GlobalState.events.GetEvent("ProgressiveRedGrotto") < requiredGrottos)
-                {
-                    __result.exists = false;
-                    GlobalState.SpawnEntity((Entity)new DoorToggle(__result.Position, __result.width, __result.height));
-                }
-            }
-            else if (__instance.Type.FullName == "AnodyneSharp.Entities.Interactive.Npc.MitraCliff")
-            {
-                // We want to get rid of this scene entirely.
-                __instance.Alive = false;
-                __result.exists = false;
-            }
-        }
-    }
-
-    [HarmonyPatch]
-    class BreakChainPatch
-    {
-        static MethodInfo TargetMethod()
-        {
-            return typeof(Red_Pillar).GetNestedType("Chain", BindingFlags.NonPublic).GetMethod("Collided");
-        }
-
-        static void Postfix(object __instance)
-        {
-            Type chainType = typeof(Red_Pillar).GetNestedType("Chain", BindingFlags.NonPublic);
-            FieldInfo parentField = chainType.GetField("_parent", BindingFlags.NonPublic | BindingFlags.Instance);
-            
-            Red_Pillar redPillar = (Red_Pillar)parentField.GetValue(__instance);
-            EntityPreset preset = PatchHelper.GetEntityPreset(typeof(Red_Pillar), redPillar);
-
-            Plugin.Instance.Log.LogInfo($"Broke red chain: {preset.EntityID.ToString()}");
-
-            if (Locations.LocationsByGuid.ContainsKey(preset.EntityID))
-            {
-                ArchipelagoManager.SendLocation(Locations.LocationsByGuid[preset.EntityID]);
-            }
-        }
-    }
 }