1 files changed, 24 insertions, 44 deletions

@@ -4,12 +4,7 @@ using Archipelago.MultiClient.Net.Models;
 using Archipelago.MultiClient.Net.Packets;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
-using UnityEngine.SceneManagement;
-using static ManifoldGardenArchipelago.GameData;
 
 namespace ManifoldGardenArchipelago
 {
@@ -18,24 +13,8 @@ namespace ManifoldGardenArchipelago
         private ArchipelagoSession _session;
         private int _itemIndex = 0;
 
-        public Dictionary<string, Dictionary<int, bool>> chainListenersByScene = new();
-
-        public ArchipelagoManager()
-        {
-            foreach (var item in GameData.door_by_item)
-            {
-                foreach (var chainListenerReference in item.Value)
-                {
-                    if (!chainListenersByScene.TryGetValue(chainListenerReference.scene, out var listenersInScene))
-                    {
-                        listenersInScene = [];
-                        chainListenersByScene.Add(chainListenerReference.scene, listenersInScene);
-                    }
-
-                    listenersInScene[chainListenerReference.index] = false;
-                }
-            }
-        }
+        private HashSet<string> _items = [];
+        private HashSet<string> _locations = [];
 
         public async Task<LoginResult> Connect(string url, string slotName, string password)
         {
@@ -72,6 +51,23 @@ namespace ManifoldGardenArchipelago
             _session = null;
         }
 
+        public bool HasItem(string itemName)
+        {
+            return _items.Contains(itemName);
+        }
+
+        public void CheckLocation(string locationName)
+        {
+            if (_locations.Contains(locationName))
+            {
+                return;
+            }
+
+            _locations.Add(locationName);
+
+            _session.Locations.CompleteLocationChecks(_session.Locations.GetLocationIdFromName("Manifold Garden", locationName));
+        }
+
         public void Update()
         {
             if (_session == null)
@@ -85,29 +81,13 @@ namespace ManifoldGardenArchipelago
                 {
                     ItemInfo item = _session.Items.AllItemsReceived[i];
                     string itemName = item.ItemName;
+                    Plugin.Logger.LogInfo($"Received {itemName}");
+
+                    _items.Add(itemName);
 
-                    if (GameData.door_by_item.TryGetValue(itemName, out List<GameData.ChainListenerReference> door))
+                    if (GameData.listenersByItem.TryGetValue(itemName, out var listeners))
                     {
-                        foreach (GameData.ChainListenerReference chainListenerReference in door)
-                        {
-                            chainListenersByScene[chainListenerReference.scene][chainListenerReference.index] = true;
-
-                            if (SceneManager.GetSceneByName(chainListenerReference.scene) is Scene doorScene && doorScene.isLoaded)
-                            {
-                                LevelSystems levelSystems = doorScene.GetRootGameObjects().Single((obj) => obj.name == "Level Systems").GetComponent<LevelSystems>();
-                                if (levelSystems.isActiveAndEnabled)
-                                {
-                                    LineDoorController ldc = levelSystems.chainListeners[chainListenerReference.index].GetComponent<LineDoorController>();
-                                    ldc.chains.Clear();
-                                    
-                                    FieldInfo fieldInfo = typeof(LineDoorController).GetField("doorShouldOpenImmediatelyOnEnable", BindingFlags.Instance | BindingFlags.NonPublic);
-                                    fieldInfo.SetValue(ldc, true);
-
-                                    MethodInfo methodInfo = typeof(LineDoorController).GetMethod("SetDoorOpenCloseStateAnimated", BindingFlags.NonPublic | BindingFlags.Instance);
-                                    methodInfo.Invoke(ldc, [true, false]);
-                                }
-                            }
-                        }
+                        GameState.EvaluateGameStateListeners(listeners);
                     }
                 }